diff --git a/src/api/data.js b/src/api/data.js
index d1fdd27..b7c9ba2 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -203,3 +203,25 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出水表数据
+export function batchExportWaterData(params) {
+  return request({
+    url: '/waterMeterData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出水表历史数据
+export function batchExportWaterHistory(params) {
+  return request({
+    url: '/device/exportTotalData',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}

diff --git a/src/api/data.js b/src/api/data.js
index d1fdd27..b7c9ba2 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -203,3 +203,25 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出水表数据
+export function batchExportWaterData(params) {
+  return request({
+    url: '/waterMeterData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出水表历史数据
+export function batchExportWaterHistory(params) {
+  return request({
+    url: '/device/exportTotalData',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 558af5f..f585c01 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -38,7 +38,7 @@
       <!--</search-item>-->
     </search-area>
     <!--查询结果Table显示-->
-    <div style="padding: 0px 10px">
+    <div style="box-sizing: border-box; padding: 0px 10px">
       <el-row class="table-title">
         <el-col :span="6">
           <div class="title-header">
@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button
-            v-if="hasPerm('/liquiddata/export')"
+            v-if="hasPerm('/waterMeterData/export')"
             class="edit_btn"
             size="small"
             @click="batchExport">
@@ -77,7 +77,7 @@
               scope.row[column.value]
             }}</span>
             <span v-else-if="column.text === '设备位置'">{{
-              scope.row["areaFullName"] + scope.row[column.value]
+              scope.row["areaFullName"] +'/' + scope.row[column.value]
             }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
@@ -115,12 +115,12 @@
 
 <script>
 import selectTree from '@/components/SelectTree/singleSelect'
-import { getWatchData, batchExportLiquidData } from '@/api/data'
-import DeptSelect from '../../../components/DeptSelect/index'
+import { getWatchData, batchExportWaterData } from '@/api/data'
+import DeptSelect from '@/components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import WatchSevenDay from './watchSevenDay'
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
-import WaterHistory from "./waterHistory";
+import WaterHistory from './waterHistory'
 
 export default {
   name: 'ListWaterData',
@@ -176,19 +176,19 @@
           align: 'center'
         },
         {
-          text: '今日用水量',
+          text: '今日用水量（立方米）',
           value: 'dayCount',
           align: 'center',
           width: 100
         },
         {
-          text: '本月用水量',
+          text: '本月用水量（立方米）',
           value: 'monthCount',
           align: 'center',
           width: 100
         },
         {
-          text: '总用水量',
+          text: '总用水量(立方米)',
           value: 'totalCount',
           align: 'center',
           width: 80
@@ -268,7 +268,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportLiquidData(this.listQuery)
+      batchExportWaterData(this.listQuery)
         .then((res) => {
           loading.close() // 关闭加载动画
           console.log('download===', res)

diff --git a/src/api/data.js b/src/api/data.js
index d1fdd27..b7c9ba2 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -203,3 +203,25 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出水表数据
+export function batchExportWaterData(params) {
+  return request({
+    url: '/waterMeterData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出水表历史数据
+export function batchExportWaterHistory(params) {
+  return request({
+    url: '/device/exportTotalData',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 558af5f..f585c01 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -38,7 +38,7 @@
       <!--</search-item>-->
     </search-area>
     <!--查询结果Table显示-->
-    <div style="padding: 0px 10px">
+    <div style="box-sizing: border-box; padding: 0px 10px">
       <el-row class="table-title">
         <el-col :span="6">
           <div class="title-header">
@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button
-            v-if="hasPerm('/liquiddata/export')"
+            v-if="hasPerm('/waterMeterData/export')"
             class="edit_btn"
             size="small"
             @click="batchExport">
@@ -77,7 +77,7 @@
               scope.row[column.value]
             }}</span>
             <span v-else-if="column.text === '设备位置'">{{
-              scope.row["areaFullName"] + scope.row[column.value]
+              scope.row["areaFullName"] +'/' + scope.row[column.value]
             }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
@@ -115,12 +115,12 @@
 
 <script>
 import selectTree from '@/components/SelectTree/singleSelect'
-import { getWatchData, batchExportLiquidData } from '@/api/data'
-import DeptSelect from '../../../components/DeptSelect/index'
+import { getWatchData, batchExportWaterData } from '@/api/data'
+import DeptSelect from '@/components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import WatchSevenDay from './watchSevenDay'
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
-import WaterHistory from "./waterHistory";
+import WaterHistory from './waterHistory'
 
 export default {
   name: 'ListWaterData',
@@ -176,19 +176,19 @@
           align: 'center'
         },
         {
-          text: '今日用水量',
+          text: '今日用水量（立方米）',
           value: 'dayCount',
           align: 'center',
           width: 100
         },
         {
-          text: '本月用水量',
+          text: '本月用水量（立方米）',
           value: 'monthCount',
           align: 'center',
           width: 100
         },
         {
-          text: '总用水量',
+          text: '总用水量(立方米)',
           value: 'totalCount',
           align: 'center',
           width: 80
@@ -268,7 +268,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportLiquidData(this.listQuery)
+      batchExportWaterData(this.listQuery)
         .then((res) => {
           loading.close() // 关闭加载动画
           console.log('download===', res)
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index a6a47ad..3060bee 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -12,20 +12,20 @@
       <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">
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="flex: 1"/>
+      <div style="width: 300px">
         <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-column label="用水量（立方米）" prop="value" align="center"/>
         </el-table>
       </div>
     </div>
     <div v-loading="loading1" style="display: flex">
-      <ve-line :data="chartData1" :settings="chartSettings1" :title="title1" style="width: 900px"/>
-      <div style="flex: 1">
+      <ve-line :data="chartData1" :settings="chartSettings1" :title="title1" style="flex: 1"/>
+      <div style="width: 300px">
         <el-table :data="chartData1.rows" size="mini" height="380px" >
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
-          <el-table-column label="总用水量" prop="total" align="center"/>
+          <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
             <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
@@ -46,10 +46,10 @@
       loading: true,
       loading1: true,
       title: {
-        text: '日用水量'
+        text: '日用水量（立方米）'
       },
       title1: {
-        text: '累计用水量'
+        text: '累计用水量（立方米）'
       },
       timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
@@ -68,18 +68,19 @@
       },
       chartSettings: {
         labelMap: {
-          'value': '用水量'
+          'value': '用水量（立方米）'
         },
         metrics: ['value'],
         dimension: ['time']
       },
       chartSettings1: {
         labelMap: {
-          'total': '总用水量'
+          'total': '总用水量（立方米）'
         },
         metrics: ['total'],
         dimension: ['uptime']
       },
+      data:[]
 
     }
   },
@@ -104,6 +105,10 @@
       this.fetchData() // 传row
     },
     fetchData() {
+      if(this.timeRange.length==2){
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
         this.chartData.rows = response.data
@@ -112,6 +117,8 @@
       totalData(this.listQuery).then(response => {
         this.loading1 = true
         this.chartData1.rows = response.data
+        this.chartData1.rows.reverse()
+        this.data = response.data
         this.loading1 = false
       })
     }

diff --git a/src/api/data.js b/src/api/data.js
index d1fdd27..b7c9ba2 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -203,3 +203,25 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出水表数据
+export function batchExportWaterData(params) {
+  return request({
+    url: '/waterMeterData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出水表历史数据
+export function batchExportWaterHistory(params) {
+  return request({
+    url: '/device/exportTotalData',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 558af5f..f585c01 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -38,7 +38,7 @@
       <!--</search-item>-->
     </search-area>
     <!--查询结果Table显示-->
-    <div style="padding: 0px 10px">
+    <div style="box-sizing: border-box; padding: 0px 10px">
       <el-row class="table-title">
         <el-col :span="6">
           <div class="title-header">
@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button
-            v-if="hasPerm('/liquiddata/export')"
+            v-if="hasPerm('/waterMeterData/export')"
             class="edit_btn"
             size="small"
             @click="batchExport">
@@ -77,7 +77,7 @@
               scope.row[column.value]
             }}</span>
             <span v-else-if="column.text === '设备位置'">{{
-              scope.row["areaFullName"] + scope.row[column.value]
+              scope.row["areaFullName"] +'/' + scope.row[column.value]
             }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
@@ -115,12 +115,12 @@
 
 <script>
 import selectTree from '@/components/SelectTree/singleSelect'
-import { getWatchData, batchExportLiquidData } from '@/api/data'
-import DeptSelect from '../../../components/DeptSelect/index'
+import { getWatchData, batchExportWaterData } from '@/api/data'
+import DeptSelect from '@/components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import WatchSevenDay from './watchSevenDay'
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
-import WaterHistory from "./waterHistory";
+import WaterHistory from './waterHistory'
 
 export default {
   name: 'ListWaterData',
@@ -176,19 +176,19 @@
           align: 'center'
         },
         {
-          text: '今日用水量',
+          text: '今日用水量（立方米）',
           value: 'dayCount',
           align: 'center',
           width: 100
         },
         {
-          text: '本月用水量',
+          text: '本月用水量（立方米）',
           value: 'monthCount',
           align: 'center',
           width: 100
         },
         {
-          text: '总用水量',
+          text: '总用水量(立方米)',
           value: 'totalCount',
           align: 'center',
           width: 80
@@ -268,7 +268,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportLiquidData(this.listQuery)
+      batchExportWaterData(this.listQuery)
         .then((res) => {
           loading.close() // 关闭加载动画
           console.log('download===', res)
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index a6a47ad..3060bee 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -12,20 +12,20 @@
       <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">
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="flex: 1"/>
+      <div style="width: 300px">
         <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-column label="用水量（立方米）" prop="value" align="center"/>
         </el-table>
       </div>
     </div>
     <div v-loading="loading1" style="display: flex">
-      <ve-line :data="chartData1" :settings="chartSettings1" :title="title1" style="width: 900px"/>
-      <div style="flex: 1">
+      <ve-line :data="chartData1" :settings="chartSettings1" :title="title1" style="flex: 1"/>
+      <div style="width: 300px">
         <el-table :data="chartData1.rows" size="mini" height="380px" >
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
-          <el-table-column label="总用水量" prop="total" align="center"/>
+          <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
             <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
@@ -46,10 +46,10 @@
       loading: true,
       loading1: true,
       title: {
-        text: '日用水量'
+        text: '日用水量（立方米）'
       },
       title1: {
-        text: '累计用水量'
+        text: '累计用水量（立方米）'
       },
       timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
@@ -68,18 +68,19 @@
       },
       chartSettings: {
         labelMap: {
-          'value': '用水量'
+          'value': '用水量（立方米）'
         },
         metrics: ['value'],
         dimension: ['time']
       },
       chartSettings1: {
         labelMap: {
-          'total': '总用水量'
+          'total': '总用水量（立方米）'
         },
         metrics: ['total'],
         dimension: ['uptime']
       },
+      data:[]
 
     }
   },
@@ -104,6 +105,10 @@
       this.fetchData() // 传row
     },
     fetchData() {
+      if(this.timeRange.length==2){
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
         this.chartData.rows = response.data
@@ -112,6 +117,8 @@
       totalData(this.listQuery).then(response => {
         this.loading1 = true
         this.chartData1.rows = response.data
+        this.chartData1.rows.reverse()
+        this.data = response.data
         this.loading1 = false
       })
     }
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 1017a94..436978a 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+  <el-dialog :visible.sync="dialogFormVisible" :title="this.listQuery.devCode+'历史数据'" width="1200px" append-to-body class="lineDialog">
     <div style="margin-bottom: 10px">
       <el-date-picker
         v-model="timeRange"
@@ -10,16 +10,17 @@
         end-placeholder="结束时间"
         size="small"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+      <el-button class="filter-item" type="primary" size="small" @click="exportData">导出</el-button>
     </div>
-    <div v-loading="loading1" style="display: flex">
-      <div style="flex: 1">
+    <div v-loading="loading1">
+      <div>
         <el-table :data="data" size="mini" height="380px" >
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
-          <!--<el-table-column label="日用水量" prop="dayCount" align="center"/>-->
-          <el-table-column label="总用水量" prop="total" align="center"/>
-          <el-table-column label="阀门状态" align="center">
-            <template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'--')}}</template>
-          </el-table-column>
+          <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
+          <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
+<!--          <el-table-column label="阀门状态" align="center">-->
+<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -28,7 +29,8 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { sevenDayData, totalData } from '@/api/device'
+import { totalData } from '@/api/device'
+import { batchExportWaterHistory } from '@/api/data'
 
 export default {
   name: 'WaterHistory',
@@ -68,10 +70,41 @@
     },
     fetchData() {
       this.loading1 = true
+      if(this.timeRange.length==2){
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       totalData(this.listQuery).then(response => {
         this.data = response.data
         this.loading1 = false
       })
+    },
+    // 批量导出
+    exportData() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWaterHistory(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 = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      })
+      .catch((res) => {
+        loading.close()
+      })
     }
   }
 }

diff --git a/src/api/data.js b/src/api/data.js
index d1fdd27..b7c9ba2 100644
--- a/src/api/data.js
+++ b/src/api/data.js
@@ -203,3 +203,25 @@
     responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
   })
 }
+
+// 批量导出水表数据
+export function batchExportWaterData(params) {
+  return request({
+    url: '/waterMeterData/export',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
+
+// 批量导出水表历史数据
+export function batchExportWaterHistory(params) {
+  return request({
+    url: '/device/exportTotalData',
+    method: 'get',
+    timeout: 120000,
+    params,
+    responseType: 'blob' // 这一步也很关键，一定要加上 responseType 值为 blob
+  })
+}
diff --git a/src/views/dataManage/deviceData/listWaterData.vue b/src/views/dataManage/deviceData/listWaterData.vue
index 558af5f..f585c01 100644
--- a/src/views/dataManage/deviceData/listWaterData.vue
+++ b/src/views/dataManage/deviceData/listWaterData.vue
@@ -38,7 +38,7 @@
       <!--</search-item>-->
     </search-area>
     <!--查询结果Table显示-->
-    <div style="padding: 0px 10px">
+    <div style="box-sizing: border-box; padding: 0px 10px">
       <el-row class="table-title">
         <el-col :span="6">
           <div class="title-header">
@@ -47,7 +47,7 @@
         </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
           <el-button
-            v-if="hasPerm('/liquiddata/export')"
+            v-if="hasPerm('/waterMeterData/export')"
             class="edit_btn"
             size="small"
             @click="batchExport">
@@ -77,7 +77,7 @@
               scope.row[column.value]
             }}</span>
             <span v-else-if="column.text === '设备位置'">{{
-              scope.row["areaFullName"] + scope.row[column.value]
+              scope.row["areaFullName"] +'/' + scope.row[column.value]
             }}</span>
             <span v-else>{{ scope.row[column.value] }}</span>
           </template>
@@ -115,12 +115,12 @@
 
 <script>
 import selectTree from '@/components/SelectTree/singleSelect'
-import { getWatchData, batchExportLiquidData } from '@/api/data'
-import DeptSelect from '../../../components/DeptSelect/index'
+import { getWatchData, batchExportWaterData } from '@/api/data'
+import DeptSelect from '@/components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
 import WatchSevenDay from './watchSevenDay'
 import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
-import WaterHistory from "./waterHistory";
+import WaterHistory from './waterHistory'
 
 export default {
   name: 'ListWaterData',
@@ -176,19 +176,19 @@
           align: 'center'
         },
         {
-          text: '今日用水量',
+          text: '今日用水量（立方米）',
           value: 'dayCount',
           align: 'center',
           width: 100
         },
         {
-          text: '本月用水量',
+          text: '本月用水量（立方米）',
           value: 'monthCount',
           align: 'center',
           width: 100
         },
         {
-          text: '总用水量',
+          text: '总用水量(立方米)',
           value: 'totalCount',
           align: 'center',
           width: 80
@@ -268,7 +268,7 @@
         spinner: 'el-icon-loading',
         background: 'rgba(0, 0, 0, 0.7)'
       })
-      batchExportLiquidData(this.listQuery)
+      batchExportWaterData(this.listQuery)
         .then((res) => {
           loading.close() // 关闭加载动画
           console.log('download===', res)
diff --git a/src/views/dataManage/deviceData/watchSevenDay.vue b/src/views/dataManage/deviceData/watchSevenDay.vue
index a6a47ad..3060bee 100644
--- a/src/views/dataManage/deviceData/watchSevenDay.vue
+++ b/src/views/dataManage/deviceData/watchSevenDay.vue
@@ -12,20 +12,20 @@
       <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">
+      <ve-line :data="chartData" :settings="chartSettings" :title="title" style="flex: 1"/>
+      <div style="width: 300px">
         <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-column label="用水量（立方米）" prop="value" align="center"/>
         </el-table>
       </div>
     </div>
     <div v-loading="loading1" style="display: flex">
-      <ve-line :data="chartData1" :settings="chartSettings1" :title="title1" style="width: 900px"/>
-      <div style="flex: 1">
+      <ve-line :data="chartData1" :settings="chartSettings1" :title="title1" style="flex: 1"/>
+      <div style="width: 300px">
         <el-table :data="chartData1.rows" size="mini" height="380px" >
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
-          <el-table-column label="总用水量" prop="total" align="center"/>
+          <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
           <!--<el-table-column label="阀门状态" align="center" width="70">-->
             <!--<template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;')}}</template>-->
           <!--</el-table-column>-->
@@ -46,10 +46,10 @@
       loading: true,
       loading1: true,
       title: {
-        text: '日用水量'
+        text: '日用水量（立方米）'
       },
       title1: {
-        text: '累计用水量'
+        text: '累计用水量（立方米）'
       },
       timeRange: [],
       dialogFormVisible: false, // 对话框是否显示
@@ -68,18 +68,19 @@
       },
       chartSettings: {
         labelMap: {
-          'value': '用水量'
+          'value': '用水量（立方米）'
         },
         metrics: ['value'],
         dimension: ['time']
       },
       chartSettings1: {
         labelMap: {
-          'total': '总用水量'
+          'total': '总用水量（立方米）'
         },
         metrics: ['total'],
         dimension: ['uptime']
       },
+      data:[]
 
     }
   },
@@ -104,6 +105,10 @@
       this.fetchData() // 传row
     },
     fetchData() {
+      if(this.timeRange.length==2){
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       sevenDayData(this.listQuery).then(response => {
         this.loading = true
         this.chartData.rows = response.data
@@ -112,6 +117,8 @@
       totalData(this.listQuery).then(response => {
         this.loading1 = true
         this.chartData1.rows = response.data
+        this.chartData1.rows.reverse()
+        this.data = response.data
         this.loading1 = false
       })
     }
diff --git a/src/views/dataManage/deviceData/waterHistory.vue b/src/views/dataManage/deviceData/waterHistory.vue
index 1017a94..436978a 100644
--- a/src/views/dataManage/deviceData/waterHistory.vue
+++ b/src/views/dataManage/deviceData/waterHistory.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogFormVisible" width="1200px" title="历史数据" append-to-body class="lineDialog">
+  <el-dialog :visible.sync="dialogFormVisible" :title="this.listQuery.devCode+'历史数据'" width="1200px" append-to-body class="lineDialog">
     <div style="margin-bottom: 10px">
       <el-date-picker
         v-model="timeRange"
@@ -10,16 +10,17 @@
         end-placeholder="结束时间"
         size="small"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="fetchData">搜索</el-button>
+      <el-button class="filter-item" type="primary" size="small" @click="exportData">导出</el-button>
     </div>
-    <div v-loading="loading1" style="display: flex">
-      <div style="flex: 1">
+    <div v-loading="loading1">
+      <div>
         <el-table :data="data" size="mini" height="380px" >
           <el-table-column label="抄表时间" prop="uptime" width="140" align="center"/>
-          <!--<el-table-column label="日用水量" prop="dayCount" align="center"/>-->
-          <el-table-column label="总用水量" prop="total" align="center"/>
-          <el-table-column label="阀门状态" align="center">
-            <template slot-scope="scope">{{scope.status=='1'?'开':(scope.status=='0'?'关':'--')}}</template>
-          </el-table-column>
+          <el-table-column label="日用水量（立方米）" prop="dayCount" align="center"/>
+          <el-table-column label="总用水量（立方米）" prop="total" align="center"/>
+<!--          <el-table-column label="阀门状态" align="center">-->
+<!--            <template slot-scope="scope">{{ scope.status=='1'?'开':(scope.status=='0'?'关':'&#45;&#45;') }}</template>-->
+<!--          </el-table-column>-->
         </el-table>
       </div>
     </div>
@@ -28,7 +29,8 @@
 
 <script>
 import { getDayTime } from '@/utils/dateutils'
-import { sevenDayData, totalData } from '@/api/device'
+import { totalData } from '@/api/device'
+import { batchExportWaterHistory } from '@/api/data'
 
 export default {
   name: 'WaterHistory',
@@ -68,10 +70,41 @@
     },
     fetchData() {
       this.loading1 = true
+      if(this.timeRange.length==2){
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      }
       totalData(this.listQuery).then(response => {
         this.data = response.data
         this.loading1 = false
       })
+    },
+    // 批量导出
+    exportData() {
+      console.log('批量导出液位配置')
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      batchExportWaterHistory(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 = `${this.listQuery.devCode}远传水表历史数据.xlsx` // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click() // 点击下载
+        document.body.removeChild(downloadElement) // 下载完成移除元素
+        window.URL.revokeObjectURL(href) // 释放blob对象
+      })
+      .catch((res) => {
+        loading.close()
+      })
     }
   }
 }
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index f69c45e..8942602 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -59,7 +59,8 @@
     <div>
       <el-row style="height: 12px; background-color: #ebebeb"/>
       <el-row class="table-title">
-        <el-col :span="6"
+        <el-col
+          :span="6"
         >
           <div class="title-header">
             <i class="el-icon-menu"/>数据列表
@@ -161,7 +162,9 @@
             >编辑
             </el-button
             >
-            <el-button type="text" @click="goAlarmRecords(scope.row)"
+            <el-button
+              type="text"
+              @click="goAlarmRecords(scope.row)"
             >告警记录
             </el-button
             >
@@ -190,417 +193,416 @@
 </template>
 
 <script>
-  import addWell from "@/views/wellManage/addWell";
-  import editWell from "@/views/wellManage/editWell";
-  import detailWell from "@/views/wellManage/detailWell";
-  import SelectTree from "@/components/SelectTree/singleSelect";
-  import AreaSelectTree from "@/components/AreaSelect/areaSelectTree";
-  import {
-    getWellList,
-    getWellType,
-    delWell,
-    batchImportWell,
-    batchExportWell,
-    batchBfcf,
-    bfcf,
-  } from "@/api/well";
-  import DeptSelect from "@/components/DeptSelect";
-  import DownloadTemplate from "@/components/DownloadTemplate/index";
+import addWell from '@/views/wellManage/addWell'
+import editWell from '@/views/wellManage/editWell'
+import detailWell from '@/views/wellManage/detailWell'
+import SelectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
+import {
+  getWellList,
+  getWellType,
+  delWell,
+  batchImportWell,
+  batchExportWell,
+  batchBfcf,
+  bfcf
+} from '@/api/well'
+import DeptSelect from '@/components/DeptSelect'
+import DownloadTemplate from '@/components/DownloadTemplate/index'
 
-  export default {
-    name: "ListWell",
-    components: {
-      DownloadTemplate,
-      SelectTree,
-      addWell,
-      editWell,
-      detailWell,
-      DeptSelect,
-      AreaSelectTree,
-    },
-    data() {
-      return {
-        listQuery: {
-          areaId: "", // 关键字
-          keywords: "",
-          wellType: "",
-          deptid: "",
-          offset: 1,
-          limit: 20,
-          sort: "wellCode",
-          order: "asc",
-        }, // 筛选条件
-        columns: [
-          {
-            text: "井编号",
-            value: "wellCode",
-            width: 110,
-            align: "center",
-          },
-          {
-            text: "井名称",
-            value: "wellName",
-            width: 130,
-            align: "center",
-          },
-          {
-            text: "井深(m)",
-            value: "deep",
-            width: 80,
-            align: "center",
-          },
-          {
-            text: "区域",
-            value: "areaFullName",
-            align: "center",
-          },
-          {
-            text: "位置",
-            value: "position",
-            align: "center",
-          },
-          // {
-          //   text: '井类型',
-          //   value: 'wellTypeName',
-          //   width: 70,
-          //   align: 'center'
-          // },
-          // {
-          //   text: "权属单位",
-          //   value: "deptName",
-          //   align: "center",
-          // },
-          {
-            text: "设备数量",
-            value: "deviceCount",
-            width: 100,
-            align: "center",
-            type: "Button",
-          },
-          // {
-          //   text: '布防状态',
-          //   value: 'bfztName',
-          //   width: 80,
-          //   align: 'center'
-          // }
-        ], // 显示列
-        multipleSelection: [], // 多选选中项
-        list: [], // 列表数据
-        total: 0, // 数据总数
-        showWellType: true, // 是否显示井类型下拉
-        wellTypeList: null, // 井类型列表
-        deptProps: {
-          parent: "pid",
-          value: "id",
-          label: "name",
-          children: "children",
-        }, // 权属单位树形下拉菜单
-        deptTreeList: null, // 组织树列表数据
-        deptShowTop: false, // 权属单位下拉是否显示顶级
-        listLoading: true, // 加载动画
-        fullscreenLoading: false, // 全屏加载动画
-        editShow: false, // 是否显示编辑框
-        detailShow: false, // 是否显示详情框
-        filename: "sluicewell_template.xlsx",
-        fileList: [],
-        btnNames: {
-          布防: "撤防",
-          撤防: "布防",
+export default {
+  name: 'ListWell',
+  components: {
+    DownloadTemplate,
+    SelectTree,
+    addWell,
+    editWell,
+    detailWell,
+    DeptSelect,
+    AreaSelectTree
+  },
+  data() {
+    return {
+      listQuery: {
+        areaId: '', // 关键字
+        keywords: '',
+        wellType: '',
+        deptid: '',
+        offset: 1,
+        limit: 20,
+        sort: 'wellCode',
+        order: 'asc'
+      }, // 筛选条件
+      columns: [
+        {
+          text: '井编号',
+          value: 'wellCode',
+          width: 110,
+          align: 'center'
         },
-        btnStatus: {
-          撤防: "success",
-          布防: "danger",
+        {
+          text: '井名称',
+          value: 'wellName',
+          width: 130,
+          align: 'center'
         },
-      };
-    },
-    created() {
-      this.fetchWellType(); // 获取井列表
-      this.fetchData(); // 获取数据
-    },
-    activated() {
-      console.log("activated");
-      this.fetchData(); // 获取数据
-    },
-    methods: {
-      selectnode(node) {
-        this.listQuery.areaId = node.id;
+        {
+          text: '井深(m)',
+          value: 'deep',
+          width: 80,
+          align: 'center'
+        },
+        {
+          text: '区域',
+          value: 'areaFullName',
+          align: 'center'
+        },
+        {
+          text: '位置',
+          value: 'position',
+          align: 'center'
+        },
+        // {
+        //   text: '井类型',
+        //   value: 'wellTypeName',
+        //   width: 70,
+        //   align: 'center'
+        // },
+        // {
+        //   text: "权属单位",
+        //   value: "deptName",
+        //   align: "center",
+        // },
+        {
+          text: '设备数量',
+          value: 'deviceCount',
+          width: 100,
+          align: 'center',
+          type: 'Button'
+        }
+        // {
+        //   text: '布防状态',
+        //   value: 'bfztName',
+        //   width: 80,
+        //   align: 'center'
+        // }
+      ], // 显示列
+      multipleSelection: [], // 多选选中项
+      list: [], // 列表数据
+      total: 0, // 数据总数
+      showWellType: true, // 是否显示井类型下拉
+      wellTypeList: null, // 井类型列表
+      deptProps: {
+        parent: 'pid',
+        value: 'id',
+        label: 'name',
+        children: 'children'
+      }, // 权属单位树形下拉菜单
+      deptTreeList: null, // 组织树列表数据
+      deptShowTop: false, // 权属单位下拉是否显示顶级
+      listLoading: true, // 加载动画
+      fullscreenLoading: false, // 全屏加载动画
+      editShow: false, // 是否显示编辑框
+      detailShow: false, // 是否显示详情框
+      filename: 'sluicewell_template.xlsx',
+      fileList: [],
+      btnNames: {
+        布防: '撤防',
+        撤防: '布防'
       },
+      btnStatus: {
+        撤防: 'success',
+        布防: 'danger'
+      }
+    }
+  },
+  created() {
+    this.fetchWellType() // 获取井列表
+    this.fetchData() // 获取数据
+  },
+  activated() {
+    console.log('activated')
+    this.fetchData() // 获取数据
+  },
+  methods: {
+    selectnode(node) {
+      this.listQuery.areaId = node.id
+    },
 
-      // 打开详情对话框
-      detail(row) {
-        this.detailShow = true;
-        this.$refs.detailwell.initDialog(true, row);
-      },
-      checkSelection() {
-        if (this.multipleSelection.length === 0) {
-          return false;
-        } else {
-          return true;
-        }
-      },
-      // 新增井
-      add() {
-        this.$router.push({path: "addWell", query: {type: "add"}});
-      },
-      // 编辑井信息
-      edit(row) {
-        this.dialogFormVisible = true;
-        this.editShow = true;
-        this.$refs.editwell.initDialog(this.dialogFormVisible, row);
-      },
-      // 删除井
-      del() {
-        if (this.checkSelection()) {
-          const wellIds = [];
-          this.multipleSelection.forEach(function (value, index) {
-            wellIds.push(value.id);
-          });
-          this.$confirm("确定要删除所选井吗？", "确认操作", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            delWell(wellIds).then((response) => {
-              if (response.code === 200) {
-                this.$message.success("删除成功");
-                this.fetchData();
-              }
-            });
-          });
-        } else {
-          this.$message.error("至少选中一项");
-        }
-      },
-      // 批量导入井
-      uploadFile(param) {
-        console.log("uploadFile");
-        // 判断文件大小是否符合要求
-        const _file = param.file;
-        const isLt5M = _file.size / 1024 / 1024 < 5;
-        if (!isLt5M) {
-          this.$message.error("请上传5M以下的excel文件");
-          return false;
-        }
-        // 全屏加载动画
-        const loading = this.$loading({
-          lock: true,
-          text: "导入中,请稍后...",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
-        // 发起导入请求
-        batchImportWell(_file)
-          .then((res) => {
-            loading.close(); // 关闭加载动画
-            if (res.code === 200) {
-              this.$message.success("导入成功");
-              this.fileList = [];
-              this.fetchData();
-            } else {
-              this.$message.error(res.message);
-            }
-          })
-          .catch(() => {
-            loading.close();
-          });
-        this.fileList = [];
-      },
-      // 批量导出
-      batchExport() {
-        // 全屏加载动画
-        const loading = this.$loading({
-          lock: true,
-          text: "下载中,请稍后...",
-          spinner: "el-icon-loading",
-          background: "rgba(0, 0, 0, 0.7)",
-        });
-        const _this = this;
-        const config = {
-          // 获取下载进度
-          onDownloadProgress(progressEvent) {
-            console.log(progressEvent);
-            var percent = parseInt(
-              100 * (progressEvent.loaded / progressEvent.total)
-            );
-            console.log("percent:" + percent, "total:" + progressEvent.total);
-            // 渲染dom
-            _this.$nextTick(() => {
-              _this.percent = percent;
-            });
-          },
-        };
-        batchExportWell(this.listQuery, config)
-          .then((res) => {
-            loading.close(); // 关闭加载动画
-            console.log("download===", res);
-            const blob = new Blob([res.data]);
-            const downloadElement = document.createElement("a");
-            const href = window.URL.createObjectURL(blob); // 创建下载的链接
-            downloadElement.href = href;
-            downloadElement.download = `井列表.xlsx`; // 下载后文件名
-            document.body.appendChild(downloadElement);
-            downloadElement.click(); // 点击下载
-            document.body.removeChild(downloadElement); // 下载完成移除元素
-            window.URL.revokeObjectURL(href); // 释放blob对象
-          })
-          .catch((res) => {
-            loading.close();
-          });
-      },
-      // 布防撤防
-      bfcf(row) {
-        if (row.bfzt === "1") {
-          // 需要撤防
-          this.$confirm("确定要对该井进行撤防吗？", "确认操作", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            bfcf(row.id, "0").then((response) => {
-              if (response.code === 200) {
-                this.$message.success("撤防成功");
-                this.fetchData();
-              }
-            });
-          });
-        } else {
-          // 需要布防
-          this.$confirm("确定要对该井进行布防吗？", "确认操作", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning",
-          }).then(() => {
-            bfcf(row.id, "1").then((response) => {
-              if (response.code === 200) {
-                this.$message.success("布防成功");
-                this.fetchData();
-              }
-            });
-          });
-        }
-      },
-      // 批量布防
-      batchBf() {
-        const listQuery = {
-          keywords: this.listQuery.keywords,
-          owner: this.listQuery.owner,
-          position: this.listQuery.position,
-          wellType: this.listQuery.wellType,
-          deptid: this.listQuery.deptid,
-          notes: this.listQuery.notes,
-          bfzt: "1",
-        };
-        this.$confirm("确定要对列表中的全部井进行布防吗？", "确认操作", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          batchBfcf(listQuery).then((response) => {
-            if (response.code === 200) {
-              this.$message.success("布防成功");
-              this.fetchData();
-            }
-          });
-        });
-      },
-      // 批量撤防
-      batchCf() {
-        const listQuery = {
-          keywords: this.listQuery.keywords,
-          owner: this.listQuery.owner,
-          position: this.listQuery.position,
-          wellType: this.listQuery.wellType,
-          deptid: this.listQuery.deptid,
-          notes: this.listQuery.notes,
-          bfzt: "0",
-        };
-        this.$confirm("确定要对列表中的全部井进行撤防吗？", "确认操作", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          batchBfcf(listQuery).then((response) => {
-            if (response.code === 200) {
-              this.$message.success("撤防成功");
-              this.fetchData();
-            }
-          });
-        });
-      },
-      // 查询数据
-      search() {
-        this.fetchData(false);
-      },
-      // 获取井数据
-      fetchData(isNowPage = true) {
-        this.listLoading = true;
-        if (!isNowPage) {
-          // 是否显示当前页，否则跳转第一页
-          this.listQuery.offset = 1;
-        }
-        getWellList(this.listQuery).then((response) => {
-          this.list = response.data.rows.map(function (item) {
-            item.areaFullName = item.areaFullName
-              .replace("/", "")
-              .replace("顶层", "");
-            return item;
-          });
-          this.total = parseInt(response.data.total);
-          this.listLoading = false;
-        });
-      },
-      // 获取井类型
-      fetchWellType() {
-        getWellType().then((response) => {
-          debugger;
-          this.wellTypeList = [];
-          const wellTypes = this.$store.getters.wellTypes;
-          for (const wellType of response.data) {
-            if (wellTypes.indexOf(wellType.value) !== -1) {
-              this.wellTypeList.push(wellType);
-            }
-          }
-          if (this.wellTypeList.length <= 1) {
-            this.showWellType = false;
-          }
-          this.listQuery.wellType = '1'
+    // 打开详情对话框
+    detail(row) {
+      this.detailShow = true
+      this.$refs.detailwell.initDialog(true, row)
+    },
+    checkSelection() {
+      if (this.multipleSelection.length === 0) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 新增井
+    add() {
+      this.$router.push({ path: 'addWell', query: { type: 'add' }})
+    },
+    // 编辑井信息
+    edit(row) {
+      this.dialogFormVisible = true
+      this.editShow = true
+      this.$refs.editwell.initDialog(this.dialogFormVisible, row)
+    },
+    // 删除井
+    del() {
+      if (this.checkSelection()) {
+        const wellIds = []
+        this.multipleSelection.forEach(function(value, index) {
+          wellIds.push(value.id)
         })
-      },
-      // 去设备列表页
-      goDeviceList(row) {
-        this.$router.push({
-          name: "DeviceList",
-          query: {wellCode: row.wellCode},
-        });
-      },
-      goAlarmRecords(row) {
-        this.$router.push({
-          name: "AlarmRecords",
-          query: {wellCode: row.wellCode},
-        });
-      },
-      handleSuccess() {
-        console.log("handleSuccess");
-      },
-      indexMethod(index) {
-        return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1;
-      },
-      // 改变页容量
-      handleSizeChange(val) {
-        this.listQuery.limit = val;
-        this.fetchData();
-      },
-      // 改变当前页
-      handleCurrentChange(val) {
-        this.listQuery.offset = val;
-        this.fetchData();
-      },
-      // 多选触发方法
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
-      },
+        this.$confirm('确定要删除所选井吗？', '确认操作', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          delWell(wellIds).then((response) => {
+            if (response.code === 200) {
+              this.$message.success('删除成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        this.$message.error('至少选中一项')
+      }
     },
-  };
+    // 批量导入井
+    uploadFile(param) {
+      console.log('uploadFile')
+      // 判断文件大小是否符合要求
+      const _file = param.file
+      const isLt5M = _file.size / 1024 / 1024 < 5
+      if (!isLt5M) {
+        this.$message.error('请上传5M以下的excel文件')
+        return false
+      }
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '导入中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      // 发起导入请求
+      batchImportWell(_file)
+        .then((res) => {
+          loading.close() // 关闭加载动画
+          if (res.code === 200) {
+            this.$message.success('导入成功')
+            this.fileList = []
+            this.fetchData()
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+        .catch(() => {
+          loading.close()
+        })
+      this.fileList = []
+    },
+    // 批量导出
+    batchExport() {
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      const _this = this
+      const config = {
+        // 获取下载进度
+        onDownloadProgress(progressEvent) {
+          console.log(progressEvent)
+          var percent = parseInt(
+            100 * (progressEvent.loaded / progressEvent.total)
+          )
+          console.log('percent:' + percent, 'total:' + progressEvent.total)
+          // 渲染dom
+          _this.$nextTick(() => {
+            _this.percent = percent
+          })
+        }
+      }
+      batchExportWell(this.listQuery, config)
+        .then((res) => {
+          loading.close() // 关闭加载动画
+          console.log('download===', res)
+          const blob = new Blob([res.data])
+          const downloadElement = document.createElement('a')
+          const href = window.URL.createObjectURL(blob) // 创建下载的链接
+          downloadElement.href = href
+          downloadElement.download = `井列表.xlsx` // 下载后文件名
+          document.body.appendChild(downloadElement)
+          downloadElement.click() // 点击下载
+          document.body.removeChild(downloadElement) // 下载完成移除元素
+          window.URL.revokeObjectURL(href) // 释放blob对象
+        })
+        .catch((res) => {
+          loading.close()
+        })
+    },
+    // 布防撤防
+    bfcf(row) {
+      if (row.bfzt === '1') {
+        // 需要撤防
+        this.$confirm('确定要对该井进行撤防吗？', '确认操作', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          bfcf(row.id, '0').then((response) => {
+            if (response.code === 200) {
+              this.$message.success('撤防成功')
+              this.fetchData()
+            }
+          })
+        })
+      } else {
+        // 需要布防
+        this.$confirm('确定要对该井进行布防吗？', '确认操作', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          bfcf(row.id, '1').then((response) => {
+            if (response.code === 200) {
+              this.$message.success('布防成功')
+              this.fetchData()
+            }
+          })
+        })
+      }
+    },
+    // 批量布防
+    batchBf() {
+      const listQuery = {
+        keywords: this.listQuery.keywords,
+        owner: this.listQuery.owner,
+        position: this.listQuery.position,
+        wellType: this.listQuery.wellType,
+        deptid: this.listQuery.deptid,
+        notes: this.listQuery.notes,
+        bfzt: '1'
+      }
+      this.$confirm('确定要对列表中的全部井进行布防吗？', '确认操作', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        batchBfcf(listQuery).then((response) => {
+          if (response.code === 200) {
+            this.$message.success('布防成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 批量撤防
+    batchCf() {
+      const listQuery = {
+        keywords: this.listQuery.keywords,
+        owner: this.listQuery.owner,
+        position: this.listQuery.position,
+        wellType: this.listQuery.wellType,
+        deptid: this.listQuery.deptid,
+        notes: this.listQuery.notes,
+        bfzt: '0'
+      }
+      this.$confirm('确定要对列表中的全部井进行撤防吗？', '确认操作', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        batchBfcf(listQuery).then((response) => {
+          if (response.code === 200) {
+            this.$message.success('撤防成功')
+            this.fetchData()
+          }
+        })
+      })
+    },
+    // 查询数据
+    search() {
+      this.fetchData(false)
+    },
+    // 获取井数据
+    fetchData(isNowPage = true) {
+      this.listLoading = true
+      if (!isNowPage) {
+        // 是否显示当前页，否则跳转第一页
+        this.listQuery.offset = 1
+      }
+      getWellList(this.listQuery).then((response) => {
+        this.list = response.data.rows.map(function(item) {
+          item.areaFullName = item.areaFullName // .replace('/', '')
+            .replace('顶层', '')
+          return item
+        })
+        this.total = parseInt(response.data.total)
+        this.listLoading = false
+      })
+    },
+    // 获取井类型
+    fetchWellType() {
+      getWellType().then((response) => {
+        debugger
+        this.wellTypeList = []
+        const wellTypes = this.$store.getters.wellTypes
+        for (const wellType of response.data) {
+          if (wellTypes.indexOf(wellType.value) !== -1) {
+            this.wellTypeList.push(wellType)
+          }
+        }
+        if (this.wellTypeList.length <= 1) {
+          this.showWellType = false
+        }
+        this.listQuery.wellType = '1'
+      })
+    },
+    // 去设备列表页
+    goDeviceList(row) {
+      this.$router.push({
+        name: 'DeviceList',
+        query: { wellCode: row.wellCode }
+      })
+    },
+    goAlarmRecords(row) {
+      this.$router.push({
+        name: 'AlarmRecords',
+        query: { wellCode: row.wellCode }
+      })
+    },
+    handleSuccess() {
+      console.log('handleSuccess')
+    },
+    indexMethod(index) {
+      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
+    },
+    // 改变页容量
+    handleSizeChange(val) {
+      this.listQuery.limit = val
+      this.fetchData()
+    },
+    // 改变当前页
+    handleCurrentChange(val) {
+      this.listQuery.offset = val
+      this.fetchData()
+    },
+    // 多选触发方法
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    }
+  }
+}
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>