diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 8779b73..6de166c 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -32,9 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WatchAlarmBar',
   data() {
@@ -59,7 +59,7 @@
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
     }
     this.grid = {
       right: 40,
@@ -75,15 +75,16 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'alarm': '报警数',
+        'warning': '预警数'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['alarm', 'warning']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'alarm'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      alarmBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'alarm': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'alarm': 78 },
+        //   { 'areaName': '厂区', 'alarm': 78 },
+        //   { 'areaName': '分段分区', 'alarm': 38 },
+        //   { 'areaName': '船坞分区', 'alarm': 48 },
+        //   { 'areaName': '刀把码头', 'alarm': 30 },
+        //   { 'areaName': '制管作业区', 'alarm': 82 },
+        //   { 'areaName': '滑道作业区', 'alarm': 34 },
+        //   { 'areaName': '码头作业区', 'alarm': 26 },
+        //   { 'areaName': '车间生产区', 'alarm': 45 }
+        // ]
         this.isShow = true
       })
     },

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 8779b73..6de166c 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -32,9 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WatchAlarmBar',
   data() {
@@ -59,7 +59,7 @@
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
     }
     this.grid = {
       right: 40,
@@ -75,15 +75,16 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'alarm': '报警数',
+        'warning': '预警数'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['alarm', 'warning']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'alarm'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      alarmBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'alarm': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'alarm': 78 },
+        //   { 'areaName': '厂区', 'alarm': 78 },
+        //   { 'areaName': '分段分区', 'alarm': 38 },
+        //   { 'areaName': '船坞分区', 'alarm': 48 },
+        //   { 'areaName': '刀把码头', 'alarm': 30 },
+        //   { 'areaName': '制管作业区', 'alarm': 82 },
+        //   { 'areaName': '滑道作业区', 'alarm': 34 },
+        //   { 'areaName': '码头作业区', 'alarm': 26 },
+        //   { 'areaName': '车间生产区', 'alarm': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 954fffe..0845249 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -32,8 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
+import { getDoorAreaTree } from '@/api/area'
 
 export default {
   name: 'WaterCountByAreaBar',
@@ -75,15 +76,15 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 8779b73..6de166c 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -32,9 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WatchAlarmBar',
   data() {
@@ -59,7 +59,7 @@
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
     }
     this.grid = {
       right: 40,
@@ -75,15 +75,16 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'alarm': '报警数',
+        'warning': '预警数'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['alarm', 'warning']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'alarm'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      alarmBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'alarm': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'alarm': 78 },
+        //   { 'areaName': '厂区', 'alarm': 78 },
+        //   { 'areaName': '分段分区', 'alarm': 38 },
+        //   { 'areaName': '船坞分区', 'alarm': 48 },
+        //   { 'areaName': '刀把码头', 'alarm': 30 },
+        //   { 'areaName': '制管作业区', 'alarm': 82 },
+        //   { 'areaName': '滑道作业区', 'alarm': 34 },
+        //   { 'areaName': '码头作业区', 'alarm': 26 },
+        //   { 'areaName': '车间生产区', 'alarm': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 954fffe..0845249 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -32,8 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
+import { getDoorAreaTree } from '@/api/area'
 
 export default {
   name: 'WaterCountByAreaBar',
@@ -75,15 +76,15 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index d47e358..0e2309d 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,14 +13,14 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
-
+import { countByDayFirst } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDay',
   data() {
     return {
       listQuery: {
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       title: {
@@ -28,18 +28,8 @@
       },
       chartSettings: {
         labelMap: {
-          'dept1': '科技楼及食堂',
-          'dept2': 'A\\B\\C\\D\\E座',
-          'dept3': '厂区',
-          'dept4': '分段分区',
-          'dept5': '船坞分区',
-          'dept6': '刀把码头',
-          'dept7': '制管作业区',
-          'dept8': '滑道作业区',
-          'dept9': '码头作业区',
-          'dept10': '车间生产区'
         },
-        metrics: ['dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        metrics: [],
         dimension: ['date']
       },
       extend: {
@@ -56,56 +46,75 @@
         }
       },
       chartData: {
-        columns: ['date', 'dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        columns: [],
         rows: []
       }
     }
   },
   mounted() {
     this.changeTime('month')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          const area = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(item => item.name)
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = {}
+          for (let i = 0; i < area.length; i++) {
+            this.chartSettings.labelMap[area[i]] = area[i]
+          }
+          this.chartData.columns = ['date', ...area]
+          this.fetchData()
+        }
+      })
+    },
     fetchData() {
-    //   const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-    //   const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-    //   this.listQuery.beginTime = beginTime
-    //   this.listQuery.endTime = endTime
-    //   alarmStaticByDay(this.listQuery).then(response => {
-    //     this.chartData.rows = response.data
-    //   })
+      countByDayFirst(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].areaName] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
+      })
       // 模拟数据
-      this.chartData.rows = [
-        { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
-      ]
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 8779b73..6de166c 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -32,9 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WatchAlarmBar',
   data() {
@@ -59,7 +59,7 @@
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
     }
     this.grid = {
       right: 40,
@@ -75,15 +75,16 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'alarm': '报警数',
+        'warning': '预警数'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['alarm', 'warning']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'alarm'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      alarmBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'alarm': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'alarm': 78 },
+        //   { 'areaName': '厂区', 'alarm': 78 },
+        //   { 'areaName': '分段分区', 'alarm': 38 },
+        //   { 'areaName': '船坞分区', 'alarm': 48 },
+        //   { 'areaName': '刀把码头', 'alarm': 30 },
+        //   { 'areaName': '制管作业区', 'alarm': 82 },
+        //   { 'areaName': '滑道作业区', 'alarm': 34 },
+        //   { 'areaName': '码头作业区', 'alarm': 26 },
+        //   { 'areaName': '车间生产区', 'alarm': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 954fffe..0845249 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -32,8 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
+import { getDoorAreaTree } from '@/api/area'
 
 export default {
   name: 'WaterCountByAreaBar',
@@ -75,15 +76,15 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index d47e358..0e2309d 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,14 +13,14 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
-
+import { countByDayFirst } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDay',
   data() {
     return {
       listQuery: {
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       title: {
@@ -28,18 +28,8 @@
       },
       chartSettings: {
         labelMap: {
-          'dept1': '科技楼及食堂',
-          'dept2': 'A\\B\\C\\D\\E座',
-          'dept3': '厂区',
-          'dept4': '分段分区',
-          'dept5': '船坞分区',
-          'dept6': '刀把码头',
-          'dept7': '制管作业区',
-          'dept8': '滑道作业区',
-          'dept9': '码头作业区',
-          'dept10': '车间生产区'
         },
-        metrics: ['dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        metrics: [],
         dimension: ['date']
       },
       extend: {
@@ -56,56 +46,75 @@
         }
       },
       chartData: {
-        columns: ['date', 'dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        columns: [],
         rows: []
       }
     }
   },
   mounted() {
     this.changeTime('month')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          const area = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(item => item.name)
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = {}
+          for (let i = 0; i < area.length; i++) {
+            this.chartSettings.labelMap[area[i]] = area[i]
+          }
+          this.chartData.columns = ['date', ...area]
+          this.fetchData()
+        }
+      })
+    },
     fetchData() {
-    //   const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-    //   const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-    //   this.listQuery.beginTime = beginTime
-    //   this.listQuery.endTime = endTime
-    //   alarmStaticByDay(this.listQuery).then(response => {
-    //     this.chartData.rows = response.data
-    //   })
+      countByDayFirst(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].areaName] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
+      })
       // 模拟数据
-      this.chartData.rows = [
-        { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
-      ]
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index c65569c..7c3d817 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -21,15 +21,21 @@
 </template>
 
 <script>
-// import { wellStaticByBfzt } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDepy',
   data() {
     return {
+      listQuery: {
+        areaId: '',
+        startTime: '',
+        endTime: ''
+      },
       areaId:'',
-      areaList: [{id:'', name: '生产厂区' }, {id:'', name: '科技楼及食堂' }, {id:'', name: 'A/B/C/D/E座' }],
+      areaList: [],
       chartData: {
-        columns: ['dept', 'wellCount'],
+        columns: ['areaName', 'count'],
         rows: []
       },
       extend: {
@@ -53,62 +59,82 @@
       },
       chartSettings: {
         labelMap: {
-          'dept': '分区',
-          'wellCount': '用水量'
+          'areaName': '分区',
+          'count': '用水量'
         },
-        dimension: 'dept',
-        metrics: 'wellCount'
+        dimension: 'areaName',
+        metrics: 'count'
       }
     }
   },
   mounted() {
     // TODO:待调试真接口
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val){
       this.areaId = val
       this.fetchData()
     },
     // 获取统计数据
     fetchData() {
-      this.chartData.rows = [
-        { 'dept': '科技楼及食堂', 'wellCount': 53 },
-        { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-        { 'dept': '厂区', 'wellCount': 78 },
-        { 'dept': '分段分区', 'wellCount': 78 },
-        { 'dept': '船坞分区', 'wellCount': 78 },
-        { 'dept': '刀把码头', 'wellCount': 78 },
-        { 'dept': '制管作业区', 'wellCount': 78 },
-        { 'dept': '滑道作业区', 'wellCount': 78 },
-        { 'dept': '码头作业区', 'wellCount': 78 },
-        { 'dept': '车间生产区', 'wellCount': 78 }
-      ]
-      // wellStaticByBfzt(this.listQuery).then(response => {
-      //   const data = response.data
-      //   this.chartData.rows = [
-      //     { 'bfzt': '布防', 'wellCount': data.bfWell },
-      //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
-      //   ]
-      // })
+      // this.chartData.rows = [
+      //   { 'areaName': '科技楼及食堂', 'count': 53 },
+      //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+      //   { 'areaName': '厂区', 'count': 78 },
+      //   { 'areaName': '分段分区', 'count': 78 },
+      //   { 'areaName': '船坞分区', 'count': 78 },
+      //   { 'areaName': '刀把码头', 'count': 78 },
+      //   { 'areaName': '制管作业区', 'count': 78 },
+      //   { 'areaName': '滑道作业区', 'count': 78 },
+      //   { 'areaName': '码头作业区', 'count': 78 },
+      //   { 'areaName': '车间生产区', 'count': 78 }
+      // ]
+      this.listQuery.areaId = this.areaId
+      countBySecondArea(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+      })
     },
-    changeDate(date) {
-      let beginTime, endTime
-      if (date === 'today') {
-        beginTime = getDayTime(new Date().getTime())
-        endTime = new Date()
-        this.timeRange = [beginTime, endTime]
-      } else if (date === 'yesterday') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
-        endTime = getDayTime(new Date().getTime())
-      } else if (date === 'sevendays') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-        endTime = new Date()
-      } else if (date === 'lastmonth') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-        endTime = new Date()
+    changeTime(timeType) {
+      let startTime
+      switch (timeType) {
+        case 'year':
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'halfyear':
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case '3month':
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'month':
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'week':
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
       }
-      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
       this.fetchData()
     }
   }

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 8779b73..6de166c 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -32,9 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WatchAlarmBar',
   data() {
@@ -59,7 +59,7 @@
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
     }
     this.grid = {
       right: 40,
@@ -75,15 +75,16 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'alarm': '报警数',
+        'warning': '预警数'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['alarm', 'warning']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'alarm'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      alarmBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'alarm': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'alarm': 78 },
+        //   { 'areaName': '厂区', 'alarm': 78 },
+        //   { 'areaName': '分段分区', 'alarm': 38 },
+        //   { 'areaName': '船坞分区', 'alarm': 48 },
+        //   { 'areaName': '刀把码头', 'alarm': 30 },
+        //   { 'areaName': '制管作业区', 'alarm': 82 },
+        //   { 'areaName': '滑道作业区', 'alarm': 34 },
+        //   { 'areaName': '码头作业区', 'alarm': 26 },
+        //   { 'areaName': '车间生产区', 'alarm': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 954fffe..0845249 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -32,8 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
+import { getDoorAreaTree } from '@/api/area'
 
 export default {
   name: 'WaterCountByAreaBar',
@@ -75,15 +76,15 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index d47e358..0e2309d 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,14 +13,14 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
-
+import { countByDayFirst } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDay',
   data() {
     return {
       listQuery: {
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       title: {
@@ -28,18 +28,8 @@
       },
       chartSettings: {
         labelMap: {
-          'dept1': '科技楼及食堂',
-          'dept2': 'A\\B\\C\\D\\E座',
-          'dept3': '厂区',
-          'dept4': '分段分区',
-          'dept5': '船坞分区',
-          'dept6': '刀把码头',
-          'dept7': '制管作业区',
-          'dept8': '滑道作业区',
-          'dept9': '码头作业区',
-          'dept10': '车间生产区'
         },
-        metrics: ['dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        metrics: [],
         dimension: ['date']
       },
       extend: {
@@ -56,56 +46,75 @@
         }
       },
       chartData: {
-        columns: ['date', 'dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        columns: [],
         rows: []
       }
     }
   },
   mounted() {
     this.changeTime('month')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          const area = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(item => item.name)
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = {}
+          for (let i = 0; i < area.length; i++) {
+            this.chartSettings.labelMap[area[i]] = area[i]
+          }
+          this.chartData.columns = ['date', ...area]
+          this.fetchData()
+        }
+      })
+    },
     fetchData() {
-    //   const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-    //   const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-    //   this.listQuery.beginTime = beginTime
-    //   this.listQuery.endTime = endTime
-    //   alarmStaticByDay(this.listQuery).then(response => {
-    //     this.chartData.rows = response.data
-    //   })
+      countByDayFirst(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].areaName] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
+      })
       // 模拟数据
-      this.chartData.rows = [
-        { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
-      ]
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index c65569c..7c3d817 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -21,15 +21,21 @@
 </template>
 
 <script>
-// import { wellStaticByBfzt } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDepy',
   data() {
     return {
+      listQuery: {
+        areaId: '',
+        startTime: '',
+        endTime: ''
+      },
       areaId:'',
-      areaList: [{id:'', name: '生产厂区' }, {id:'', name: '科技楼及食堂' }, {id:'', name: 'A/B/C/D/E座' }],
+      areaList: [],
       chartData: {
-        columns: ['dept', 'wellCount'],
+        columns: ['areaName', 'count'],
         rows: []
       },
       extend: {
@@ -53,62 +59,82 @@
       },
       chartSettings: {
         labelMap: {
-          'dept': '分区',
-          'wellCount': '用水量'
+          'areaName': '分区',
+          'count': '用水量'
         },
-        dimension: 'dept',
-        metrics: 'wellCount'
+        dimension: 'areaName',
+        metrics: 'count'
       }
     }
   },
   mounted() {
     // TODO:待调试真接口
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val){
       this.areaId = val
       this.fetchData()
     },
     // 获取统计数据
     fetchData() {
-      this.chartData.rows = [
-        { 'dept': '科技楼及食堂', 'wellCount': 53 },
-        { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-        { 'dept': '厂区', 'wellCount': 78 },
-        { 'dept': '分段分区', 'wellCount': 78 },
-        { 'dept': '船坞分区', 'wellCount': 78 },
-        { 'dept': '刀把码头', 'wellCount': 78 },
-        { 'dept': '制管作业区', 'wellCount': 78 },
-        { 'dept': '滑道作业区', 'wellCount': 78 },
-        { 'dept': '码头作业区', 'wellCount': 78 },
-        { 'dept': '车间生产区', 'wellCount': 78 }
-      ]
-      // wellStaticByBfzt(this.listQuery).then(response => {
-      //   const data = response.data
-      //   this.chartData.rows = [
-      //     { 'bfzt': '布防', 'wellCount': data.bfWell },
-      //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
-      //   ]
-      // })
+      // this.chartData.rows = [
+      //   { 'areaName': '科技楼及食堂', 'count': 53 },
+      //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+      //   { 'areaName': '厂区', 'count': 78 },
+      //   { 'areaName': '分段分区', 'count': 78 },
+      //   { 'areaName': '船坞分区', 'count': 78 },
+      //   { 'areaName': '刀把码头', 'count': 78 },
+      //   { 'areaName': '制管作业区', 'count': 78 },
+      //   { 'areaName': '滑道作业区', 'count': 78 },
+      //   { 'areaName': '码头作业区', 'count': 78 },
+      //   { 'areaName': '车间生产区', 'count': 78 }
+      // ]
+      this.listQuery.areaId = this.areaId
+      countBySecondArea(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+      })
     },
-    changeDate(date) {
-      let beginTime, endTime
-      if (date === 'today') {
-        beginTime = getDayTime(new Date().getTime())
-        endTime = new Date()
-        this.timeRange = [beginTime, endTime]
-      } else if (date === 'yesterday') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
-        endTime = getDayTime(new Date().getTime())
-      } else if (date === 'sevendays') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-        endTime = new Date()
-      } else if (date === 'lastmonth') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-        endTime = new Date()
+    changeTime(timeType) {
+      let startTime
+      switch (timeType) {
+        case 'year':
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'halfyear':
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case '3month':
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'month':
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'week':
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
       }
-      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
       this.fetchData()
     }
   }
diff --git a/src/views/dashboard/components/waterCountByDeptBar.vue b/src/views/dashboard/components/waterCountByDeptBar.vue
index 4a97a2a..b42cd7b 100644
--- a/src/views/dashboard/components/waterCountByDeptBar.vue
+++ b/src/views/dashboard/components/waterCountByDeptBar.vue
@@ -24,9 +24,8 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countByFirstArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
 export default {
   name: 'WaterCountByDeptBar',
   data() {
@@ -67,11 +66,11 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       isShow: true,
@@ -89,7 +88,7 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
@@ -99,26 +98,30 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.setDefaultTime('week')
     this.fetchData()
   },
   methods: {
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countByFirstArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },

diff --git a/src/api/overview.js b/src/api/overview.js
index 12d78c2..331c728 100644
--- a/src/api/overview.js
+++ b/src/api/overview.js
@@ -16,6 +16,55 @@
     method: 'get'
   })
 }
+
+// 查询一级分区各区用水量
+export function countByFirstArea(params) {
+  return request({
+    url: 'waterStatistic/countByFirstArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询一级分区7日用水量
+export function countByDayFirst(params) {
+  return request({
+    url: 'waterStatistic/countByDayFirst',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区各区用水量
+export function countBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/countBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 查询二级分区水表告警
+export function alarmBySecondArea(params) {
+  return request({
+    url: 'waterStatistic/alarmBySecondArea',
+    method: 'get',
+    params
+  })
+}
+
+// 设备7日报警趋势
+export function alarmCountByDay(params) {
+  return request({
+    url: 'waterStatistic/alarmCountByDay',
+    method: 'get',
+    params
+  })
+}
+
+
+
+
 // 井查询
 export function getWellList(params) {
   return request({
diff --git a/src/views/dashboard/components/AlarmByDays.vue b/src/views/dashboard/components/AlarmByDays.vue
index 5aa42ce..cb5c283 100644
--- a/src/views/dashboard/components/AlarmByDays.vue
+++ b/src/views/dashboard/components/AlarmByDays.vue
@@ -13,7 +13,7 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { alarmCountByDay } from '@/api/overview'
 
 export default {
   name: 'AlarmByDays',
@@ -23,20 +23,21 @@
     }
     this.chartSettings = {
       labelMap: {
-        'alarmWells': '报警井数',
-        'alarmTimes': '报警次数'
+        '远传水表': '远传水表',
+        '噪声记录仪': '噪声记录仪',
+        '液位监测仪': '液位监测仪'
       },
-      metrics: ['alarmTimes', 'alarmWells'],
+      metrics: ['远传水表', '噪声记录仪', '液位监测仪'],
       dimension: ['date']
     }
     return {
       listQuery: {
         deviceType: '',
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       chartData: {
-        columns: ['date', 'alarmTimes', 'alarmWells'],
+        columns: ['date', '远传水表', '噪声记录仪', '液位监测仪'],
         rows: []
       }
     }
@@ -56,36 +57,39 @@
   },
   methods: {
     fetchData() {
-      // const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-      // const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-      // this.listQuery.beginTime = beginTime
-      // this.listQuery.endTime = endTime
-      alarmStaticByDay(this.listQuery).then(response => {
-        this.chartData.rows = response.data
+      alarmCountByDay(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].name] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
       })
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/watchAlarmBar.vue b/src/views/dashboard/components/watchAlarmBar.vue
index 8779b73..6de166c 100644
--- a/src/views/dashboard/components/watchAlarmBar.vue
+++ b/src/views/dashboard/components/watchAlarmBar.vue
@@ -32,9 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { alarmBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WatchAlarmBar',
   data() {
@@ -59,7 +59,7 @@
         label: { show: true, position: 'top', formatter: '{c}' },
         barWidth: 25
       },
-      tooltip: { trigger: 'item', formatter: '{b}<br/>用水量：{c}吨' }
+      tooltip: { trigger: 'item', formatter: '{b}<br/>报警次数：{c}次' }
     }
     this.grid = {
       right: 40,
@@ -75,15 +75,16 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'alarm': '报警数',
+        'warning': '预警数'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['alarm', 'warning']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'alarm'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      alarmBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'alarm': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'alarm': 78 },
+        //   { 'areaName': '厂区', 'alarm': 78 },
+        //   { 'areaName': '分段分区', 'alarm': 38 },
+        //   { 'areaName': '船坞分区', 'alarm': 48 },
+        //   { 'areaName': '刀把码头', 'alarm': 30 },
+        //   { 'areaName': '制管作业区', 'alarm': 82 },
+        //   { 'areaName': '滑道作业区', 'alarm': 34 },
+        //   { 'areaName': '码头作业区', 'alarm': 26 },
+        //   { 'areaName': '车间生产区', 'alarm': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByAreaBar.vue b/src/views/dashboard/components/waterCountByAreaBar.vue
index 954fffe..0845249 100644
--- a/src/views/dashboard/components/waterCountByAreaBar.vue
+++ b/src/views/dashboard/components/waterCountByAreaBar.vue
@@ -32,8 +32,9 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
+import { getDoorAreaTree } from '@/api/area'
 
 export default {
   name: 'WaterCountByAreaBar',
@@ -75,15 +76,15 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       areaId: '',
-      areaList: [{ id: '', name: '生产厂区' }, { id: '', name: '科技楼及食堂' }, { id: '', name: 'A/B/C/D/E座' }],
+      areaList: [],
       isShow: true,
       defaultTimeRange: [],
       timeRange: [],
@@ -99,40 +100,55 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
   },
-  watch: {
-    timeRange(val) {
-    }
-  },
   mounted() {
     this.setDefaultTime('today')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val) {
       this.areaId = val
       this.fetchData()
     },
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        areaId: this.areaId,
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countBySecondArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index d47e358..0e2309d 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -13,14 +13,14 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
-
+import { countByDayFirst } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDay',
   data() {
     return {
       listQuery: {
-        beginTime: '',
+        startTime: '',
         endTime: ''
       },
       title: {
@@ -28,18 +28,8 @@
       },
       chartSettings: {
         labelMap: {
-          'dept1': '科技楼及食堂',
-          'dept2': 'A\\B\\C\\D\\E座',
-          'dept3': '厂区',
-          'dept4': '分段分区',
-          'dept5': '船坞分区',
-          'dept6': '刀把码头',
-          'dept7': '制管作业区',
-          'dept8': '滑道作业区',
-          'dept9': '码头作业区',
-          'dept10': '车间生产区'
         },
-        metrics: ['dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        metrics: [],
         dimension: ['date']
       },
       extend: {
@@ -56,56 +46,75 @@
         }
       },
       chartData: {
-        columns: ['date', 'dept2', 'dept1', 'dept3', 'dept4', 'dept5', 'dept6', 'dept7', 'dept8', 'dept9', 'dept10'],
+        columns: [],
         rows: []
       }
     }
   },
   mounted() {
     this.changeTime('month')
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          const area = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(item => item.name)
+          this.chartSettings.metrics = area
+          this.chartSettings.labelMap = {}
+          for (let i = 0; i < area.length; i++) {
+            this.chartSettings.labelMap[area[i]] = area[i]
+          }
+          this.chartData.columns = ['date', ...area]
+          this.fetchData()
+        }
+      })
+    },
     fetchData() {
-    //   const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
-    //   const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
-    //   this.listQuery.beginTime = beginTime
-    //   this.listQuery.endTime = endTime
-    //   alarmStaticByDay(this.listQuery).then(response => {
-    //     this.chartData.rows = response.data
-    //   })
+      countByDayFirst(this.listQuery).then(response => {
+        const arr = response.data.map(function(item) {
+          for (let i = 0; i < item.data.length; i++) {
+            item[item.data[i].areaName] = item.data[i].count
+          }
+          delete item.data
+          return item
+        })
+        this.chartData.rows = arr
+      })
       // 模拟数据
-      this.chartData.rows = [
-        { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
-        { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
-      ]
+      // this.chartData.rows = [
+      //   { date: '11月29日', dept1: 153, dept2: 43, dept3: 1, dept4: 1, dept5: 1, dept6: 7, dept7: 6, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '11月30日', dept1: 150, dept2: 30, dept3: 2, dept4: 1, dept5: 4, dept6: 6, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月1日 ', dept1: 143, dept2: 23, dept3: 3, dept4: 2, dept5: 2, dept6: 7, dept7: 3, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月2日 ', dept1: 173, dept2: 23, dept3: 4, dept4: 4, dept5: 1, dept6: 1, dept7: 8, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月3日 ', dept1: 272, dept2: 52, dept3: 5, dept4: 1, dept5: 4, dept6: 7, dept7: 9, dept8: 2, dept9: 1, dept10: 3 },
+      //   { date: '12月4日 ', dept1: 253, dept2: 53, dept3: 6, dept4: 5, dept5: 5, dept6: 2, dept7: 9, dept8: 2, dept9: 1, dept10: 3 }
+      // ]
     },
     changeTime(timeType) {
-      let beginTime
+      let startTime
       switch (timeType) {
         case 'year':
-          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'halfyear':
-          beginTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case '3month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'month':
-          beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
         case 'week':
-          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
           break
       }
       const endTime = new Date()
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index c65569c..7c3d817 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -21,15 +21,21 @@
 </template>
 
 <script>
-// import { wellStaticByBfzt } from '@/api/dataStatics'
+import { countBySecondArea } from '@/api/overview'
+import { getDoorAreaTree } from '@/api/area'
 export default {
   name: 'WaterCountByDepy',
   data() {
     return {
+      listQuery: {
+        areaId: '',
+        startTime: '',
+        endTime: ''
+      },
       areaId:'',
-      areaList: [{id:'', name: '生产厂区' }, {id:'', name: '科技楼及食堂' }, {id:'', name: 'A/B/C/D/E座' }],
+      areaList: [],
       chartData: {
-        columns: ['dept', 'wellCount'],
+        columns: ['areaName', 'count'],
         rows: []
       },
       extend: {
@@ -53,62 +59,82 @@
       },
       chartSettings: {
         labelMap: {
-          'dept': '分区',
-          'wellCount': '用水量'
+          'areaName': '分区',
+          'count': '用水量'
         },
-        dimension: 'dept',
-        metrics: 'wellCount'
+        dimension: 'areaName',
+        metrics: 'count'
       }
     }
   },
   mounted() {
     // TODO:待调试真接口
-    this.fetchData()
+    this.fetchArea()
   },
   methods: {
+    fetchArea() {
+      getDoorAreaTree().then(response => {
+        if (response.code === 200) {
+          this.areaList = response.data.filter(item => {
+            return item.pid === '1'
+          }).map(function(item) {
+            return {
+              id: item.id, name: item.name
+            }
+          })
+          if (this.areaList.length !== 0) { this.areaChange(this.areaList[0].id) }
+        }
+      })
+    },
     areaChange(val){
       this.areaId = val
       this.fetchData()
     },
     // 获取统计数据
     fetchData() {
-      this.chartData.rows = [
-        { 'dept': '科技楼及食堂', 'wellCount': 53 },
-        { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-        { 'dept': '厂区', 'wellCount': 78 },
-        { 'dept': '分段分区', 'wellCount': 78 },
-        { 'dept': '船坞分区', 'wellCount': 78 },
-        { 'dept': '刀把码头', 'wellCount': 78 },
-        { 'dept': '制管作业区', 'wellCount': 78 },
-        { 'dept': '滑道作业区', 'wellCount': 78 },
-        { 'dept': '码头作业区', 'wellCount': 78 },
-        { 'dept': '车间生产区', 'wellCount': 78 }
-      ]
-      // wellStaticByBfzt(this.listQuery).then(response => {
-      //   const data = response.data
-      //   this.chartData.rows = [
-      //     { 'bfzt': '布防', 'wellCount': data.bfWell },
-      //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
-      //   ]
-      // })
+      // this.chartData.rows = [
+      //   { 'areaName': '科技楼及食堂', 'count': 53 },
+      //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+      //   { 'areaName': '厂区', 'count': 78 },
+      //   { 'areaName': '分段分区', 'count': 78 },
+      //   { 'areaName': '船坞分区', 'count': 78 },
+      //   { 'areaName': '刀把码头', 'count': 78 },
+      //   { 'areaName': '制管作业区', 'count': 78 },
+      //   { 'areaName': '滑道作业区', 'count': 78 },
+      //   { 'areaName': '码头作业区', 'count': 78 },
+      //   { 'areaName': '车间生产区', 'count': 78 }
+      // ]
+      this.listQuery.areaId = this.areaId
+      countBySecondArea(this.listQuery).then(response => {
+        this.chartData.rows = response.data
+      })
     },
-    changeDate(date) {
-      let beginTime, endTime
-      if (date === 'today') {
-        beginTime = getDayTime(new Date().getTime())
-        endTime = new Date()
-        this.timeRange = [beginTime, endTime]
-      } else if (date === 'yesterday') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 60 * 60 * 1000)
-        endTime = getDayTime(new Date().getTime())
-      } else if (date === 'sevendays') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
-        endTime = new Date()
-      } else if (date === 'lastmonth') {
-        beginTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
-        endTime = new Date()
+    changeTime(timeType) {
+      let startTime
+      switch (timeType) {
+        case 'year':
+          startTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'halfyear':
+          startTime = getDayTime(new Date().getTime() - 24 * 182 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case '3month':
+          startTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'month':
+          startTime = getDayTime(new Date().getTime() - 24 * 30 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
+        case 'week':
+          startTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.startTime = startTime.Format('yyyy-MM-dd')
+          break
       }
-      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
       this.fetchData()
     }
   }
diff --git a/src/views/dashboard/components/waterCountByDeptBar.vue b/src/views/dashboard/components/waterCountByDeptBar.vue
index 4a97a2a..b42cd7b 100644
--- a/src/views/dashboard/components/waterCountByDeptBar.vue
+++ b/src/views/dashboard/components/waterCountByDeptBar.vue
@@ -24,9 +24,8 @@
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
-import { wellStaticByType } from '@/api/dataStatics'
+import { countByFirstArea } from '@/api/overview'
 import { getDayTime } from '@/utils/dateutils'
-
 export default {
   name: 'WaterCountByDeptBar',
   data() {
@@ -67,11 +66,11 @@
       },
 
       labelMap: {
-        'dept': '分区',
-        'wellCount': '用水量'
+        'areaName': '分区',
+        'count': '用水量'
       },
-      dimension: ['dept'],
-      metrics: ['wellCount']
+      dimension: ['areaName'],
+      metrics: ['count']
     }
     return {
       isShow: true,
@@ -89,7 +88,7 @@
         }
       },
       chartData: {
-        columns: ['wellTypeName', 'wellCount'],
+        columns: ['wellTypeName', 'count'],
         rows: []
       }
     }
@@ -99,26 +98,30 @@
     }
   },
   mounted() {
-    this.setDefaultTime('today')
+    this.setDefaultTime('week')
     this.fetchData()
   },
   methods: {
     fetchData() {
-      wellStaticByType().then(response => {
+      const params = {
+        startTime: this.timeRange[0],
+        endTime: this.timeRange[1]
+      }
+      countByFirstArea(params).then(response => {
         this.isShow = false
         this.chartData.rows = response.data
-        this.chartData.rows = [
-          { 'dept': '科技楼及食堂', 'wellCount': 53 },
-          { 'dept': 'A\\B\\C\\D\\E座', 'wellCount': 78 },
-          { 'dept': '厂区', 'wellCount': 78 },
-          { 'dept': '分段分区', 'wellCount': 38 },
-          { 'dept': '船坞分区', 'wellCount': 48 },
-          { 'dept': '刀把码头', 'wellCount': 30 },
-          { 'dept': '制管作业区', 'wellCount': 82 },
-          { 'dept': '滑道作业区', 'wellCount': 34 },
-          { 'dept': '码头作业区', 'wellCount': 26 },
-          { 'dept': '车间生产区', 'wellCount': 45 }
-        ]
+        // this.chartData.rows = [
+        //   { 'areaName': '科技楼及食堂', 'count': 53 },
+        //   { 'areaName': 'A\\B\\C\\D\\E座', 'count': 78 },
+        //   { 'areaName': '厂区', 'count': 78 },
+        //   { 'areaName': '分段分区', 'count': 38 },
+        //   { 'areaName': '船坞分区', 'count': 48 },
+        //   { 'areaName': '刀把码头', 'count': 30 },
+        //   { 'areaName': '制管作业区', 'count': 82 },
+        //   { 'areaName': '滑道作业区', 'count': 34 },
+        //   { 'areaName': '码头作业区', 'count': 26 },
+        //   { 'areaName': '车间生产区', 'count': 45 }
+        // ]
         this.isShow = true
       })
     },
diff --git a/static/project.config.json b/static/project.config.json
index 1bd8422..756d185 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,6 +1,6 @@
 {
   "title": "供水管理系统",
-  "baseUrl": "http://192.168.8.102:11643/",
+  "baseUrl": "http://111.198.10.15:11639/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "city":"青岛市",