diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index c67638e..870b7ca 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -34,12 +34,13 @@
         <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-if="column.text==='设备位置'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="60">
+        <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="line(scope.row)">7日曲线</el-button>
+            <el-button type="text" @click="line(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,7 +50,7 @@
       <el-pagination
         v-show="total>listQuery.limit"
         :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
+        :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
         :total="total"
         align="center"
@@ -81,7 +82,7 @@
         // beginTime: '', // 开始时间
         // endTime: '', // 结束时间
         offset: 1,
-        limit: 20,
+        limit: 10,
         sort: '',
         order: ''
       }, // 筛选条件
@@ -90,17 +91,20 @@
         {
           text: '设备编号',
           value: 'devcode',
-          align: 'center'
+          align: 'center',
+          width: 120
         },
         {
           text: '井编号',
           value: 'wellCode',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '设备类型',
           value: 'deviceTypeName',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           text: '设备位置',
@@ -122,12 +126,14 @@
         {
           text: '今日用水量',
           value: 'dayCount',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '本月用水量',
-          value: 'weekCount',
-          align: 'center'
+          value: 'monthCount',
+          align: 'center',
+          width: 100
         },
         {
           text: '总用水量',
@@ -244,17 +250,10 @@
         this.listQuery.offset = 1
       }
       getWatchData(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.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index c67638e..870b7ca 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -34,12 +34,13 @@
         <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-if="column.text==='设备位置'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="60">
+        <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="line(scope.row)">7日曲线</el-button>
+            <el-button type="text" @click="line(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,7 +50,7 @@
       <el-pagination
         v-show="total>listQuery.limit"
         :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
+        :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
         :total="total"
         align="center"
@@ -81,7 +82,7 @@
         // beginTime: '', // 开始时间
         // endTime: '', // 结束时间
         offset: 1,
-        limit: 20,
+        limit: 10,
         sort: '',
         order: ''
       }, // 筛选条件
@@ -90,17 +91,20 @@
         {
           text: '设备编号',
           value: 'devcode',
-          align: 'center'
+          align: 'center',
+          width: 120
         },
         {
           text: '井编号',
           value: 'wellCode',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '设备类型',
           value: 'deviceTypeName',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           text: '设备位置',
@@ -122,12 +126,14 @@
         {
           text: '今日用水量',
           value: 'dayCount',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '本月用水量',
-          value: 'weekCount',
-          align: 'center'
+          value: 'monthCount',
+          align: 'center',
+          width: 100
         },
         {
           text: '总用水量',
@@ -244,17 +250,10 @@
         this.listQuery.offset = 1
       }
       getWatchData(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.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 6568d41..c418589 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -1,19 +1,45 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="" append-to-body>
-    <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+    </div>
+    <div v-loading="loading" style="display: flex" >
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData.rows" size="mini" height="380px">
+          <el-table-column label="时间" prop="time" width="150" align="center"/>
+          <el-table-column label="用水量" prop="value" align="center"/>
+        </el-table>
+      </div>
+    </div>
+    <div v-loading="loading1" style="display: flex">
+      <ve-line :data="chartData1" :settings="chartSettings" :title="title1" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData1.rows" size="mini" height="380px" >
+          <el-table-column label="时间" prop="time" width="140" align="center"/>
+          <el-table-column label="总用水量" prop="value" align="center" width="70"/>
+          <el-table-column label="阀门状态" prop="statusName" align="center" width="70"/>
+        </el-table>
+      </div>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { sevenDayData, totalData } from '@/api/device'
 
 export default {
   name: 'WatchSevenDay',
   data() {
-    this.title = {
-      text: '7日曲线图'
-    }
     this.chartSettings = {
       labelMap: {
         'alarmTimes': '用水量'
@@ -22,44 +48,76 @@
       dimension: ['date']
     }
     return {
+      loading: true,
+      loading1: true,
+      title: {
+        text: '日用水量'
+      },
+      title1: {
+        text: '累计用水量'
+      },
+      timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        deviceType: '',
+        devCode: '',
         beginTime: '',
         endTime: ''
       },
       chartData: {
         columns: ['date', 'alarmTimes'],
         rows: []
+      },
+      chartData1: {
+        columns: ['date', 'alarmTimes'],
+        rows: []
       }
     }
   },
-  mounted() {
-    this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  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 = ''
+      }
+    }
   },
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
+      this.listQuery.devCode = row.devcode
       this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
     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 => {
+      sevenDayData(this.listQuery).then(response => {
+        this.loading = true
         this.chartData.rows = response.data
+        this.loading = false
+      })
+      totalData(this.listQuery).then(response => {
+        this.loading1 = true
+        this.chartData1.rows = response.data
+        this.loading1 = false
       })
     }
   }
 }
 </script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+  .lineDialog .el-table th{
+    color: white !important;
+    background-color: #488f7d !important;
+  }
+
+</style>

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index c67638e..870b7ca 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -34,12 +34,13 @@
         <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-if="column.text==='设备位置'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="60">
+        <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="line(scope.row)">7日曲线</el-button>
+            <el-button type="text" @click="line(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,7 +50,7 @@
       <el-pagination
         v-show="total>listQuery.limit"
         :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
+        :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
         :total="total"
         align="center"
@@ -81,7 +82,7 @@
         // beginTime: '', // 开始时间
         // endTime: '', // 结束时间
         offset: 1,
-        limit: 20,
+        limit: 10,
         sort: '',
         order: ''
       }, // 筛选条件
@@ -90,17 +91,20 @@
         {
           text: '设备编号',
           value: 'devcode',
-          align: 'center'
+          align: 'center',
+          width: 120
         },
         {
           text: '井编号',
           value: 'wellCode',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '设备类型',
           value: 'deviceTypeName',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           text: '设备位置',
@@ -122,12 +126,14 @@
         {
           text: '今日用水量',
           value: 'dayCount',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '本月用水量',
-          value: 'weekCount',
-          align: 'center'
+          value: 'monthCount',
+          align: 'center',
+          width: 100
         },
         {
           text: '总用水量',
@@ -244,17 +250,10 @@
         this.listQuery.offset = 1
       }
       getWatchData(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.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 6568d41..c418589 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -1,19 +1,45 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="" append-to-body>
-    <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+    </div>
+    <div v-loading="loading" style="display: flex" >
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData.rows" size="mini" height="380px">
+          <el-table-column label="时间" prop="time" width="150" align="center"/>
+          <el-table-column label="用水量" prop="value" align="center"/>
+        </el-table>
+      </div>
+    </div>
+    <div v-loading="loading1" style="display: flex">
+      <ve-line :data="chartData1" :settings="chartSettings" :title="title1" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData1.rows" size="mini" height="380px" >
+          <el-table-column label="时间" prop="time" width="140" align="center"/>
+          <el-table-column label="总用水量" prop="value" align="center" width="70"/>
+          <el-table-column label="阀门状态" prop="statusName" align="center" width="70"/>
+        </el-table>
+      </div>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { sevenDayData, totalData } from '@/api/device'
 
 export default {
   name: 'WatchSevenDay',
   data() {
-    this.title = {
-      text: '7日曲线图'
-    }
     this.chartSettings = {
       labelMap: {
         'alarmTimes': '用水量'
@@ -22,44 +48,76 @@
       dimension: ['date']
     }
     return {
+      loading: true,
+      loading1: true,
+      title: {
+        text: '日用水量'
+      },
+      title1: {
+        text: '累计用水量'
+      },
+      timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        deviceType: '',
+        devCode: '',
         beginTime: '',
         endTime: ''
       },
       chartData: {
         columns: ['date', 'alarmTimes'],
         rows: []
+      },
+      chartData1: {
+        columns: ['date', 'alarmTimes'],
+        rows: []
       }
     }
   },
-  mounted() {
-    this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  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 = ''
+      }
+    }
   },
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
+      this.listQuery.devCode = row.devcode
       this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
     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 => {
+      sevenDayData(this.listQuery).then(response => {
+        this.loading = true
         this.chartData.rows = response.data
+        this.loading = false
+      })
+      totalData(this.listQuery).then(response => {
+        this.loading1 = true
+        this.chartData1.rows = response.data
+        this.loading1 = false
       })
     }
   }
 }
 </script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+  .lineDialog .el-table th{
+    color: white !important;
+    background-color: #488f7d !important;
+  }
+
+</style>
diff --git a/src/views/deviceConfig/components/listWatchConfig.vue b/src/views/deviceConfig/components/listWatchConfig.vue
index d162620..1146332 100644
--- a/src/views/deviceConfig/components/listWatchConfig.vue
+++ b/src/views/deviceConfig/components/listWatchConfig.vue
@@ -5,10 +5,10 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
       </search-item>
       <search-item>
-        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" size="small" placeholder="区域"/>
+        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
         <!--<area-select-input :need-full="false"  placeholder="区域" @selectnode="selectnode"/>-->
         <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>-->
       </search-item>

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index c67638e..870b7ca 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -34,12 +34,13 @@
         <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-if="column.text==='设备位置'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="60">
+        <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="line(scope.row)">7日曲线</el-button>
+            <el-button type="text" @click="line(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,7 +50,7 @@
       <el-pagination
         v-show="total>listQuery.limit"
         :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
+        :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
         :total="total"
         align="center"
@@ -81,7 +82,7 @@
         // beginTime: '', // 开始时间
         // endTime: '', // 结束时间
         offset: 1,
-        limit: 20,
+        limit: 10,
         sort: '',
         order: ''
       }, // 筛选条件
@@ -90,17 +91,20 @@
         {
           text: '设备编号',
           value: 'devcode',
-          align: 'center'
+          align: 'center',
+          width: 120
         },
         {
           text: '井编号',
           value: 'wellCode',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '设备类型',
           value: 'deviceTypeName',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           text: '设备位置',
@@ -122,12 +126,14 @@
         {
           text: '今日用水量',
           value: 'dayCount',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '本月用水量',
-          value: 'weekCount',
-          align: 'center'
+          value: 'monthCount',
+          align: 'center',
+          width: 100
         },
         {
           text: '总用水量',
@@ -244,17 +250,10 @@
         this.listQuery.offset = 1
       }
       getWatchData(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.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 6568d41..c418589 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -1,19 +1,45 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="" append-to-body>
-    <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+    </div>
+    <div v-loading="loading" style="display: flex" >
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData.rows" size="mini" height="380px">
+          <el-table-column label="时间" prop="time" width="150" align="center"/>
+          <el-table-column label="用水量" prop="value" align="center"/>
+        </el-table>
+      </div>
+    </div>
+    <div v-loading="loading1" style="display: flex">
+      <ve-line :data="chartData1" :settings="chartSettings" :title="title1" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData1.rows" size="mini" height="380px" >
+          <el-table-column label="时间" prop="time" width="140" align="center"/>
+          <el-table-column label="总用水量" prop="value" align="center" width="70"/>
+          <el-table-column label="阀门状态" prop="statusName" align="center" width="70"/>
+        </el-table>
+      </div>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { sevenDayData, totalData } from '@/api/device'
 
 export default {
   name: 'WatchSevenDay',
   data() {
-    this.title = {
-      text: '7日曲线图'
-    }
     this.chartSettings = {
       labelMap: {
         'alarmTimes': '用水量'
@@ -22,44 +48,76 @@
       dimension: ['date']
     }
     return {
+      loading: true,
+      loading1: true,
+      title: {
+        text: '日用水量'
+      },
+      title1: {
+        text: '累计用水量'
+      },
+      timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        deviceType: '',
+        devCode: '',
         beginTime: '',
         endTime: ''
       },
       chartData: {
         columns: ['date', 'alarmTimes'],
         rows: []
+      },
+      chartData1: {
+        columns: ['date', 'alarmTimes'],
+        rows: []
       }
     }
   },
-  mounted() {
-    this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  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 = ''
+      }
+    }
   },
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
+      this.listQuery.devCode = row.devcode
       this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
     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 => {
+      sevenDayData(this.listQuery).then(response => {
+        this.loading = true
         this.chartData.rows = response.data
+        this.loading = false
+      })
+      totalData(this.listQuery).then(response => {
+        this.loading1 = true
+        this.chartData1.rows = response.data
+        this.loading1 = false
       })
     }
   }
 }
 </script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+  .lineDialog .el-table th{
+    color: white !important;
+    background-color: #488f7d !important;
+  }
+
+</style>
diff --git a/src/views/deviceConfig/components/listWatchConfig.vue b/src/views/deviceConfig/components/listWatchConfig.vue
index d162620..1146332 100644
--- a/src/views/deviceConfig/components/listWatchConfig.vue
+++ b/src/views/deviceConfig/components/listWatchConfig.vue
@@ -5,10 +5,10 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
       </search-item>
       <search-item>
-        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" size="small" placeholder="区域"/>
+        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
         <!--<area-select-input :need-full="false"  placeholder="区域" @selectnode="selectnode"/>-->
         <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>-->
       </search-item>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3133564..fec495d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -85,36 +85,34 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">区/县</el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">街道/镇</el-col>
-          </el-form-item>
-
-        </el-row>
+        <!--<el-row :gutter="1">-->
+          <!--<el-form-item label="所在区域" required>-->
+            <!--<el-col :span="5">-->
+              <!--<el-form-item prop="qu">-->
+                <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+                  <!--<el-option-->
+                    <!--v-for="item in quList"-->
+                    <!--:key="item.id"-->
+                    <!--:label="item.name"-->
+                    <!--:value="item.id"/>-->
+                <!--</el-select>-->
+              <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--<el-col :span="1" class="line">区/县</el-col>-->
+            <!--<el-col :span="5">-->
+              <!--<el-form-item prop="area">-->
+                <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+                  <!--<el-option-->
+                    <!--v-for="item in jiedaoList"-->
+                    <!--:key="item.id"-->
+                    <!--:label="item.name"-->
+                    <!--:value="item.id"/>-->
+                <!--</el-select>-->
+              <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+          <!--</el-form-item>-->
+        <!--</el-row>-->
         <el-row>
           <el-col :span="15">
             <el-form-item label="详细地址" prop="position">
@@ -252,7 +250,7 @@
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
         deep: row.deep, // 井深，
-        position: row.position, // 位置描述
+        position: row.areaFullName + row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
         coordinateY: row.coordinateY, // 纬度
         photos: row.photos, // 照片路径

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index c67638e..870b7ca 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -34,12 +34,13 @@
         <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-if="column.text==='设备位置'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="60">
+        <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="line(scope.row)">7日曲线</el-button>
+            <el-button type="text" @click="line(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,7 +50,7 @@
       <el-pagination
         v-show="total>listQuery.limit"
         :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
+        :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
         :total="total"
         align="center"
@@ -81,7 +82,7 @@
         // beginTime: '', // 开始时间
         // endTime: '', // 结束时间
         offset: 1,
-        limit: 20,
+        limit: 10,
         sort: '',
         order: ''
       }, // 筛选条件
@@ -90,17 +91,20 @@
         {
           text: '设备编号',
           value: 'devcode',
-          align: 'center'
+          align: 'center',
+          width: 120
         },
         {
           text: '井编号',
           value: 'wellCode',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '设备类型',
           value: 'deviceTypeName',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           text: '设备位置',
@@ -122,12 +126,14 @@
         {
           text: '今日用水量',
           value: 'dayCount',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '本月用水量',
-          value: 'weekCount',
-          align: 'center'
+          value: 'monthCount',
+          align: 'center',
+          width: 100
         },
         {
           text: '总用水量',
@@ -244,17 +250,10 @@
         this.listQuery.offset = 1
       }
       getWatchData(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.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 6568d41..c418589 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -1,19 +1,45 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="" append-to-body>
-    <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+    </div>
+    <div v-loading="loading" style="display: flex" >
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData.rows" size="mini" height="380px">
+          <el-table-column label="时间" prop="time" width="150" align="center"/>
+          <el-table-column label="用水量" prop="value" align="center"/>
+        </el-table>
+      </div>
+    </div>
+    <div v-loading="loading1" style="display: flex">
+      <ve-line :data="chartData1" :settings="chartSettings" :title="title1" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData1.rows" size="mini" height="380px" >
+          <el-table-column label="时间" prop="time" width="140" align="center"/>
+          <el-table-column label="总用水量" prop="value" align="center" width="70"/>
+          <el-table-column label="阀门状态" prop="statusName" align="center" width="70"/>
+        </el-table>
+      </div>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { sevenDayData, totalData } from '@/api/device'
 
 export default {
   name: 'WatchSevenDay',
   data() {
-    this.title = {
-      text: '7日曲线图'
-    }
     this.chartSettings = {
       labelMap: {
         'alarmTimes': '用水量'
@@ -22,44 +48,76 @@
       dimension: ['date']
     }
     return {
+      loading: true,
+      loading1: true,
+      title: {
+        text: '日用水量'
+      },
+      title1: {
+        text: '累计用水量'
+      },
+      timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        deviceType: '',
+        devCode: '',
         beginTime: '',
         endTime: ''
       },
       chartData: {
         columns: ['date', 'alarmTimes'],
         rows: []
+      },
+      chartData1: {
+        columns: ['date', 'alarmTimes'],
+        rows: []
       }
     }
   },
-  mounted() {
-    this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  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 = ''
+      }
+    }
   },
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
+      this.listQuery.devCode = row.devcode
       this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
     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 => {
+      sevenDayData(this.listQuery).then(response => {
+        this.loading = true
         this.chartData.rows = response.data
+        this.loading = false
+      })
+      totalData(this.listQuery).then(response => {
+        this.loading1 = true
+        this.chartData1.rows = response.data
+        this.loading1 = false
       })
     }
   }
 }
 </script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+  .lineDialog .el-table th{
+    color: white !important;
+    background-color: #488f7d !important;
+  }
+
+</style>
diff --git a/src/views/deviceConfig/components/listWatchConfig.vue b/src/views/deviceConfig/components/listWatchConfig.vue
index d162620..1146332 100644
--- a/src/views/deviceConfig/components/listWatchConfig.vue
+++ b/src/views/deviceConfig/components/listWatchConfig.vue
@@ -5,10 +5,10 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
       </search-item>
       <search-item>
-        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" size="small" placeholder="区域"/>
+        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
         <!--<area-select-input :need-full="false"  placeholder="区域" @selectnode="selectnode"/>-->
         <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>-->
       </search-item>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3133564..fec495d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -85,36 +85,34 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">区/县</el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">街道/镇</el-col>
-          </el-form-item>
-
-        </el-row>
+        <!--<el-row :gutter="1">-->
+          <!--<el-form-item label="所在区域" required>-->
+            <!--<el-col :span="5">-->
+              <!--<el-form-item prop="qu">-->
+                <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+                  <!--<el-option-->
+                    <!--v-for="item in quList"-->
+                    <!--:key="item.id"-->
+                    <!--:label="item.name"-->
+                    <!--:value="item.id"/>-->
+                <!--</el-select>-->
+              <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--<el-col :span="1" class="line">区/县</el-col>-->
+            <!--<el-col :span="5">-->
+              <!--<el-form-item prop="area">-->
+                <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+                  <!--<el-option-->
+                    <!--v-for="item in jiedaoList"-->
+                    <!--:key="item.id"-->
+                    <!--:label="item.name"-->
+                    <!--:value="item.id"/>-->
+                <!--</el-select>-->
+              <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+          <!--</el-form-item>-->
+        <!--</el-row>-->
         <el-row>
           <el-col :span="15">
             <el-form-item label="详细地址" prop="position">
@@ -252,7 +250,7 @@
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
         deep: row.deep, // 井深，
-        position: row.position, // 位置描述
+        position: row.areaFullName + row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
         coordinateY: row.coordinateY, // 纬度
         photos: row.photos, // 照片路径
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 08c7973..208091e 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -54,13 +54,14 @@
         <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">
             <el-button v-if="column.type=='Button' && scope.row.deviceCount>0" type="text" @click="goDeviceList(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.text==='详细地址'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <!--<el-table-column v-if="hasPerm('/well/bfcf')" label="布撤防" align="center" width="80">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button :type="btnStatus[scope.row.bfztName]" size="mini" @click="bfcf(scope.row)">{{ btnNames[scope.row.bfztName] }}</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button :type="btnStatus[scope.row.bfztName]" size="mini" @click="bfcf(scope.row)">{{ btnNames[scope.row.bfztName] }}</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
@@ -153,7 +154,7 @@
           width: 100,
           align: 'center',
           type: 'Button'
-        },
+        }
         // {
         //   text: '布防状态',
         //   value: 'bfztName',
@@ -425,8 +426,10 @@
         this.listQuery.offset = 1
       }
       getWellList(this.listQuery).then(response => {
-        console.log(response.data)
-        this.list = response.data.rows
+        this.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })

diff --git a/src/api/device.js b/src/api/device.js
index 1e22a69..00804fe 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -83,3 +83,21 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 设备七日数据
+export function sevenDayData(params) {
+  return request({
+    url: 'device/sevenDayData',
+    method: 'post',
+    params
+  })
+}
+
+export function totalData(params) {
+  return request({
+    url: 'device/totalData',
+    method: 'post',
+    params
+  })
+}
+
diff --git a/src/utils/request.js b/src/utils/request.js
index 96766f8..7ee2841 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -73,7 +73,6 @@
         })
       }
     } else {
-      debugger
       if (error.response) {
         console.log('错误:' + error.response.data.message) // for debug
         // Message.error(error.response.data.message)
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index c67638e..870b7ca 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -34,12 +34,13 @@
         <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-if="column.text==='设备位置'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="60">
+        <el-table-column label="操作" align="center" width="80">
           <template slot-scope="scope">
-            <el-button type="text" @click="line(scope.row)">7日曲线</el-button>
+            <el-button type="text" @click="line(scope.row)">历史数据</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -49,7 +50,7 @@
       <el-pagination
         v-show="total>listQuery.limit"
         :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
+        :page-sizes="[10,20,30]"
         :page-size="listQuery.limit"
         :total="total"
         align="center"
@@ -81,7 +82,7 @@
         // beginTime: '', // 开始时间
         // endTime: '', // 结束时间
         offset: 1,
-        limit: 20,
+        limit: 10,
         sort: '',
         order: ''
       }, // 筛选条件
@@ -90,17 +91,20 @@
         {
           text: '设备编号',
           value: 'devcode',
-          align: 'center'
+          align: 'center',
+          width: 120
         },
         {
           text: '井编号',
           value: 'wellCode',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '设备类型',
           value: 'deviceTypeName',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           text: '设备位置',
@@ -122,12 +126,14 @@
         {
           text: '今日用水量',
           value: 'dayCount',
-          align: 'center'
+          align: 'center',
+          width: 100
         },
         {
           text: '本月用水量',
-          value: 'weekCount',
-          align: 'center'
+          value: 'monthCount',
+          align: 'center',
+          width: 100
         },
         {
           text: '总用水量',
@@ -244,17 +250,10 @@
         this.listQuery.offset = 1
       }
       getWatchData(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.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index 6568d41..c418589 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -1,19 +1,45 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" title="" append-to-body>
-    <ve-line :data="chartData" :title="title" :settings="chartSettings"/>
+  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+    <div style="margin-bottom: 10px">
+      <el-date-picker
+        v-model="timeRange"
+        type="datetimerange"
+        range-separator="至"
+        value-format="yyyy-MM-dd HH:mm:ss"
+        start-placeholder="开始时间"
+        end-placeholder="结束时间"
+        size="small"/>
+      <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+    </div>
+    <div v-loading="loading" style="display: flex" >
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData.rows" size="mini" height="380px">
+          <el-table-column label="时间" prop="time" width="150" align="center"/>
+          <el-table-column label="用水量" prop="value" align="center"/>
+        </el-table>
+      </div>
+    </div>
+    <div v-loading="loading1" style="display: flex">
+      <ve-line :data="chartData1" :settings="chartSettings" :title="title1" style="width: 900px"/>
+      <div style="flex: 1">
+        <el-table :data="chartData1.rows" size="mini" height="380px" >
+          <el-table-column label="时间" prop="time" width="140" align="center"/>
+          <el-table-column label="总用水量" prop="value" align="center" width="70"/>
+          <el-table-column label="阀门状态" prop="statusName" align="center" width="70"/>
+        </el-table>
+      </div>
+    </div>
   </el-dialog>
 </template>
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { alarmStaticByDay } from '@/api/dataStatics'
+import { sevenDayData, totalData } from '@/api/device'
 
 export default {
   name: 'WatchSevenDay',
   data() {
-    this.title = {
-      text: '7日曲线图'
-    }
     this.chartSettings = {
       labelMap: {
         'alarmTimes': '用水量'
@@ -22,44 +48,76 @@
       dimension: ['date']
     }
     return {
+      loading: true,
+      loading1: true,
+      title: {
+        text: '日用水量'
+      },
+      title1: {
+        text: '累计用水量'
+      },
+      timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
       listQuery: {
-        deviceType: '',
+        devCode: '',
         beginTime: '',
         endTime: ''
       },
       chartData: {
         columns: ['date', 'alarmTimes'],
         rows: []
+      },
+      chartData1: {
+        columns: ['date', 'alarmTimes'],
+        rows: []
       }
     }
   },
-  mounted() {
-    this.fetchData()
-    // 模拟数据
-    // this.chartData.rows = [
-    //   { 'date': '9月20日', 'alarmTimes': 153, 'alarmWells': 43 },
-    //   { 'date': '9月21日', 'alarmTimes': 150, 'alarmWells': 30 },
-    //   { 'date': '9月22日', 'alarmTimes': 143, 'alarmWells': 23 },
-    //   { 'date': '9月23日', 'alarmTimes': 173, 'alarmWells': 23 },
-    //   { 'date': '9月24日', 'alarmTimes': 272, 'alarmWells': 52 },
-    //   { 'date': '9月25日', 'alarmTimes': 253, 'alarmWells': 53 }
-    // ]
+  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 = ''
+      }
+    }
   },
   methods: {
     initDialog: function(dialogFormVisible, row = null) {
+      this.listQuery.devCode = row.devcode
       this.dialogFormVisible = dialogFormVisible
+      const beginTime = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000).Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = new Date().Format('yyyy-MM-dd hh:mm:ss')
+      this.timeRange = [beginTime, endTime]
       this.fetchData() // 传row
     },
     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 => {
+      sevenDayData(this.listQuery).then(response => {
+        this.loading = true
         this.chartData.rows = response.data
+        this.loading = false
+      })
+      totalData(this.listQuery).then(response => {
+        this.loading1 = true
+        this.chartData1.rows = response.data
+        this.loading1 = false
       })
     }
   }
 }
 </script>
+<style>
+  .el-dialog__header {
+    padding: 10px !important;
+  }
+  .el-dialog__body {
+    padding: 10px !important;
+  }
+  .lineDialog .el-table th{
+    color: white !important;
+    background-color: #488f7d !important;
+  }
+
+</style>
diff --git a/src/views/deviceConfig/components/listWatchConfig.vue b/src/views/deviceConfig/components/listWatchConfig.vue
index d162620..1146332 100644
--- a/src/views/deviceConfig/components/listWatchConfig.vue
+++ b/src/views/deviceConfig/components/listWatchConfig.vue
@@ -5,10 +5,10 @@
     <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
       <!--一般查询条件-->
       <search-item>
-        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
+        <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
       </search-item>
       <search-item>
-        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" size="small" placeholder="区域"/>
+        <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
         <!--<area-select-input :need-full="false"  placeholder="区域" @selectnode="selectnode"/>-->
         <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>-->
       </search-item>
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 3133564..fec495d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -85,36 +85,34 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
-          <el-form-item label="所在区域" required>
-            <el-col :span="5">
-              <el-form-item prop="qu">
-                <el-select v-model="wellForm.qu" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in quList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">区/县</el-col>
-            <el-col :span="5">
-              <el-form-item prop="area">
-                <el-select v-model="wellForm.area" placeholder="未知" disabled>
-                  <el-option
-                    v-for="item in jiedaoList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"/>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1" class="line">街道/镇</el-col>
-          </el-form-item>
-
-        </el-row>
+        <!--<el-row :gutter="1">-->
+          <!--<el-form-item label="所在区域" required>-->
+            <!--<el-col :span="5">-->
+              <!--<el-form-item prop="qu">-->
+                <!--<el-select v-model="wellForm.qu" placeholder="未知" disabled>-->
+                  <!--<el-option-->
+                    <!--v-for="item in quList"-->
+                    <!--:key="item.id"-->
+                    <!--:label="item.name"-->
+                    <!--:value="item.id"/>-->
+                <!--</el-select>-->
+              <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--<el-col :span="1" class="line">区/县</el-col>-->
+            <!--<el-col :span="5">-->
+              <!--<el-form-item prop="area">-->
+                <!--<el-select v-model="wellForm.area" placeholder="未知" disabled>-->
+                  <!--<el-option-->
+                    <!--v-for="item in jiedaoList"-->
+                    <!--:key="item.id"-->
+                    <!--:label="item.name"-->
+                    <!--:value="item.id"/>-->
+                <!--</el-select>-->
+              <!--</el-form-item>-->
+            <!--</el-col>-->
+            <!--<el-col :span="1" class="line">街道/镇</el-col>-->
+          <!--</el-form-item>-->
+        <!--</el-row>-->
         <el-row>
           <el-col :span="15">
             <el-form-item label="详细地址" prop="position">
@@ -252,7 +250,7 @@
         deptid: row.deptid, // 权属单位
         deptName: row.deptName, // 权属单位
         deep: row.deep, // 井深，
-        position: row.position, // 位置描述
+        position: row.areaFullName + row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
         coordinateY: row.coordinateY, // 纬度
         photos: row.photos, // 照片路径
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 08c7973..208091e 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -54,13 +54,14 @@
         <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">
             <el-button v-if="column.type=='Button' && scope.row.deviceCount>0" type="text" @click="goDeviceList(scope.row)">{{ scope.row[column.value] }}</el-button>
+            <span v-else-if="column.text==='详细地址'">{{ scope.row['areaFullName'] + scope.row[column.value] }}</span>
             <span v-else :class="column.class">{{ scope.row[column.value] }}</span>
           </template>
         </el-table-column>
         <!--<el-table-column v-if="hasPerm('/well/bfcf')" label="布撤防" align="center" width="80">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button :type="btnStatus[scope.row.bfztName]" size="mini" @click="bfcf(scope.row)">{{ btnNames[scope.row.bfztName] }}</el-button>-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--<el-button :type="btnStatus[scope.row.bfztName]" size="mini" @click="bfcf(scope.row)">{{ btnNames[scope.row.bfztName] }}</el-button>-->
+        <!--</template>-->
         <!--</el-table-column>-->
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scope">
@@ -153,7 +154,7 @@
           width: 100,
           align: 'center',
           type: 'Button'
-        },
+        }
         // {
         //   text: '布防状态',
         //   value: 'bfztName',
@@ -425,8 +426,10 @@
         this.listQuery.offset = 1
       }
       getWellList(this.listQuery).then(response => {
-        console.log(response.data)
-        this.list = response.data.rows
+        this.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName.replace('\/', '').replace('顶层', '')
+          return item
+        })
         this.total = parseInt(response.data.total)
         this.listLoading = false
       })
diff --git a/static/project.config.json b/static/project.config.json
index 538aa7d..1bd8422 100644
--- a/static/project.config.json
+++ b/static/project.config.json
@@ -1,6 +1,6 @@
 {
   "title": "供水管理系统",
-  "baseUrl": "http://192.168.8.104:11643/",
+  "baseUrl": "http://192.168.8.102:11643/",
   "mainPage": "http://111.198.10.15:11404/dcms/#",
   "singleSys": true,
   "city":"青岛市",