diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps

diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index e691f40..10efcd2 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '青岛中海油地下管网管理系统'
+  title: '供水管理系统'
 }
 export function getProject() {
   return project

diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index e691f40..10efcd2 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '青岛中海油地下管网管理系统'
+  title: '供水管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 29ab1c3..d5c2912 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -1,6 +1,13 @@
 <template>
-  <div>
+  <div class="container">
     <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
   </div>
 </template>
 
@@ -13,7 +20,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         beginTime: '',
         endTime: ''
       },
@@ -40,6 +46,10 @@
         grid:{
           top:120
         },
+        yAxis:{
+          name:'用水量（吨）',
+          position:'left'
+        },
         legend:{
           // type: 'scroll',
           top:'40px'
@@ -73,7 +83,51 @@
         { 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
+      switch(timeType){
+        case 'year':
+          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case '3month':
+          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case 'week':
+          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          break
+      }
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:100%;
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
+

diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index e691f40..10efcd2 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '青岛中海油地下管网管理系统'
+  title: '供水管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 29ab1c3..d5c2912 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -1,6 +1,13 @@
 <template>
-  <div>
+  <div class="container">
     <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
   </div>
 </template>
 
@@ -13,7 +20,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         beginTime: '',
         endTime: ''
       },
@@ -40,6 +46,10 @@
         grid:{
           top:120
         },
+        yAxis:{
+          name:'用水量（吨）',
+          position:'left'
+        },
         legend:{
           // type: 'scroll',
           top:'40px'
@@ -73,7 +83,51 @@
         { 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
+      switch(timeType){
+        case 'year':
+          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case '3month':
+          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case 'week':
+          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          break
+      }
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:100%;
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
+
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index cbfd166..5145dd6 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -1,5 +1,14 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <div class="container">
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -25,7 +34,8 @@
         series: {
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
-        }
+        },
+        tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%'}
       },
       title:{
         text: '各分区用水统计'
@@ -66,7 +76,41 @@
       //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
       //   ]
       // })
+    },
+    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()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:calc(100% - 120px);
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index e691f40..10efcd2 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '青岛中海油地下管网管理系统'
+  title: '供水管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 29ab1c3..d5c2912 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -1,6 +1,13 @@
 <template>
-  <div>
+  <div class="container">
     <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
   </div>
 </template>
 
@@ -13,7 +20,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         beginTime: '',
         endTime: ''
       },
@@ -40,6 +46,10 @@
         grid:{
           top:120
         },
+        yAxis:{
+          name:'用水量（吨）',
+          position:'left'
+        },
         legend:{
           // type: 'scroll',
           top:'40px'
@@ -73,7 +83,51 @@
         { 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
+      switch(timeType){
+        case 'year':
+          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case '3month':
+          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case 'week':
+          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          break
+      }
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:100%;
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
+
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index cbfd166..5145dd6 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -1,5 +1,14 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <div class="container">
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -25,7 +34,8 @@
         series: {
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
-        }
+        },
+        tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%'}
       },
       title:{
         text: '各分区用水统计'
@@ -66,7 +76,41 @@
       //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
       //   ]
       // })
+    },
+    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()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:calc(100% - 120px);
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCountByDeptBar.vue b/src/views/dashboard/components/waterCountByDeptBar.vue
index 09661b7..d072b9d 100644
--- a/src/views/dashboard/components/waterCountByDeptBar.vue
+++ b/src/views/dashboard/components/waterCountByDeptBar.vue
@@ -1,39 +1,90 @@
 <template>
-  <ve-histogram :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container">
+    <ve-histogram :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-date-picker
+        v-model="timeRange"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        value-format="yyyy-MM-dd"
+        size="mini"
+        style="width:250px;margin-right: 20px"
+        :picker-options="pickerOptions"
+        @change="fetchData"/>
+      <el-checkbox size="small" v-model="checked">本月用水</el-checkbox>
+    </div>
+  </div>
 </template>
 
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
 import { wellStaticByType } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name:'waterCountByDeptBar',
   data() {
     this.extend = {
+      legend:{
+        show: false
+      },
+      xAxis: {
+        axisLabel: {
+          rotate: 30,
+          margin: 30,
+          textStyle: {
+            align: 'center'
+          }
+        }
+      },
+      yAxis:{
+        name:'用水量（吨）',
+        position:'left'
+      },
       series: {
-        label: { show: true, position: 'top' }
-      }
+        label: { show: true, position: 'top', formatter: '{c}' },
+        barWidth: 25
+      },
+      tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨'}
     }
     this.grid = {
-      right: 60
+      right: 40,
+      top: 100,
+      bottom:5
     }
     this.title = {
       text: '各分区用水统计'
     }
     this.chartSettings = {
       itemStyle: {
-        'barCategoryGap': 5
+        barCategoryGap: 10
       },
-      barWidth: 15,
+
       labelMap: {
         'dept': '分区',
-        'wellCount': '井数量'
+        'wellCount': '用水量'
       },
       dimension: ['dept'],
       metrics: ['wellCount']
     }
     return {
+      checked: true,
+      defaultTimeRange:[],
+      timeRange:[],
+      pickerOptions:{
+        disabledDate: function(date){
+          var oDate1 = new Date(date);
+          var oDate2 = new Date();
+          if(oDate1.getTime() > oDate2.getTime()){
+            return true
+          }else{
+            return false
+          }
+        }
+      },
       chartData: {
         columns: ['wellTypeName', 'wellCount'],
         rows: []
@@ -41,8 +92,23 @@
     }
   },
   mounted() {
+    this.setDefaultTime()
     this.fetchData()
   },
+  watch:{
+    timeRange(val){
+      if(this.timeRange[0]!==this.defaultTimeRange[0] || this.timeRange[1]!==this.defaultTimeRange[1]){
+        this.checked = false
+      }else {
+        this.checked = true
+      }
+    },
+    checked(val){
+      if(val){
+        this.setDefaultTime()
+      }
+    }
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
@@ -51,16 +117,39 @@
           { '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 },
+          { 'dept': '分段分区', 'wellCount': 38 },
+          { 'dept': '船坞分区', 'wellCount': 48 },
+          { 'dept': '刀把码头', 'wellCount': 30 },
+          { 'dept': '制管作业区', 'wellCount': 82 },
+          { 'dept': '滑道作业区', 'wellCount': 34 },
+          { 'dept': '码头作业区', 'wellCount': 26 },
+          { 'dept': '车间生产区', 'wellCount': 45 },
         ]
       })
+    },
+    setDefaultTime(){
+      var today = new Date();
+      var tYear = today.getFullYear()
+      var tMonth = today.getMonth()+1
+      if (tMonth.toString().length == 1) {
+        tMonth = "0" + zero;
+      }
+      const beginTime = tYear + "-" + tMonth + "-01"
+      const endTime = getDayTime(new Date().getTime())
+      this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      this.defaultTimeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      top: 0px;
+      right:20px;
+    }
+  }
+</style>

diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index e691f40..10efcd2 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '青岛中海油地下管网管理系统'
+  title: '供水管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 29ab1c3..d5c2912 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -1,6 +1,13 @@
 <template>
-  <div>
+  <div class="container">
     <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
   </div>
 </template>
 
@@ -13,7 +20,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         beginTime: '',
         endTime: ''
       },
@@ -40,6 +46,10 @@
         grid:{
           top:120
         },
+        yAxis:{
+          name:'用水量（吨）',
+          position:'left'
+        },
         legend:{
           // type: 'scroll',
           top:'40px'
@@ -73,7 +83,51 @@
         { 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
+      switch(timeType){
+        case 'year':
+          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case '3month':
+          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case 'week':
+          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          break
+      }
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:100%;
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
+
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index cbfd166..5145dd6 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -1,5 +1,14 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <div class="container">
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -25,7 +34,8 @@
         series: {
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
-        }
+        },
+        tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%'}
       },
       title:{
         text: '各分区用水统计'
@@ -66,7 +76,41 @@
       //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
       //   ]
       // })
+    },
+    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()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:calc(100% - 120px);
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCountByDeptBar.vue b/src/views/dashboard/components/waterCountByDeptBar.vue
index 09661b7..d072b9d 100644
--- a/src/views/dashboard/components/waterCountByDeptBar.vue
+++ b/src/views/dashboard/components/waterCountByDeptBar.vue
@@ -1,39 +1,90 @@
 <template>
-  <ve-histogram :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container">
+    <ve-histogram :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-date-picker
+        v-model="timeRange"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        value-format="yyyy-MM-dd"
+        size="mini"
+        style="width:250px;margin-right: 20px"
+        :picker-options="pickerOptions"
+        @change="fetchData"/>
+      <el-checkbox size="small" v-model="checked">本月用水</el-checkbox>
+    </div>
+  </div>
 </template>
 
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
 import { wellStaticByType } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name:'waterCountByDeptBar',
   data() {
     this.extend = {
+      legend:{
+        show: false
+      },
+      xAxis: {
+        axisLabel: {
+          rotate: 30,
+          margin: 30,
+          textStyle: {
+            align: 'center'
+          }
+        }
+      },
+      yAxis:{
+        name:'用水量（吨）',
+        position:'left'
+      },
       series: {
-        label: { show: true, position: 'top' }
-      }
+        label: { show: true, position: 'top', formatter: '{c}' },
+        barWidth: 25
+      },
+      tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨'}
     }
     this.grid = {
-      right: 60
+      right: 40,
+      top: 100,
+      bottom:5
     }
     this.title = {
       text: '各分区用水统计'
     }
     this.chartSettings = {
       itemStyle: {
-        'barCategoryGap': 5
+        barCategoryGap: 10
       },
-      barWidth: 15,
+
       labelMap: {
         'dept': '分区',
-        'wellCount': '井数量'
+        'wellCount': '用水量'
       },
       dimension: ['dept'],
       metrics: ['wellCount']
     }
     return {
+      checked: true,
+      defaultTimeRange:[],
+      timeRange:[],
+      pickerOptions:{
+        disabledDate: function(date){
+          var oDate1 = new Date(date);
+          var oDate2 = new Date();
+          if(oDate1.getTime() > oDate2.getTime()){
+            return true
+          }else{
+            return false
+          }
+        }
+      },
       chartData: {
         columns: ['wellTypeName', 'wellCount'],
         rows: []
@@ -41,8 +92,23 @@
     }
   },
   mounted() {
+    this.setDefaultTime()
     this.fetchData()
   },
+  watch:{
+    timeRange(val){
+      if(this.timeRange[0]!==this.defaultTimeRange[0] || this.timeRange[1]!==this.defaultTimeRange[1]){
+        this.checked = false
+      }else {
+        this.checked = true
+      }
+    },
+    checked(val){
+      if(val){
+        this.setDefaultTime()
+      }
+    }
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
@@ -51,16 +117,39 @@
           { '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 },
+          { 'dept': '分段分区', 'wellCount': 38 },
+          { 'dept': '船坞分区', 'wellCount': 48 },
+          { 'dept': '刀把码头', 'wellCount': 30 },
+          { 'dept': '制管作业区', 'wellCount': 82 },
+          { 'dept': '滑道作业区', 'wellCount': 34 },
+          { 'dept': '码头作业区', 'wellCount': 26 },
+          { 'dept': '车间生产区', 'wellCount': 45 },
         ]
       })
+    },
+    setDefaultTime(){
+      var today = new Date();
+      var tYear = today.getFullYear()
+      var tMonth = today.getMonth()+1
+      if (tMonth.toString().length == 1) {
+        tMonth = "0" + zero;
+      }
+      const beginTime = tYear + "-" + tMonth + "-01"
+      const endTime = getDayTime(new Date().getTime())
+      this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      this.defaultTimeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      top: 0px;
+      right:20px;
+    }
+  }
+</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 502d027..0e50682 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane label="远传水表" name="water">
+        <list-water-data ref="waterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -40,10 +43,11 @@
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
+import ListWaterData from "./deviceData/listWaterData";
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: {ListWaterData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'waater') {
+        this.$refs.waterdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'water'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else {
+        this.activeName = 'water'
       }
     }
   }

diff --git a/config/index.js b/config/index.js
index 617ddb8..106eaa6 100644
--- a/config/index.js
+++ b/config/index.js
@@ -69,7 +69,7 @@
      * then assetsPublicPath should be set to "/bar/".
      * In most cases please use '/' !!!
      */
-    assetsPublicPath: '/smartwellfast/',
+    assetsPublicPath: '/qd/',
 
     /**
      * Source Maps
diff --git a/src/utils/baseConfig.js b/src/utils/baseConfig.js
index e691f40..10efcd2 100644
--- a/src/utils/baseConfig.js
+++ b/src/utils/baseConfig.js
@@ -1,5 +1,5 @@
 const project = {
-  title: '青岛中海油地下管网管理系统'
+  title: '供水管理系统'
 }
 export function getProject() {
   return project
diff --git a/src/views/dashboard/components/waterCountByDay.vue b/src/views/dashboard/components/waterCountByDay.vue
index 29ab1c3..d5c2912 100644
--- a/src/views/dashboard/components/waterCountByDay.vue
+++ b/src/views/dashboard/components/waterCountByDay.vue
@@ -1,6 +1,13 @@
 <template>
-  <div>
+  <div class="container">
     <ve-line :data="chartData" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
   </div>
 </template>
 
@@ -13,7 +20,6 @@
   data() {
     return {
       listQuery: {
-        deviceType: '',
         beginTime: '',
         endTime: ''
       },
@@ -40,6 +46,10 @@
         grid:{
           top:120
         },
+        yAxis:{
+          name:'用水量（吨）',
+          position:'left'
+        },
         legend:{
           // type: 'scroll',
           top:'40px'
@@ -73,7 +83,51 @@
         { 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
+      switch(timeType){
+        case 'year':
+          beginTime = getDayTime(new Date().getTime() - 24 * 365 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case '3month':
+          beginTime = getDayTime(new Date().getTime() - 24 * 90 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.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')
+          break
+        case 'week':
+          beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+          this.listQuery.beginTime = beginTime.Format('yyyy-MM-dd')
+          break
+      }
+      const endTime = new Date()
+      this.listQuery.endTime = endTime.Format('yyyy-MM-dd')
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:100%;
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
+
diff --git a/src/views/dashboard/components/waterCountByDept.vue b/src/views/dashboard/components/waterCountByDept.vue
index cbfd166..5145dd6 100644
--- a/src/views/dashboard/components/waterCountByDept.vue
+++ b/src/views/dashboard/components/waterCountByDept.vue
@@ -1,5 +1,14 @@
 <template>
-  <ve-pie :data="chartData" :extend="extend" :title="title"/>
+  <div class="container">
+    <ve-pie :data="chartData" :extend="extend" :title="title"/>
+    <div class="function">
+      <el-button round size="mini" @click="changeTime('year')">近1年</el-button>
+      <el-button round size="mini" @click="changeTime('halfyear')">近6月</el-button>
+      <el-button round size="mini" @click="changeTime('3month')">近3月</el-button>
+      <el-button round size="mini" @click="changeTime('month')">近1月</el-button>
+      <el-button round size="mini" @click="changeTime('week')">近1周</el-button>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -25,7 +34,8 @@
         series: {
           label: { show: true, position: 'outside', formatter: '{b}' },
           right: 120
-        }
+        },
+        tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨<br/>占比：{d}%'}
       },
       title:{
         text: '各分区用水统计'
@@ -66,7 +76,41 @@
       //     { 'bfzt': '撤防', 'wellCount': data.cfWell }
       //   ]
       // })
+    },
+    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()
+      }
+      this.timeRange = [beginTime.Format('yyyy-MM-dd hh:mm:ss'), endTime.Format('yyyy-MM-dd hh:mm:ss')]
+      this.fetchData()
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      bottom: 10px;
+      left: 0;
+      width:calc(100% - 120px);
+      height: 32px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+</style>
diff --git a/src/views/dashboard/components/waterCountByDeptBar.vue b/src/views/dashboard/components/waterCountByDeptBar.vue
index 09661b7..d072b9d 100644
--- a/src/views/dashboard/components/waterCountByDeptBar.vue
+++ b/src/views/dashboard/components/waterCountByDeptBar.vue
@@ -1,39 +1,90 @@
 <template>
-  <ve-histogram :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+  <div class="container">
+    <ve-histogram :data="chartData" :grid="grid" :title="title" :extend="extend" :settings="chartSettings"/>
+    <div class="function">
+      <el-date-picker
+        v-model="timeRange"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        value-format="yyyy-MM-dd"
+        size="mini"
+        style="width:250px;margin-right: 20px"
+        :picker-options="pickerOptions"
+        @change="fetchData"/>
+      <el-checkbox size="small" v-model="checked">本月用水</el-checkbox>
+    </div>
+  </div>
 </template>
 
 <script>
 // 引入视觉映射组件
 import 'echarts/lib/component/visualMap'
 import { wellStaticByType } from '@/api/dataStatics'
+import { getDayTime } from '@/utils/dateutils'
 
 export default {
   name:'waterCountByDeptBar',
   data() {
     this.extend = {
+      legend:{
+        show: false
+      },
+      xAxis: {
+        axisLabel: {
+          rotate: 30,
+          margin: 30,
+          textStyle: {
+            align: 'center'
+          }
+        }
+      },
+      yAxis:{
+        name:'用水量（吨）',
+        position:'left'
+      },
       series: {
-        label: { show: true, position: 'top' }
-      }
+        label: { show: true, position: 'top', formatter: '{c}' },
+        barWidth: 25
+      },
+      tooltip:{ trigger:'item',formatter: '{b}<br/>用水量：{c}吨'}
     }
     this.grid = {
-      right: 60
+      right: 40,
+      top: 100,
+      bottom:5
     }
     this.title = {
       text: '各分区用水统计'
     }
     this.chartSettings = {
       itemStyle: {
-        'barCategoryGap': 5
+        barCategoryGap: 10
       },
-      barWidth: 15,
+
       labelMap: {
         'dept': '分区',
-        'wellCount': '井数量'
+        'wellCount': '用水量'
       },
       dimension: ['dept'],
       metrics: ['wellCount']
     }
     return {
+      checked: true,
+      defaultTimeRange:[],
+      timeRange:[],
+      pickerOptions:{
+        disabledDate: function(date){
+          var oDate1 = new Date(date);
+          var oDate2 = new Date();
+          if(oDate1.getTime() > oDate2.getTime()){
+            return true
+          }else{
+            return false
+          }
+        }
+      },
       chartData: {
         columns: ['wellTypeName', 'wellCount'],
         rows: []
@@ -41,8 +92,23 @@
     }
   },
   mounted() {
+    this.setDefaultTime()
     this.fetchData()
   },
+  watch:{
+    timeRange(val){
+      if(this.timeRange[0]!==this.defaultTimeRange[0] || this.timeRange[1]!==this.defaultTimeRange[1]){
+        this.checked = false
+      }else {
+        this.checked = true
+      }
+    },
+    checked(val){
+      if(val){
+        this.setDefaultTime()
+      }
+    }
+  },
   methods: {
     fetchData() {
       wellStaticByType().then(response => {
@@ -51,16 +117,39 @@
           { '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 },
+          { 'dept': '分段分区', 'wellCount': 38 },
+          { 'dept': '船坞分区', 'wellCount': 48 },
+          { 'dept': '刀把码头', 'wellCount': 30 },
+          { 'dept': '制管作业区', 'wellCount': 82 },
+          { 'dept': '滑道作业区', 'wellCount': 34 },
+          { 'dept': '码头作业区', 'wellCount': 26 },
+          { 'dept': '车间生产区', 'wellCount': 45 },
         ]
       })
+    },
+    setDefaultTime(){
+      var today = new Date();
+      var tYear = today.getFullYear()
+      var tMonth = today.getMonth()+1
+      if (tMonth.toString().length == 1) {
+        tMonth = "0" + zero;
+      }
+      const beginTime = tYear + "-" + tMonth + "-01"
+      const endTime = getDayTime(new Date().getTime())
+      this.timeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
+      this.defaultTimeRange = [beginTime, endTime.Format('yyyy-MM-dd')]
     }
   }
 }
 </script>
+<style lang="scss" scoped>
+  .container{
+    position:relative;
+    .function{
+      position:absolute;
+      z-index:200;
+      top: 0px;
+      right:20px;
+    }
+  }
+</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 502d027..0e50682 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -25,6 +25,9 @@
       <el-tab-pane v-if="hasPerm('/welllocadata/list')" label="井盖定位监测仪" name="wellloca">
         <list-well-loca-data ref="welllocadatacomp"/>
       </el-tab-pane>
+      <el-tab-pane label="远传水表" name="water">
+        <list-water-data ref="waterdatacomp"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -40,10 +43,11 @@
 import { parseUrl } from '@/utils/parseutils'
 import { hasPermission } from '@/utils/permission'
 import ListNoiseData from './deviceData/listNoiseData'
+import ListWaterData from "./deviceData/listWaterData";
 
 export default {
   name: 'DataManage',
-  components: { ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
+  components: {ListWaterData, ListNoiseData, ListWellLocaData, ListTempData, ListHarmfulData, ListDigData, ListGasData, ListLiquidData, ListWellCoverData },
   data() {
     return {
       activeName: 'wellcover'
@@ -86,6 +90,8 @@
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
         this.$refs.welllocadatacomp.fetchData()
+      } else if (tab.name === 'waater') {
+        this.$refs.waterdatacomp.fetchData()
       }
     },
     changeTab(deviceType) {
@@ -105,6 +111,8 @@
         this.activeName = 'wellloca'
       } else if (deviceType === '8') {
         this.activeName = 'noise'
+      } else if (deviceType === '10') {
+        this.activeName = 'water'
       }
     },
     // 计算那个是当前第一个tab
@@ -125,6 +133,8 @@
         this.activeName = 'wellloca'
       } else if (hasPermission('/noisedata/list')) {
         this.activeName = 'noise'
+      } else {
+        this.activeName = 'water'
       }
     }
   }
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
new file mode 100644
index 0000000..d20c8ca
--- /dev/null
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -0,0 +1,275 @@
+<template>
+  <div class="app-container">
+    <!--筛选条件-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择分区"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--查询结果Table显示-->
+    <div style="padding:0px 10px">
+      <el-row class="table-title">
+        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="12" :offset="6" class="edit_btns">
+          <el-button v-if="hasPerm('/liquiddata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+        </el-col>
+      </el-row>
+      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
+        <!--<el-table-column align="center" type="selection" width="55"/>-->
+        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
+            <span v-else>{{ scope.row[column.value] }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!--分页-->
+    <div class="pagination-container">
+      <el-pagination
+        v-show="total>listQuery.limit"
+        :current-page="listQuery.offset"
+        :page-sizes="[20,30,50]"
+        :page-size="listQuery.limit"
+        :total="total"
+        align="center"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"/>
+    </div>
+  </div>
+</template>
+
+<script>
+import selectTree from '@/components/SelectTree/singleSelect'
+import { getLiquidData, batchExportLiquidData } from '@/api/data'
+import DeptSelect from '../../../components/DeptSelect/index'
+import { parseUrl } from '@/utils/parseutils'
+
+export default {
+  name: 'ListWaterData',
+  components: { DeptSelect, selectTree },
+  data() {
+    return {
+      listQuery: {
+        keywords: '', // 关键字
+        deptid: '', // 部门id
+        beginTime: '', // 开始时间
+        endTime: '', // 结束时间
+        offset: 1,
+        limit: 20,
+        sort: '',
+        order: ''
+      }, // 筛选条件
+      timeRange: [], // 时间范围
+      columns: [
+        {
+          text: '设备编号',
+          value: 'devcode',
+          align: 'center'
+        },
+        {
+          text: '井编号',
+          value: 'wellCode',
+          align: 'center'
+        },
+        {
+          text: '设备类型',
+          value: 'deviceTypeName',
+          align: 'center'
+        },
+        {
+          text: '用水量',
+          value: 'liquiddata',
+          align: 'center'
+        },
+        {
+          text: '分区',
+          value: 'deptName',
+          align: 'center'
+        },
+        {
+          text: '上传时间',
+          value: 'uptime',
+          width: 170,
+          align: 'center'
+        }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      deviceTypeList: [], // 液位配置类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 分区树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      showDeptTree: 0, // 是否显示分区下拉
+      showDeviceType: true, // 是否显示设备类型下拉
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示编辑框
+      deptShowTop: false
+    }
+  },
+  watch: {
+    timeRange(val) {
+      if (val && val.length > 0) {
+        this.listQuery.beginTime = val[0]
+        this.listQuery.endTime = val[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
+    }
+  },
+  created() {
+    // 如果路径里带参数，解析devcode参数
+    if (window.location.href) {
+      const params = parseUrl(window.location.href)
+      if (params && params.deviceType === '2' && params.devcode) {
+        this.listQuery.keywords = params.devcode
+      }
+      this.fetchData()
+    }
+  },
+  activated() {
+    // 要是路由里有参数
+    if (this.$route.query && this.$route.query.devcode) {
+      this.listQuery.keywords = this.$route.query.devcode
+      this.fetchData(false)// 获取数据
+    } else {
+      this.fetchData()
+    }
+  },
+  methods: {
+    // 批量导出
+    batchExport() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportLiquidData(this.listQuery).then(res => {
+        loading.close() // 关闭加载动画
+        console.log('download===', res)
+        const blob = new Blob([res.data])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob) // 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = `远传水表数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      }).catch((res) => {
+        loading.close()
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取液位配置数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getLiquidData(this.listQuery).then(response => {
+        this.list = response.data.rows
+        this.list = [
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'},
+          {devcode:'212019010212',wellCode:'W00002', deviceTypeName:'远传水表', liquiddata:'20', deptName:'船坞分区', uptime:'2020-07-06 17:57:43'}
+        ]
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    checkCell(value) {
+      var cell = parseFloat(value)
+      if (cell < 10) {
+        return 'warning-state'
+      }
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container{
+    padding: 0px 0px;
+  }
+  $tableTitleHeight:46px;
+  .table{
+    margin-bottom: 20px;
+  }
+  .pagination-container{
+    margin-bottom: 50px;
+  }
+  .table-title{
+    background-color:rgba(243, 243, 243, 1);
+    height: $tableTitleHeight;
+    .title-header{
+      line-height:$tableTitleHeight;
+      color: #606266;
+      font-size: 15px;
+      i{
+        margin-left: 5px;
+        margin-right: 5px;
+      }
+    }
+  }
+  .edit_btns{
+    .edit_btn{
+      float:right;
+      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
+    }
+  }
+  .warning-state{
+    color:red
+  }
+</style>