diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 69d09ea..6403977 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -9,7 +9,7 @@
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col v-if="hasPerm('/statics/deviceStaticsByType')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 69d09ea..6403977 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -9,7 +9,7 @@
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col v-if="hasPerm('/statics/deviceStaticsByType')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>
diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 69d09ea..6403977 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -9,7 +9,7 @@
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col v-if="hasPerm('/statics/deviceStaticsByType')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>
diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index c349cda..a3425c4 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -7,8 +7,11 @@
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
           </el-form-item>
-          <el-form-item class="selectForm-container-item">
+          <!-- <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item> -->
+          <el-form-item class="selectForm-container-item" prop="areaId">
+            <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -70,6 +73,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getNoiseConfigList, batchImportNoiseConfig, batchExportNoiseConfig } from '@/api/noiseconfig'
 import { getDeptTreeList } from '@/api/system/dept'
 import EditGasConfig from './editGasConfig'
@@ -79,10 +83,11 @@
 
 export default {
   name: 'ListNoiseConfig',
-  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        areaId: '',
         keywords: '',
         offset: 1,
         limit: 20,
@@ -96,6 +101,12 @@
           align: 'center'
         },
         {
+          text: '报警阈值',
+          value: 'threshold',
+          align: 'center',
+          width: 80
+        },
+        {
           text: '重传次数',
           value: 'retryTimes',
           align: 'center'

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 69d09ea..6403977 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -9,7 +9,7 @@
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col v-if="hasPerm('/statics/deviceStaticsByType')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>
diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index c349cda..a3425c4 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -7,8 +7,11 @@
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
           </el-form-item>
-          <el-form-item class="selectForm-container-item">
+          <!-- <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item> -->
+          <el-form-item class="selectForm-container-item" prop="areaId">
+            <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -70,6 +73,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getNoiseConfigList, batchImportNoiseConfig, batchExportNoiseConfig } from '@/api/noiseconfig'
 import { getDeptTreeList } from '@/api/system/dept'
 import EditGasConfig from './editGasConfig'
@@ -79,10 +83,11 @@
 
 export default {
   name: 'ListNoiseConfig',
-  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        areaId: '',
         keywords: '',
         offset: 1,
         limit: 20,
@@ -96,6 +101,12 @@
           align: 'center'
         },
         {
+          text: '报警阈值',
+          value: 'threshold',
+          align: 'center',
+          width: 80
+        },
+        {
           text: '重传次数',
           value: 'retryTimes',
           align: 'center'
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index e8ce6a8..545a949 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -15,7 +15,7 @@
               :value="item.value"/>
           </el-select>
         </search-item>
-        <search-item>
+        <search-item v-if="isAdministrator()">
           <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
         <search-item v-if="isAdministrator()" >
@@ -27,6 +27,15 @@
               :value="item.value"/>
           </el-select>
         </search-item>
+        <search-item>
+          <area-select-tree
+            v-model="listQuery.areaId"
+            :need-top="false"
+            :dept-show="true"
+            placeholder="区域"
+            size="small"
+          />
+        </search-item>
       </search-area>
     </div>
     <!--查询结果Table显示-->
@@ -103,16 +112,18 @@
 import DeptSelect from '@/components/DeptSelect/index'
 import InfoWell from '@/views/wellManage/infoWell'
 import { notContainConcentrator } from '@/utils/permission'
+import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
 
 export default {
   name: 'ListDevice',
-  components: { DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
+  components: {AreaSelectTree, DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         deviceType: '',
         isOnline: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -197,16 +208,21 @@
       wellShow: false
     }
   },
-  mounted() {
+  created(){
     this.fetchDeviceType()// 获取设备列表
+  },
+  mounted() {
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
     // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+    if (this.$route.query && this.$route.query.wellCode) {
       this.listQuery.keywords = this.$route.query.wellCode
       this.fetchData(true)
-    } else {
+    } else if(this.$route.query && this.$route.query.deviceType){
+      this.listQuery.deviceType = this.$route.query.deviceType
+      this.fetchData(true)
+    }else {
       this.fetchData()// 获取数据
     }
   },

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 69d09ea..6403977 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -9,7 +9,7 @@
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col v-if="hasPerm('/statics/deviceStaticsByType')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>
diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index c349cda..a3425c4 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -7,8 +7,11 @@
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
           </el-form-item>
-          <el-form-item class="selectForm-container-item">
+          <!-- <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item> -->
+          <el-form-item class="selectForm-container-item" prop="areaId">
+            <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -70,6 +73,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getNoiseConfigList, batchImportNoiseConfig, batchExportNoiseConfig } from '@/api/noiseconfig'
 import { getDeptTreeList } from '@/api/system/dept'
 import EditGasConfig from './editGasConfig'
@@ -79,10 +83,11 @@
 
 export default {
   name: 'ListNoiseConfig',
-  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        areaId: '',
         keywords: '',
         offset: 1,
         limit: 20,
@@ -96,6 +101,12 @@
           align: 'center'
         },
         {
+          text: '报警阈值',
+          value: 'threshold',
+          align: 'center',
+          width: 80
+        },
+        {
           text: '重传次数',
           value: 'retryTimes',
           align: 'center'
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index e8ce6a8..545a949 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -15,7 +15,7 @@
               :value="item.value"/>
           </el-select>
         </search-item>
-        <search-item>
+        <search-item v-if="isAdministrator()">
           <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
         <search-item v-if="isAdministrator()" >
@@ -27,6 +27,15 @@
               :value="item.value"/>
           </el-select>
         </search-item>
+        <search-item>
+          <area-select-tree
+            v-model="listQuery.areaId"
+            :need-top="false"
+            :dept-show="true"
+            placeholder="区域"
+            size="small"
+          />
+        </search-item>
       </search-area>
     </div>
     <!--查询结果Table显示-->
@@ -103,16 +112,18 @@
 import DeptSelect from '@/components/DeptSelect/index'
 import InfoWell from '@/views/wellManage/infoWell'
 import { notContainConcentrator } from '@/utils/permission'
+import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
 
 export default {
   name: 'ListDevice',
-  components: { DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
+  components: {AreaSelectTree, DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         deviceType: '',
         isOnline: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -197,16 +208,21 @@
       wellShow: false
     }
   },
-  mounted() {
+  created(){
     this.fetchDeviceType()// 获取设备列表
+  },
+  mounted() {
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
     // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+    if (this.$route.query && this.$route.query.wellCode) {
       this.listQuery.keywords = this.$route.query.wellCode
       this.fetchData(true)
-    } else {
+    } else if(this.$route.query && this.$route.query.deviceType){
+      this.listQuery.deviceType = this.$route.query.deviceType
+      this.fetchData(true)
+    }else {
       this.fetchData()// 获取数据
     }
   },
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index ba92197..9e5aed1 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -57,12 +57,14 @@
     </div>
     <!--查询结果Table显示-->
     <div>
-      <el-row style="height: 12px; background-color: #ebebeb" />
+      <el-row style="height: 12px; background-color: #ebebeb"/>
       <el-row class="table-title">
         <el-col :span="6"
-          ><div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div></el-col
+        >
+          <div class="title-header">
+            <i class="el-icon-menu"/>数据列表
+          </div>
+        </el-col
         >
         <el-col :span="18" class="edit_btns">
           <el-button
@@ -71,7 +73,8 @@
             class="edit_btn"
             size="small"
             @click="batchExport"
-            >导出记录</el-button
+          >导出记录
+          </el-button
           >
           <!--<el-button v-if="hasPerm('/template/download')" class="edit_btn" size="small" @click="downloadTemplate">批量导入模板下载</el-button>-->
           <download-template
@@ -97,14 +100,16 @@
             class="edit_btn"
             size="small"
             @click="del"
-            >删除</el-button
+          >删除
+          </el-button
           >
           <el-button
             v-if="hasPerm('/well/add')"
             class="edit_btn"
             size="small"
             @click="add"
-            >新增</el-button
+          >新增
+          </el-button
           >
         </el-col>
       </el-row>
@@ -115,8 +120,8 @@
         border
         @selection-change="handleSelectionChange"
       >
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -130,7 +135,8 @@
               v-if="column.type == 'Button' && scope.row.deviceCount > 0"
               type="text"
               @click="goDeviceList(scope.row)"
-              >{{ scope.row[column.value] }}</el-button
+            >{{ scope.row[column.value] }}
+            </el-button
             >
             <span v-else-if="column.text === '详细地址'">{{
               scope.row["areaFullName"] + scope.row[column.value]
@@ -152,10 +158,12 @@
               v-if="hasPerm('/well/update')"
               type="text"
               @click="edit(scope.row)"
-              >编辑</el-button
+            >编辑
+            </el-button
             >
             <el-button type="text" @click="goAlarmRecords(scope.row)"
-              >告警记录</el-button
+            >告警记录
+            </el-button
             >
           </template>
         </el-table-column>
@@ -176,445 +184,448 @@
       />
     </div>
 
-    <edit-well ref="editwell" @watchChild="fetchData" />
-    <detail-well ref="detailwell" />
+    <edit-well ref="editwell" @watchChild="fetchData"/>
+    <detail-well ref="detailwell"/>
   </app-container>
 </template>
 
 <script>
-import addWell from "@/views/wellManage/addWell";
-import editWell from "@/views/wellManage/editWell";
-import detailWell from "@/views/wellManage/detailWell";
-import SelectTree from "@/components/SelectTree/singleSelect";
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
-import {
-  getWellList,
-  getWellType,
-  delWell,
-  batchImportWell,
-  batchExportWell,
-  batchBfcf,
-  bfcf,
-} from "@/api/well";
-import DeptSelect from "@/components/DeptSelect";
-import DownloadTemplate from "@/components/DownloadTemplate/index";
+  import addWell from "@/views/wellManage/addWell";
+  import editWell from "@/views/wellManage/editWell";
+  import detailWell from "@/views/wellManage/detailWell";
+  import SelectTree from "@/components/SelectTree/singleSelect";
+  import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+  import {
+    getWellList,
+    getWellType,
+    delWell,
+    batchImportWell,
+    batchExportWell,
+    batchBfcf,
+    bfcf,
+  } from "@/api/well";
+  import DeptSelect from "@/components/DeptSelect";
+  import DownloadTemplate from "@/components/DownloadTemplate/index";
 
-export default {
-  name: "ListWell",
-  components: {
-    DownloadTemplate,
-    SelectTree,
-    addWell,
-    editWell,
-    detailWell,
-    DeptSelect,
-    AreaSelectTree,
-  },
-  data() {
-    return {
-      listQuery: {
-        areaId: "", // 关键字
-        keywords: "",
-        wellType: "1",
-        deptid: "",
-        offset: 1,
-        limit: 20,
-        sort: "wellCode",
-        order: "asc",
-      }, // 筛选条件
-      columns: [
-        {
-          text: "井编号",
-          value: "wellCode",
-          align: "center",
+  export default {
+    name: "ListWell",
+    components: {
+      DownloadTemplate,
+      SelectTree,
+      addWell,
+      editWell,
+      detailWell,
+      DeptSelect,
+      AreaSelectTree,
+    },
+    data() {
+      return {
+        listQuery: {
+          areaId: "", // 关键字
+          keywords: "",
+          wellType: "",
+          deptid: "",
+          offset: 1,
+          limit: 20,
+          sort: "wellCode",
+          order: "asc",
+        }, // 筛选条件
+        columns: [
+          {
+            text: "井编号",
+            value: "wellCode",
+            align: "center",
+          },
+          {
+            text: "井名称",
+            value: "wellName",
+            width: 130,
+            align: "center",
+          },
+          {
+            text: "井深(m)",
+            value: "deep",
+            width: 80,
+            align: "center",
+          },
+          {
+            text: "详细地址",
+            value: "position",
+            align: "center",
+          },
+          // {
+          //   text: '井类型',
+          //   value: 'wellTypeName',
+          //   width: 70,
+          //   align: 'center'
+          // },
+          {
+            text: "权属单位",
+            value: "deptName",
+            align: "center",
+          },
+          {
+            text: "设备数量",
+            value: "deviceCount",
+            width: 100,
+            align: "center",
+            type: "Button",
+          },
+          // {
+          //   text: '布防状态',
+          //   value: 'bfztName',
+          //   width: 80,
+          //   align: 'center'
+          // }
+        ], // 显示列
+        multipleSelection: [], // 多选选中项
+        list: [], // 列表数据
+        total: 0, // 数据总数
+        showWellType: true, // 是否显示井类型下拉
+        wellTypeList: null, // 井类型列表
+        deptProps: {
+          parent: "pid",
+          value: "id",
+          label: "name",
+          children: "children",
+        }, // 权属单位树形下拉菜单
+        deptTreeList: null, // 组织树列表数据
+        deptShowTop: false, // 权属单位下拉是否显示顶级
+        listLoading: true, // 加载动画
+        fullscreenLoading: false, // 全屏加载动画
+        editShow: false, // 是否显示编辑框
+        detailShow: false, // 是否显示详情框
+        filename: "sluicewell_template.xlsx",
+        fileList: [],
+        btnNames: {
+          布防: "撤防",
+          撤防: "布防",
         },
-        {
-          text: "井名称",
-          value: "wellName",
-          width: 130,
-          align: "center",
-        },
-        {
-          text: "井深(m)",
-          value: "deep",
-          width: 80,
-          align: "center",
-        },
-        {
-          text: "详细地址",
-          value: "position",
-          align: "center",
-        },
-        // {
-        //   text: '井类型',
-        //   value: 'wellTypeName',
-        //   width: 70,
-        //   align: 'center'
-        // },
-        {
-          text: "权属单位",
-          value: "deptName",
-          align: "center",
-        },
-        {
-          text: "设备数量",
-          value: "deviceCount",
-          width: 100,
-          align: "center",
-          type: "Button",
-        },
-        // {
-        //   text: '布防状态',
-        //   value: 'bfztName',
-        //   width: 80,
-        //   align: 'center'
-        // }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      showWellType: true, // 是否显示井类型下拉
-      wellTypeList: null, // 井类型列表
-      deptProps: {
-        parent: "pid",
-        value: "id",
-        label: "name",
-        children: "children",
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      deptShowTop: false, // 权属单位下拉是否显示顶级
-      listLoading: true, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示详情框
-      filename: "sluicewell_template.xlsx",
-      fileList: [],
-      btnNames: {
-        布防: "撤防",
-        撤防: "布防",
-      },
-      btnStatus: {
-        撤防: "success",
-        布防: "danger",
-      },
-    };
-  },
-  created() {
-    this.fetchWellType(); // 获取井列表
-    this.fetchData(); // 获取数据
-  },
-  activated() {
-    console.log("activated");
-    this.fetchData(); // 获取数据
-  },
-  methods: {
-    selectnode(node) {
-      this.listQuery.areaId = node.id;
-    },
-
-    // 打开详情对话框
-    detail(row) {
-      this.detailShow = true;
-      this.$refs.detailwell.initDialog(true, row);
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false;
-      } else {
-        return true;
-      }
-    },
-    // 新增井
-    add() {
-      this.$router.push({ path: "addWell", query: { type: "add" } });
-    },
-    // 编辑井信息
-    edit(row) {
-      this.dialogFormVisible = true;
-      this.editShow = true;
-      this.$refs.editwell.initDialog(this.dialogFormVisible, row);
-    },
-    // 删除井
-    del() {
-      if (this.checkSelection()) {
-        const wellIds = [];
-        this.multipleSelection.forEach(function (value, index) {
-          wellIds.push(value.id);
-        });
-        this.$confirm("确定要删除所选井吗？", "确认操作", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          delWell(wellIds).then((response) => {
-            if (response.code === 200) {
-              this.$message.success("删除成功");
-              this.fetchData();
-            }
-          });
-        });
-      } else {
-        this.$message.error("至少选中一项");
-      }
-    },
-    // 批量导入井
-    uploadFile(param) {
-      console.log("uploadFile");
-      // 判断文件大小是否符合要求
-      const _file = param.file;
-      const isLt5M = _file.size / 1024 / 1024 < 5;
-      if (!isLt5M) {
-        this.$message.error("请上传5M以下的excel文件");
-        return false;
-      }
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: "导入中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      // 发起导入请求
-      batchImportWell(_file)
-        .then((res) => {
-          loading.close(); // 关闭加载动画
-          if (res.code === 200) {
-            this.$message.success("导入成功");
-            this.fileList = [];
-            this.fetchData();
-          } else {
-            this.$message.error(res.message);
-          }
-        })
-        .catch(() => {
-          loading.close();
-        });
-      this.fileList = [];
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: "下载中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      const _this = this;
-      const config = {
-        // 获取下载进度
-        onDownloadProgress(progressEvent) {
-          console.log(progressEvent);
-          var percent = parseInt(
-            100 * (progressEvent.loaded / progressEvent.total)
-          );
-          console.log("percent:" + percent, "total:" + progressEvent.total);
-          // 渲染dom
-          _this.$nextTick(() => {
-            _this.percent = percent;
-          });
+        btnStatus: {
+          撤防: "success",
+          布防: "danger",
         },
       };
-      batchExportWell(this.listQuery, config)
-        .then((res) => {
-          loading.close(); // 关闭加载动画
-          console.log("download===", res);
-          const blob = new Blob([res.data]);
-          const downloadElement = document.createElement("a");
-          const href = window.URL.createObjectURL(blob); // 创建下载的链接
-          downloadElement.href = href;
-          downloadElement.download = `井列表.xlsx`; // 下载后文件名
-          document.body.appendChild(downloadElement);
-          downloadElement.click(); // 点击下载
-          document.body.removeChild(downloadElement); // 下载完成移除元素
-          window.URL.revokeObjectURL(href); // 释放blob对象
-        })
-        .catch((res) => {
-          loading.close();
-        });
     },
-    // 布防撤防
-    bfcf(row) {
-      if (row.bfzt === "1") {
-        // 需要撤防
-        this.$confirm("确定要对该井进行撤防吗？", "确认操作", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          bfcf(row.id, "0").then((response) => {
-            if (response.code === 200) {
-              this.$message.success("撤防成功");
-              this.fetchData();
-            }
+    created() {
+      this.fetchWellType(); // 获取井列表
+      this.fetchData(); // 获取数据
+    },
+    activated() {
+      console.log("activated");
+      this.fetchData(); // 获取数据
+    },
+    methods: {
+      selectnode(node) {
+        this.listQuery.areaId = node.id;
+      },
+
+      // 打开详情对话框
+      detail(row) {
+        this.detailShow = true;
+        this.$refs.detailwell.initDialog(true, row);
+      },
+      checkSelection() {
+        if (this.multipleSelection.length === 0) {
+          return false;
+        } else {
+          return true;
+        }
+      },
+      // 新增井
+      add() {
+        this.$router.push({path: "addWell", query: {type: "add"}});
+      },
+      // 编辑井信息
+      edit(row) {
+        this.dialogFormVisible = true;
+        this.editShow = true;
+        this.$refs.editwell.initDialog(this.dialogFormVisible, row);
+      },
+      // 删除井
+      del() {
+        if (this.checkSelection()) {
+          const wellIds = [];
+          this.multipleSelection.forEach(function (value, index) {
+            wellIds.push(value.id);
           });
+          this.$confirm("确定要删除所选井吗？", "确认操作", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            delWell(wellIds).then((response) => {
+              if (response.code === 200) {
+                this.$message.success("删除成功");
+                this.fetchData();
+              }
+            });
+          });
+        } else {
+          this.$message.error("至少选中一项");
+        }
+      },
+      // 批量导入井
+      uploadFile(param) {
+        console.log("uploadFile");
+        // 判断文件大小是否符合要求
+        const _file = param.file;
+        const isLt5M = _file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.error("请上传5M以下的excel文件");
+          return false;
+        }
+        // 全屏加载动画
+        const loading = this.$loading({
+          lock: true,
+          text: "导入中,请稍后...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
         });
-      } else {
-        // 需要布防
-        this.$confirm("确定要对该井进行布防吗？", "确认操作", {
+        // 发起导入请求
+        batchImportWell(_file)
+          .then((res) => {
+            loading.close(); // 关闭加载动画
+            if (res.code === 200) {
+              this.$message.success("导入成功");
+              this.fileList = [];
+              this.fetchData();
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+          .catch(() => {
+            loading.close();
+          });
+        this.fileList = [];
+      },
+      // 批量导出
+      batchExport() {
+        // 全屏加载动画
+        const loading = this.$loading({
+          lock: true,
+          text: "下载中,请稍后...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+        });
+        const _this = this;
+        const config = {
+          // 获取下载进度
+          onDownloadProgress(progressEvent) {
+            console.log(progressEvent);
+            var percent = parseInt(
+              100 * (progressEvent.loaded / progressEvent.total)
+            );
+            console.log("percent:" + percent, "total:" + progressEvent.total);
+            // 渲染dom
+            _this.$nextTick(() => {
+              _this.percent = percent;
+            });
+          },
+        };
+        batchExportWell(this.listQuery, config)
+          .then((res) => {
+            loading.close(); // 关闭加载动画
+            console.log("download===", res);
+            const blob = new Blob([res.data]);
+            const downloadElement = document.createElement("a");
+            const href = window.URL.createObjectURL(blob); // 创建下载的链接
+            downloadElement.href = href;
+            downloadElement.download = `井列表.xlsx`; // 下载后文件名
+            document.body.appendChild(downloadElement);
+            downloadElement.click(); // 点击下载
+            document.body.removeChild(downloadElement); // 下载完成移除元素
+            window.URL.revokeObjectURL(href); // 释放blob对象
+          })
+          .catch((res) => {
+            loading.close();
+          });
+      },
+      // 布防撤防
+      bfcf(row) {
+        if (row.bfzt === "1") {
+          // 需要撤防
+          this.$confirm("确定要对该井进行撤防吗？", "确认操作", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            bfcf(row.id, "0").then((response) => {
+              if (response.code === 200) {
+                this.$message.success("撤防成功");
+                this.fetchData();
+              }
+            });
+          });
+        } else {
+          // 需要布防
+          this.$confirm("确定要对该井进行布防吗？", "确认操作", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            bfcf(row.id, "1").then((response) => {
+              if (response.code === 200) {
+                this.$message.success("布防成功");
+                this.fetchData();
+              }
+            });
+          });
+        }
+      },
+      // 批量布防
+      batchBf() {
+        const listQuery = {
+          keywords: this.listQuery.keywords,
+          owner: this.listQuery.owner,
+          position: this.listQuery.position,
+          wellType: this.listQuery.wellType,
+          deptid: this.listQuery.deptid,
+          notes: this.listQuery.notes,
+          bfzt: "1",
+        };
+        this.$confirm("确定要对列表中的全部井进行布防吗？", "确认操作", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
-          bfcf(row.id, "1").then((response) => {
+          batchBfcf(listQuery).then((response) => {
             if (response.code === 200) {
               this.$message.success("布防成功");
               this.fetchData();
             }
           });
         });
-      }
-    },
-    // 批量布防
-    batchBf() {
-      const listQuery = {
-        keywords: this.listQuery.keywords,
-        owner: this.listQuery.owner,
-        position: this.listQuery.position,
-        wellType: this.listQuery.wellType,
-        deptid: this.listQuery.deptid,
-        notes: this.listQuery.notes,
-        bfzt: "1",
-      };
-      this.$confirm("确定要对列表中的全部井进行布防吗？", "确认操作", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        batchBfcf(listQuery).then((response) => {
-          if (response.code === 200) {
-            this.$message.success("布防成功");
-            this.fetchData();
-          }
+      },
+      // 批量撤防
+      batchCf() {
+        const listQuery = {
+          keywords: this.listQuery.keywords,
+          owner: this.listQuery.owner,
+          position: this.listQuery.position,
+          wellType: this.listQuery.wellType,
+          deptid: this.listQuery.deptid,
+          notes: this.listQuery.notes,
+          bfzt: "0",
+        };
+        this.$confirm("确定要对列表中的全部井进行撤防吗？", "确认操作", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          batchBfcf(listQuery).then((response) => {
+            if (response.code === 200) {
+              this.$message.success("撤防成功");
+              this.fetchData();
+            }
+          });
         });
-      });
-    },
-    // 批量撤防
-    batchCf() {
-      const listQuery = {
-        keywords: this.listQuery.keywords,
-        owner: this.listQuery.owner,
-        position: this.listQuery.position,
-        wellType: this.listQuery.wellType,
-        deptid: this.listQuery.deptid,
-        notes: this.listQuery.notes,
-        bfzt: "0",
-      };
-      this.$confirm("确定要对列表中的全部井进行撤防吗？", "确认操作", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        batchBfcf(listQuery).then((response) => {
-          if (response.code === 200) {
-            this.$message.success("撤防成功");
-            this.fetchData();
-          }
-        });
-      });
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false);
-    },
-    // 获取井数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true;
-      if (!isNowPage) {
-        // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1;
-      }
-      getWellList(this.listQuery).then((response) => {
-        this.list = response.data.rows.map(function (item) {
-          item.areaFullName = item.areaFullName
-            .replace("/", "")
-            .replace("顶层", "");
-          return item;
-        });
-        this.total = parseInt(response.data.total);
-        this.listLoading = false;
-      });
-    },
-    // 获取井类型
-    fetchWellType() {
-      getWellType().then((response) => {
-        debugger;
-        this.wellTypeList = [];
-        const wellTypes = this.$store.getters.wellTypes;
-        for (const wellType of response.data) {
-          if (wellTypes.indexOf(wellType.value) !== -1) {
-            this.wellTypeList.push(wellType);
-          }
+      },
+      // 查询数据
+      search() {
+        this.fetchData(false);
+      },
+      // 获取井数据
+      fetchData(isNowPage = true) {
+        this.listLoading = true;
+        if (!isNowPage) {
+          // 是否显示当前页，否则跳转第一页
+          this.listQuery.offset = 1;
         }
-        if (this.wellTypeList.length <= 1) {
-          this.showWellType = false;
-        }
-      });
+        getWellList(this.listQuery).then((response) => {
+          this.list = response.data.rows.map(function (item) {
+            item.areaFullName = item.areaFullName
+              .replace("/", "")
+              .replace("顶层", "");
+            return item;
+          });
+          this.total = parseInt(response.data.total);
+          this.listLoading = false;
+        });
+      },
+      // 获取井类型
+      fetchWellType() {
+        getWellType().then((response) => {
+          debugger;
+          this.wellTypeList = [];
+          const wellTypes = this.$store.getters.wellTypes;
+          for (const wellType of response.data) {
+            if (wellTypes.indexOf(wellType.value) !== -1) {
+              this.wellTypeList.push(wellType);
+            }
+          }
+          if (this.wellTypeList.length <= 1) {
+            this.showWellType = false;
+          }
+          this.listQuery.wellType = '1'
+        })
+      },
+      // 去设备列表页
+      goDeviceList(row) {
+        this.$router.push({
+          name: "DeviceList",
+          query: {wellCode: row.wellCode},
+        });
+      },
+      goAlarmRecords(row) {
+        this.$router.push({
+          name: "AlarmRecords",
+          query: {wellCode: row.wellCode},
+        });
+      },
+      handleSuccess() {
+        console.log("handleSuccess");
+      },
+      indexMethod(index) {
+        return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1;
+      },
+      // 改变页容量
+      handleSizeChange(val) {
+        this.listQuery.limit = val;
+        this.fetchData();
+      },
+      // 改变当前页
+      handleCurrentChange(val) {
+        this.listQuery.offset = val;
+        this.fetchData();
+      },
+      // 多选触发方法
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
     },
-    // 去设备列表页
-    goDeviceList(row) {
-      this.$router.push({
-        name: "DeviceList",
-        query: { wellCode: row.wellCode },
-      });
-    },
-    goAlarmRecords(row) {
-      this.$router.push({
-        name: "AlarmRecords",
-        query: { wellCode: row.wellCode },
-      });
-    },
-    handleSuccess() {
-      console.log("handleSuccess");
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1;
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val;
-      this.fetchData();
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val;
-      this.fetchData();
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-  },
-};
+  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-$tableTitleHeight: 46px;
-.table {
-  margin-bottom: 20px;
-}
+  $tableTitleHeight: 46px;
+  .table {
+    margin-bottom: 20px;
+  }
 
-.pagination-container {
-  margin-bottom: 50px;
-}
-.table-title {
-  margin: 0px 6px;
-  background-color: white;
-  height: $tableTitleHeight;
-  .title-header {
-    line-height: $tableTitleHeight;
-    color: #606266;
-    font-size: 15px;
-    i {
-      margin-left: 5px;
-      margin-right: 5px;
+  .pagination-container {
+    margin-bottom: 50px;
+  }
+
+  .table-title {
+    margin: 0px 6px;
+    background-color: white;
+    height: $tableTitleHeight;
+    .title-header {
+      line-height: $tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i {
+        margin-left: 5px;
+        margin-right: 5px;
+      }
     }
   }
-}
-.edit_btns {
-  .edit_btn {
-    float: right;
-    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+
+  .edit_btns {
+    .edit_btn {
+      float: right;
+      margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
-}
 </style>

diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index 6ad37f1..8c8bfd5 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -34,10 +34,19 @@
   })
 }
 
-// 查询一级分区7日用水量
-export function countByDayFirst(params) {
+// 查询二级分区各区用水量对比
+export function waterCompare(params) {
   return request({
-    url: 'waterStatistic/countByDayFirst',
+    url: 'waterStatistic/waterCompare',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDaySecond(params) {
+  return request({
+    url: 'waterStatistic/countByDay',
     method: 'get',
     params
   })
diff --git a/src/components/BigData/Card/index.vue b/src/components/BigData/Card/index.vue
index 45359c9..8320d47 100644
--- a/src/components/BigData/Card/index.vue
+++ b/src/components/BigData/Card/index.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="card-panel-num" >
           {{ context }}
-          <span style="font-size: 10px;color:#888">{{unit}}</span>
+          <span style="font-size: 10px;color:#888"> {{unit}} </span>
         </div>
       </div>
     </div>
diff --git a/src/views/dashboard/components/AlarmCountByDept.vue b/src/views/dashboard/components/AlarmCountByDept.vue
index 91df51d..4347727 100644
--- a/src/views/dashboard/components/AlarmCountByDept.vue
+++ b/src/views/dashboard/components/AlarmCountByDept.vue
@@ -66,7 +66,6 @@
     // 获取统计数据
     fetchData() {
       alarmBySecondArea(this.query).then(response => {
-        debugger
         this.chartData.rows = response.data
       })
     }
diff --git a/src/views/dashboard/components/FunctionArea.vue b/src/views/dashboard/components/FunctionArea.vue
index e628c12..9ab2e01 100644
--- a/src/views/dashboard/components/FunctionArea.vue
+++ b/src/views/dashboard/components/FunctionArea.vue
@@ -5,10 +5,10 @@
  -->
 <template>
   <div class="statistic-container">
-    <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-    <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-    <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-    <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
+    <el-button round size="mini" @click="setDefaultTime('year')">本年度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('season')">本季度</el-button>
+    <el-button round size="mini" @click="setDefaultTime('month')">近30日</el-button>
+    <el-button round size="mini" @click="setDefaultTime('week')">近7日</el-button>
     <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
     <el-date-picker
       v-model="timeRange"
@@ -20,7 +20,7 @@
       value-format="yyyy-MM-dd"
       size="mini"
       style="width:250px;margin-right: 20px"
-      @change="fetchData"/>
+      @change="change"/>
   </div>
 </template>
 
@@ -54,8 +54,8 @@
       init(){
         this.setDefaultTime(this.select)
       },
-      change(){
-        this.$emit('change', this.timeRange)
+      change(type){
+        this.$emit('change', this.timeRange, type )
       },
       setDefaultTime(val) {
         if (val === 'year') {
@@ -72,16 +72,18 @@
           const beginTime = tYear + '-' + oldMonth + '-01'
           const endTime = getDayTime(new Date().getTime())
           this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
-        }else if (val === 'month') {
-          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')]
+        }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
@@ -91,7 +93,7 @@
         } else if (val === 'today') {
           this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
         }
-        this.change()
+        this.change(val)
       }
     }
   }
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 6a18ef6..10824ee 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -1,24 +1,25 @@
 <!--水表告警统计-->
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -37,8 +38,10 @@
 import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 export default {
   name: 'WatchAlarmBar',
+  components: {FunctionArea},
   data() {
     return {
       title:{
@@ -108,7 +111,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.$refs.func.init()
+    // this.setDefaultTime('today')
     // this.fetchArea()
   },
   methods: {
@@ -130,11 +134,11 @@
     //   this.areaId = val
     //   this.fetchData()
     // },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       alarmBySecondArea(params).then(response => {
@@ -160,26 +164,6 @@
         // ]
         this.isShow = true
       })
-    },
-    setDefaultTime(val) {
-      if (val === 'month') {
-        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')]
-      } else if (val === 'week') {
-        this.timeRange = [getDayTime(new Date().getTime() - 24 * 6 * 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.fetchData()
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCompare.vue b/src/views/dashboard/components/waterCompare.vue
index 8e34936..b06d288 100644
--- a/src/views/dashboard/components/waterCompare.vue
+++ b/src/views/dashboard/components/waterCompare.vue
@@ -9,7 +9,7 @@
 <script>
 
 import 'echarts/lib/component/visualMap'
-import { alarmBySecondArea } from '@/api/overview'
+import { waterCompare } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
 import FunctionArea from "./FunctionArea";
@@ -22,8 +22,8 @@
       chartSettings:{
         labelMap: {
           'areaName': '分区',
-          'last': '报警数',
-          'now': '预警数'
+          'last': '',
+          'now': ''
         },
         dimension: ['areaName'],
         metrics: ['last', 'now']
@@ -79,14 +79,20 @@
     this.$refs.func.init()
   },
   methods: {
-    fetchData(timeRange) {
+    fetchData(timeRange,type) {
       const params = {
         areaId: '110000',
+        type: type,
         startTime: timeRange[0],
         endTime: timeRange[1]
       }
-      alarmBySecondArea(params).then(response => {
+      waterCompare(params).then(response => {
         this.isShow = false
+        this.chartSettings.labelMap = {
+          areaName: '分区',
+          last: response.data[0].lastTime,
+          now: response.data[0].nowTime
+        }
         this.chartData.rows = response.data
         const maxValue = Math.max.apply(Math, response.data.map(item=> {return item.last>item.now?item.last: item.now}))
         if (maxValue < 10) {
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index f4196f1..5518e99 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -1,23 +1,24 @@
 <template>
   <div class="container">
-    <div class="statistic-container">
-      <el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>
-      <el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>
-      <el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>
-      <el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>
-      <el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>
-      <el-date-picker
-        v-model="timeRange"
-        :picker-options="pickerOptions"
-        type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        size="mini"
-        style="width:250px;margin-right: 20px"
-        @change="fetchData"/>
-    </div>
+    <function-area ref="func" select="week" @change="fetchData"/>
+    <!--<div class="statistic-container">-->
+      <!--<el-button round size="mini" @click="setDefaultTime('year')">本年</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('season')">本季</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('month')">本月</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('week')">本周</el-button>-->
+      <!--<el-button round size="mini" @click="setDefaultTime('today')">今日</el-button>-->
+      <!--<el-date-picker-->
+        <!--v-model="timeRange"-->
+        <!--:picker-options="pickerOptions"-->
+        <!--type="daterange"-->
+        <!--range-separator="至"-->
+        <!--start-placeholder="开始日期"-->
+        <!--end-placeholder="结束日期"-->
+        <!--value-format="yyyy-MM-dd"-->
+        <!--size="mini"-->
+        <!--style="width:250px;margin-right: 20px"-->
+        <!--@change="fetchData"/>-->
+    <!--</div>-->
     <ve-histogram v-if="isShow" :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
     <!--<div class="function">-->
       <!--<el-button-->
@@ -33,12 +34,14 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { countBySecondArea } from '@/api/overview'
+import { countBySecondArea } from '@/api/dashboard'
 import { getDayTime } from '@/utils/dateutils'
 import { getDoorAreaTree } from '@/api/system/area'
+import FunctionArea from "./FunctionArea";
 
 export default {
   name: 'WaterCountByAreaBar',
+  components: {FunctionArea},
   data() {
     this.extend = {
       legend: {
@@ -107,7 +110,8 @@
     }
   },
   mounted() {
-    this.setDefaultTime('week')
+    this.$refs.func.init()
+    // this.setDefaultTime('week')
     // this.fetchArea()
   },
   methods: {
@@ -129,11 +133,11 @@
       this.areaId = val
       this.fetchData()
     },
-    fetchData() {
+    fetchData(timeRange) {
       const params = {
         areaId: '110000',
-        startTime: this.timeRange[0],
-        endTime: this.timeRange[1]
+        startTime: timeRange[0],
+        endTime: timeRange[1]
       }
       this.$emit('change', params)
       countBySecondArea(params).then(response => {
@@ -188,7 +192,7 @@
       } else if (val === 'today') {
         this.timeRange = [getDayTime(new Date().getTime()).Format('yyyy-MM-dd'), getDayTime(new Date().getTime()).Format('yyyy-MM-dd')]
       }
-      this.fetchData()
+      this.fetchData(this.timeRange)
     }
   }
 }
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 07524f9..8d9861e 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { countByDayFirst } from '@/api/overview'
+import { countByDaySecond } from '@/api/dashboard'
 import { getDoorAreaTree } from '@/api/system/area'
 export default {
   name: 'WaterCountByDay',
@@ -72,6 +72,7 @@
     }
   },
   methods: {
+    // 废弃
     fetchArea() {
       getDoorAreaTree().then(response => {
         if (response.code === 200) {
@@ -89,8 +90,9 @@
         }
       })
     },
+    // 获取数据
     fetchData() {
-      countByDayFirst(this.query).then(response => {
+      countByDaySecond(this.query).then(response => {
         if(response.data.length>0){
           const arr = response.data.map((item)=> {
             const result = {date: item.date}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 69d09ea..6403977 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -9,7 +9,7 @@
         </el-card>
       </el-col>
       <!--设备数量统计-->
-      <el-col v-if="hasPerm('/statics/deviceStaticsByType')" :span="12">
+      <el-col :span="12">
         <el-card shadow="never">
           <device-count/>
         </el-card>
diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index c349cda..a3425c4 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -7,8 +7,11 @@
           <el-form-item class="selectForm-container-item" prop="keywords">
             <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
           </el-form-item>
-          <el-form-item class="selectForm-container-item">
+          <!-- <el-form-item class="selectForm-container-item">
             <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          </el-form-item> -->
+          <el-form-item class="selectForm-container-item" prop="areaId">
+            <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -70,6 +73,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getNoiseConfigList, batchImportNoiseConfig, batchExportNoiseConfig } from '@/api/noiseconfig'
 import { getDeptTreeList } from '@/api/system/dept'
 import EditGasConfig from './editGasConfig'
@@ -79,10 +83,11 @@
 
 export default {
   name: 'ListNoiseConfig',
-  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        areaId: '',
         keywords: '',
         offset: 1,
         limit: 20,
@@ -96,6 +101,12 @@
           align: 'center'
         },
         {
+          text: '报警阈值',
+          value: 'threshold',
+          align: 'center',
+          width: 80
+        },
+        {
           text: '重传次数',
           value: 'retryTimes',
           align: 'center'
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index e8ce6a8..545a949 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -15,7 +15,7 @@
               :value="item.value"/>
           </el-select>
         </search-item>
-        <search-item>
+        <search-item v-if="isAdministrator()">
           <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
         <search-item v-if="isAdministrator()" >
@@ -27,6 +27,15 @@
               :value="item.value"/>
           </el-select>
         </search-item>
+        <search-item>
+          <area-select-tree
+            v-model="listQuery.areaId"
+            :need-top="false"
+            :dept-show="true"
+            placeholder="区域"
+            size="small"
+          />
+        </search-item>
       </search-area>
     </div>
     <!--查询结果Table显示-->
@@ -103,16 +112,18 @@
 import DeptSelect from '@/components/DeptSelect/index'
 import InfoWell from '@/views/wellManage/infoWell'
 import { notContainConcentrator } from '@/utils/permission'
+import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
 
 export default {
   name: 'ListDevice',
-  components: { DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
+  components: {AreaSelectTree, DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
   data() {
     return {
       listQuery: {
         keywords: '',
         deviceType: '',
         isOnline: '',
+        areaId: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -197,16 +208,21 @@
       wellShow: false
     }
   },
-  mounted() {
+  created(){
     this.fetchDeviceType()// 获取设备列表
+  },
+  mounted() {
     if (!notContainConcentrator()) {
       this.columns.splice(-1, 1)
     }
     // 如果参数中有井编号，则将查询条件填入，否则正常
-    if (this.$route.query && this.$route.query.wellCode && this.$route.query.wellCode !== '') {
+    if (this.$route.query && this.$route.query.wellCode) {
       this.listQuery.keywords = this.$route.query.wellCode
       this.fetchData(true)
-    } else {
+    } else if(this.$route.query && this.$route.query.deviceType){
+      this.listQuery.deviceType = this.$route.query.deviceType
+      this.fetchData(true)
+    }else {
       this.fetchData()// 获取数据
     }
   },
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index ba92197..9e5aed1 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -57,12 +57,14 @@
     </div>
     <!--查询结果Table显示-->
     <div>
-      <el-row style="height: 12px; background-color: #ebebeb" />
+      <el-row style="height: 12px; background-color: #ebebeb"/>
       <el-row class="table-title">
         <el-col :span="6"
-          ><div class="title-header">
-            <i class="el-icon-menu" />数据列表
-          </div></el-col
+        >
+          <div class="title-header">
+            <i class="el-icon-menu"/>数据列表
+          </div>
+        </el-col
         >
         <el-col :span="18" class="edit_btns">
           <el-button
@@ -71,7 +73,8 @@
             class="edit_btn"
             size="small"
             @click="batchExport"
-            >导出记录</el-button
+          >导出记录
+          </el-button
           >
           <!--<el-button v-if="hasPerm('/template/download')" class="edit_btn" size="small" @click="downloadTemplate">批量导入模板下载</el-button>-->
           <download-template
@@ -97,14 +100,16 @@
             class="edit_btn"
             size="small"
             @click="del"
-            >删除</el-button
+          >删除
+          </el-button
           >
           <el-button
             v-if="hasPerm('/well/add')"
             class="edit_btn"
             size="small"
             @click="add"
-            >新增</el-button
+          >新增
+          </el-button
           >
         </el-col>
       </el-row>
@@ -115,8 +120,8 @@
         border
         @selection-change="handleSelectionChange"
       >
-        <el-table-column align="center" type="selection" width="55" />
-        <el-table-column :index="indexMethod" align="center" type="index" />
+        <el-table-column align="center" type="selection" width="55"/>
+        <el-table-column :index="indexMethod" align="center" type="index"/>
         <el-table-column
           v-for="column in columns"
           :key="column.value"
@@ -130,7 +135,8 @@
               v-if="column.type == 'Button' && scope.row.deviceCount > 0"
               type="text"
               @click="goDeviceList(scope.row)"
-              >{{ scope.row[column.value] }}</el-button
+            >{{ scope.row[column.value] }}
+            </el-button
             >
             <span v-else-if="column.text === '详细地址'">{{
               scope.row["areaFullName"] + scope.row[column.value]
@@ -152,10 +158,12 @@
               v-if="hasPerm('/well/update')"
               type="text"
               @click="edit(scope.row)"
-              >编辑</el-button
+            >编辑
+            </el-button
             >
             <el-button type="text" @click="goAlarmRecords(scope.row)"
-              >告警记录</el-button
+            >告警记录
+            </el-button
             >
           </template>
         </el-table-column>
@@ -176,445 +184,448 @@
       />
     </div>
 
-    <edit-well ref="editwell" @watchChild="fetchData" />
-    <detail-well ref="detailwell" />
+    <edit-well ref="editwell" @watchChild="fetchData"/>
+    <detail-well ref="detailwell"/>
   </app-container>
 </template>
 
 <script>
-import addWell from "@/views/wellManage/addWell";
-import editWell from "@/views/wellManage/editWell";
-import detailWell from "@/views/wellManage/detailWell";
-import SelectTree from "@/components/SelectTree/singleSelect";
-import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
-import {
-  getWellList,
-  getWellType,
-  delWell,
-  batchImportWell,
-  batchExportWell,
-  batchBfcf,
-  bfcf,
-} from "@/api/well";
-import DeptSelect from "@/components/DeptSelect";
-import DownloadTemplate from "@/components/DownloadTemplate/index";
+  import addWell from "@/views/wellManage/addWell";
+  import editWell from "@/views/wellManage/editWell";
+  import detailWell from "@/views/wellManage/detailWell";
+  import SelectTree from "@/components/SelectTree/singleSelect";
+  import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
+  import {
+    getWellList,
+    getWellType,
+    delWell,
+    batchImportWell,
+    batchExportWell,
+    batchBfcf,
+    bfcf,
+  } from "@/api/well";
+  import DeptSelect from "@/components/DeptSelect";
+  import DownloadTemplate from "@/components/DownloadTemplate/index";
 
-export default {
-  name: "ListWell",
-  components: {
-    DownloadTemplate,
-    SelectTree,
-    addWell,
-    editWell,
-    detailWell,
-    DeptSelect,
-    AreaSelectTree,
-  },
-  data() {
-    return {
-      listQuery: {
-        areaId: "", // 关键字
-        keywords: "",
-        wellType: "1",
-        deptid: "",
-        offset: 1,
-        limit: 20,
-        sort: "wellCode",
-        order: "asc",
-      }, // 筛选条件
-      columns: [
-        {
-          text: "井编号",
-          value: "wellCode",
-          align: "center",
+  export default {
+    name: "ListWell",
+    components: {
+      DownloadTemplate,
+      SelectTree,
+      addWell,
+      editWell,
+      detailWell,
+      DeptSelect,
+      AreaSelectTree,
+    },
+    data() {
+      return {
+        listQuery: {
+          areaId: "", // 关键字
+          keywords: "",
+          wellType: "",
+          deptid: "",
+          offset: 1,
+          limit: 20,
+          sort: "wellCode",
+          order: "asc",
+        }, // 筛选条件
+        columns: [
+          {
+            text: "井编号",
+            value: "wellCode",
+            align: "center",
+          },
+          {
+            text: "井名称",
+            value: "wellName",
+            width: 130,
+            align: "center",
+          },
+          {
+            text: "井深(m)",
+            value: "deep",
+            width: 80,
+            align: "center",
+          },
+          {
+            text: "详细地址",
+            value: "position",
+            align: "center",
+          },
+          // {
+          //   text: '井类型',
+          //   value: 'wellTypeName',
+          //   width: 70,
+          //   align: 'center'
+          // },
+          {
+            text: "权属单位",
+            value: "deptName",
+            align: "center",
+          },
+          {
+            text: "设备数量",
+            value: "deviceCount",
+            width: 100,
+            align: "center",
+            type: "Button",
+          },
+          // {
+          //   text: '布防状态',
+          //   value: 'bfztName',
+          //   width: 80,
+          //   align: 'center'
+          // }
+        ], // 显示列
+        multipleSelection: [], // 多选选中项
+        list: [], // 列表数据
+        total: 0, // 数据总数
+        showWellType: true, // 是否显示井类型下拉
+        wellTypeList: null, // 井类型列表
+        deptProps: {
+          parent: "pid",
+          value: "id",
+          label: "name",
+          children: "children",
+        }, // 权属单位树形下拉菜单
+        deptTreeList: null, // 组织树列表数据
+        deptShowTop: false, // 权属单位下拉是否显示顶级
+        listLoading: true, // 加载动画
+        fullscreenLoading: false, // 全屏加载动画
+        editShow: false, // 是否显示编辑框
+        detailShow: false, // 是否显示详情框
+        filename: "sluicewell_template.xlsx",
+        fileList: [],
+        btnNames: {
+          布防: "撤防",
+          撤防: "布防",
         },
-        {
-          text: "井名称",
-          value: "wellName",
-          width: 130,
-          align: "center",
-        },
-        {
-          text: "井深(m)",
-          value: "deep",
-          width: 80,
-          align: "center",
-        },
-        {
-          text: "详细地址",
-          value: "position",
-          align: "center",
-        },
-        // {
-        //   text: '井类型',
-        //   value: 'wellTypeName',
-        //   width: 70,
-        //   align: 'center'
-        // },
-        {
-          text: "权属单位",
-          value: "deptName",
-          align: "center",
-        },
-        {
-          text: "设备数量",
-          value: "deviceCount",
-          width: 100,
-          align: "center",
-          type: "Button",
-        },
-        // {
-        //   text: '布防状态',
-        //   value: 'bfztName',
-        //   width: 80,
-        //   align: 'center'
-        // }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      showWellType: true, // 是否显示井类型下拉
-      wellTypeList: null, // 井类型列表
-      deptProps: {
-        parent: "pid",
-        value: "id",
-        label: "name",
-        children: "children",
-      }, // 权属单位树形下拉菜单
-      deptTreeList: null, // 组织树列表数据
-      deptShowTop: false, // 权属单位下拉是否显示顶级
-      listLoading: true, // 加载动画
-      fullscreenLoading: false, // 全屏加载动画
-      editShow: false, // 是否显示编辑框
-      detailShow: false, // 是否显示详情框
-      filename: "sluicewell_template.xlsx",
-      fileList: [],
-      btnNames: {
-        布防: "撤防",
-        撤防: "布防",
-      },
-      btnStatus: {
-        撤防: "success",
-        布防: "danger",
-      },
-    };
-  },
-  created() {
-    this.fetchWellType(); // 获取井列表
-    this.fetchData(); // 获取数据
-  },
-  activated() {
-    console.log("activated");
-    this.fetchData(); // 获取数据
-  },
-  methods: {
-    selectnode(node) {
-      this.listQuery.areaId = node.id;
-    },
-
-    // 打开详情对话框
-    detail(row) {
-      this.detailShow = true;
-      this.$refs.detailwell.initDialog(true, row);
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false;
-      } else {
-        return true;
-      }
-    },
-    // 新增井
-    add() {
-      this.$router.push({ path: "addWell", query: { type: "add" } });
-    },
-    // 编辑井信息
-    edit(row) {
-      this.dialogFormVisible = true;
-      this.editShow = true;
-      this.$refs.editwell.initDialog(this.dialogFormVisible, row);
-    },
-    // 删除井
-    del() {
-      if (this.checkSelection()) {
-        const wellIds = [];
-        this.multipleSelection.forEach(function (value, index) {
-          wellIds.push(value.id);
-        });
-        this.$confirm("确定要删除所选井吗？", "确认操作", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          delWell(wellIds).then((response) => {
-            if (response.code === 200) {
-              this.$message.success("删除成功");
-              this.fetchData();
-            }
-          });
-        });
-      } else {
-        this.$message.error("至少选中一项");
-      }
-    },
-    // 批量导入井
-    uploadFile(param) {
-      console.log("uploadFile");
-      // 判断文件大小是否符合要求
-      const _file = param.file;
-      const isLt5M = _file.size / 1024 / 1024 < 5;
-      if (!isLt5M) {
-        this.$message.error("请上传5M以下的excel文件");
-        return false;
-      }
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: "导入中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      // 发起导入请求
-      batchImportWell(_file)
-        .then((res) => {
-          loading.close(); // 关闭加载动画
-          if (res.code === 200) {
-            this.$message.success("导入成功");
-            this.fileList = [];
-            this.fetchData();
-          } else {
-            this.$message.error(res.message);
-          }
-        })
-        .catch(() => {
-          loading.close();
-        });
-      this.fileList = [];
-    },
-    // 批量导出
-    batchExport() {
-      // 全屏加载动画
-      const loading = this.$loading({
-        lock: true,
-        text: "下载中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-      const _this = this;
-      const config = {
-        // 获取下载进度
-        onDownloadProgress(progressEvent) {
-          console.log(progressEvent);
-          var percent = parseInt(
-            100 * (progressEvent.loaded / progressEvent.total)
-          );
-          console.log("percent:" + percent, "total:" + progressEvent.total);
-          // 渲染dom
-          _this.$nextTick(() => {
-            _this.percent = percent;
-          });
+        btnStatus: {
+          撤防: "success",
+          布防: "danger",
         },
       };
-      batchExportWell(this.listQuery, config)
-        .then((res) => {
-          loading.close(); // 关闭加载动画
-          console.log("download===", res);
-          const blob = new Blob([res.data]);
-          const downloadElement = document.createElement("a");
-          const href = window.URL.createObjectURL(blob); // 创建下载的链接
-          downloadElement.href = href;
-          downloadElement.download = `井列表.xlsx`; // 下载后文件名
-          document.body.appendChild(downloadElement);
-          downloadElement.click(); // 点击下载
-          document.body.removeChild(downloadElement); // 下载完成移除元素
-          window.URL.revokeObjectURL(href); // 释放blob对象
-        })
-        .catch((res) => {
-          loading.close();
-        });
     },
-    // 布防撤防
-    bfcf(row) {
-      if (row.bfzt === "1") {
-        // 需要撤防
-        this.$confirm("确定要对该井进行撤防吗？", "确认操作", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          bfcf(row.id, "0").then((response) => {
-            if (response.code === 200) {
-              this.$message.success("撤防成功");
-              this.fetchData();
-            }
+    created() {
+      this.fetchWellType(); // 获取井列表
+      this.fetchData(); // 获取数据
+    },
+    activated() {
+      console.log("activated");
+      this.fetchData(); // 获取数据
+    },
+    methods: {
+      selectnode(node) {
+        this.listQuery.areaId = node.id;
+      },
+
+      // 打开详情对话框
+      detail(row) {
+        this.detailShow = true;
+        this.$refs.detailwell.initDialog(true, row);
+      },
+      checkSelection() {
+        if (this.multipleSelection.length === 0) {
+          return false;
+        } else {
+          return true;
+        }
+      },
+      // 新增井
+      add() {
+        this.$router.push({path: "addWell", query: {type: "add"}});
+      },
+      // 编辑井信息
+      edit(row) {
+        this.dialogFormVisible = true;
+        this.editShow = true;
+        this.$refs.editwell.initDialog(this.dialogFormVisible, row);
+      },
+      // 删除井
+      del() {
+        if (this.checkSelection()) {
+          const wellIds = [];
+          this.multipleSelection.forEach(function (value, index) {
+            wellIds.push(value.id);
           });
+          this.$confirm("确定要删除所选井吗？", "确认操作", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            delWell(wellIds).then((response) => {
+              if (response.code === 200) {
+                this.$message.success("删除成功");
+                this.fetchData();
+              }
+            });
+          });
+        } else {
+          this.$message.error("至少选中一项");
+        }
+      },
+      // 批量导入井
+      uploadFile(param) {
+        console.log("uploadFile");
+        // 判断文件大小是否符合要求
+        const _file = param.file;
+        const isLt5M = _file.size / 1024 / 1024 < 5;
+        if (!isLt5M) {
+          this.$message.error("请上传5M以下的excel文件");
+          return false;
+        }
+        // 全屏加载动画
+        const loading = this.$loading({
+          lock: true,
+          text: "导入中,请稍后...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
         });
-      } else {
-        // 需要布防
-        this.$confirm("确定要对该井进行布防吗？", "确认操作", {
+        // 发起导入请求
+        batchImportWell(_file)
+          .then((res) => {
+            loading.close(); // 关闭加载动画
+            if (res.code === 200) {
+              this.$message.success("导入成功");
+              this.fileList = [];
+              this.fetchData();
+            } else {
+              this.$message.error(res.message);
+            }
+          })
+          .catch(() => {
+            loading.close();
+          });
+        this.fileList = [];
+      },
+      // 批量导出
+      batchExport() {
+        // 全屏加载动画
+        const loading = this.$loading({
+          lock: true,
+          text: "下载中,请稍后...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+        });
+        const _this = this;
+        const config = {
+          // 获取下载进度
+          onDownloadProgress(progressEvent) {
+            console.log(progressEvent);
+            var percent = parseInt(
+              100 * (progressEvent.loaded / progressEvent.total)
+            );
+            console.log("percent:" + percent, "total:" + progressEvent.total);
+            // 渲染dom
+            _this.$nextTick(() => {
+              _this.percent = percent;
+            });
+          },
+        };
+        batchExportWell(this.listQuery, config)
+          .then((res) => {
+            loading.close(); // 关闭加载动画
+            console.log("download===", res);
+            const blob = new Blob([res.data]);
+            const downloadElement = document.createElement("a");
+            const href = window.URL.createObjectURL(blob); // 创建下载的链接
+            downloadElement.href = href;
+            downloadElement.download = `井列表.xlsx`; // 下载后文件名
+            document.body.appendChild(downloadElement);
+            downloadElement.click(); // 点击下载
+            document.body.removeChild(downloadElement); // 下载完成移除元素
+            window.URL.revokeObjectURL(href); // 释放blob对象
+          })
+          .catch((res) => {
+            loading.close();
+          });
+      },
+      // 布防撤防
+      bfcf(row) {
+        if (row.bfzt === "1") {
+          // 需要撤防
+          this.$confirm("确定要对该井进行撤防吗？", "确认操作", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            bfcf(row.id, "0").then((response) => {
+              if (response.code === 200) {
+                this.$message.success("撤防成功");
+                this.fetchData();
+              }
+            });
+          });
+        } else {
+          // 需要布防
+          this.$confirm("确定要对该井进行布防吗？", "确认操作", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            bfcf(row.id, "1").then((response) => {
+              if (response.code === 200) {
+                this.$message.success("布防成功");
+                this.fetchData();
+              }
+            });
+          });
+        }
+      },
+      // 批量布防
+      batchBf() {
+        const listQuery = {
+          keywords: this.listQuery.keywords,
+          owner: this.listQuery.owner,
+          position: this.listQuery.position,
+          wellType: this.listQuery.wellType,
+          deptid: this.listQuery.deptid,
+          notes: this.listQuery.notes,
+          bfzt: "1",
+        };
+        this.$confirm("确定要对列表中的全部井进行布防吗？", "确认操作", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
-          bfcf(row.id, "1").then((response) => {
+          batchBfcf(listQuery).then((response) => {
             if (response.code === 200) {
               this.$message.success("布防成功");
               this.fetchData();
             }
           });
         });
-      }
-    },
-    // 批量布防
-    batchBf() {
-      const listQuery = {
-        keywords: this.listQuery.keywords,
-        owner: this.listQuery.owner,
-        position: this.listQuery.position,
-        wellType: this.listQuery.wellType,
-        deptid: this.listQuery.deptid,
-        notes: this.listQuery.notes,
-        bfzt: "1",
-      };
-      this.$confirm("确定要对列表中的全部井进行布防吗？", "确认操作", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        batchBfcf(listQuery).then((response) => {
-          if (response.code === 200) {
-            this.$message.success("布防成功");
-            this.fetchData();
-          }
+      },
+      // 批量撤防
+      batchCf() {
+        const listQuery = {
+          keywords: this.listQuery.keywords,
+          owner: this.listQuery.owner,
+          position: this.listQuery.position,
+          wellType: this.listQuery.wellType,
+          deptid: this.listQuery.deptid,
+          notes: this.listQuery.notes,
+          bfzt: "0",
+        };
+        this.$confirm("确定要对列表中的全部井进行撤防吗？", "确认操作", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          batchBfcf(listQuery).then((response) => {
+            if (response.code === 200) {
+              this.$message.success("撤防成功");
+              this.fetchData();
+            }
+          });
         });
-      });
-    },
-    // 批量撤防
-    batchCf() {
-      const listQuery = {
-        keywords: this.listQuery.keywords,
-        owner: this.listQuery.owner,
-        position: this.listQuery.position,
-        wellType: this.listQuery.wellType,
-        deptid: this.listQuery.deptid,
-        notes: this.listQuery.notes,
-        bfzt: "0",
-      };
-      this.$confirm("确定要对列表中的全部井进行撤防吗？", "确认操作", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        batchBfcf(listQuery).then((response) => {
-          if (response.code === 200) {
-            this.$message.success("撤防成功");
-            this.fetchData();
-          }
-        });
-      });
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false);
-    },
-    // 获取井数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true;
-      if (!isNowPage) {
-        // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1;
-      }
-      getWellList(this.listQuery).then((response) => {
-        this.list = response.data.rows.map(function (item) {
-          item.areaFullName = item.areaFullName
-            .replace("/", "")
-            .replace("顶层", "");
-          return item;
-        });
-        this.total = parseInt(response.data.total);
-        this.listLoading = false;
-      });
-    },
-    // 获取井类型
-    fetchWellType() {
-      getWellType().then((response) => {
-        debugger;
-        this.wellTypeList = [];
-        const wellTypes = this.$store.getters.wellTypes;
-        for (const wellType of response.data) {
-          if (wellTypes.indexOf(wellType.value) !== -1) {
-            this.wellTypeList.push(wellType);
-          }
+      },
+      // 查询数据
+      search() {
+        this.fetchData(false);
+      },
+      // 获取井数据
+      fetchData(isNowPage = true) {
+        this.listLoading = true;
+        if (!isNowPage) {
+          // 是否显示当前页，否则跳转第一页
+          this.listQuery.offset = 1;
         }
-        if (this.wellTypeList.length <= 1) {
-          this.showWellType = false;
-        }
-      });
+        getWellList(this.listQuery).then((response) => {
+          this.list = response.data.rows.map(function (item) {
+            item.areaFullName = item.areaFullName
+              .replace("/", "")
+              .replace("顶层", "");
+            return item;
+          });
+          this.total = parseInt(response.data.total);
+          this.listLoading = false;
+        });
+      },
+      // 获取井类型
+      fetchWellType() {
+        getWellType().then((response) => {
+          debugger;
+          this.wellTypeList = [];
+          const wellTypes = this.$store.getters.wellTypes;
+          for (const wellType of response.data) {
+            if (wellTypes.indexOf(wellType.value) !== -1) {
+              this.wellTypeList.push(wellType);
+            }
+          }
+          if (this.wellTypeList.length <= 1) {
+            this.showWellType = false;
+          }
+          this.listQuery.wellType = '1'
+        })
+      },
+      // 去设备列表页
+      goDeviceList(row) {
+        this.$router.push({
+          name: "DeviceList",
+          query: {wellCode: row.wellCode},
+        });
+      },
+      goAlarmRecords(row) {
+        this.$router.push({
+          name: "AlarmRecords",
+          query: {wellCode: row.wellCode},
+        });
+      },
+      handleSuccess() {
+        console.log("handleSuccess");
+      },
+      indexMethod(index) {
+        return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1;
+      },
+      // 改变页容量
+      handleSizeChange(val) {
+        this.listQuery.limit = val;
+        this.fetchData();
+      },
+      // 改变当前页
+      handleCurrentChange(val) {
+        this.listQuery.offset = val;
+        this.fetchData();
+      },
+      // 多选触发方法
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
     },
-    // 去设备列表页
-    goDeviceList(row) {
-      this.$router.push({
-        name: "DeviceList",
-        query: { wellCode: row.wellCode },
-      });
-    },
-    goAlarmRecords(row) {
-      this.$router.push({
-        name: "AlarmRecords",
-        query: { wellCode: row.wellCode },
-      });
-    },
-    handleSuccess() {
-      console.log("handleSuccess");
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1;
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val;
-      this.fetchData();
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val;
-      this.fetchData();
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-  },
-};
+  };
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-$tableTitleHeight: 46px;
-.table {
-  margin-bottom: 20px;
-}
+  $tableTitleHeight: 46px;
+  .table {
+    margin-bottom: 20px;
+  }
 
-.pagination-container {
-  margin-bottom: 50px;
-}
-.table-title {
-  margin: 0px 6px;
-  background-color: white;
-  height: $tableTitleHeight;
-  .title-header {
-    line-height: $tableTitleHeight;
-    color: #606266;
-    font-size: 15px;
-    i {
-      margin-left: 5px;
-      margin-right: 5px;
+  .pagination-container {
+    margin-bottom: 50px;
+  }
+
+  .table-title {
+    margin: 0px 6px;
+    background-color: white;
+    height: $tableTitleHeight;
+    .title-header {
+      line-height: $tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i {
+        margin-left: 5px;
+        margin-right: 5px;
+      }
     }
   }
-}
-.edit_btns {
-  .edit_btn {
-    float: right;
-    margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+
+  .edit_btns {
+    .edit_btn {
+      float: right;
+      margin: 7px 3px; //为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
   }
-}
 </style>
diff --git a/static/project.config.json b/static/project.config.json
index 756d185..fe03293 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,6 +1,6 @@
 {
   "title": "供水管理系统",
-  "baseUrl": "http://111.198.10.15:11639/",
+  "baseUrl": "http://111.198.10.15:20104/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "city":"青岛市",