diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..f449337 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -5,7 +5,7 @@
   return new Date(nowTimeDate)
 }
 
-export function getToday(fmt) { // 默认显示今天
+export function getToday(fmt = 'yyyy-MM-dd hh:mm:ss') { // 默认显示今天
   return new Date().Format(fmt)
 }
 

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..f449337 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -5,7 +5,7 @@
   return new Date(nowTimeDate)
 }
 
-export function getToday(fmt) { // 默认显示今天
+export function getToday(fmt = 'yyyy-MM-dd hh:mm:ss') { // 默认显示今天
   return new Date().Format(fmt)
 }
 
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..e47c6a2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -26,17 +26,19 @@
   mounted() {
     if (window.location.href) {
       var query = window.location.href.split('?')
-      var values = query[1].split('&')
-      for (var i = 0; i < values.length; i++) {
-        var pos = values[i].indexOf('=')
-        if (pos === -1) continue
-        var paramname = values[i].substring(0, pos)
-        var value = values[i].substring(pos + 1)
-        if (paramname === 'deviceType') {
-          if (value === '1') {
-            this.activeName = 'wellcover'
-          } else if (value === '2') {
-            this.activeName = 'liquid'
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'deviceType') {
+            if (value === '1') {
+              this.activeName = 'wellcover'
+            } else if (value === '2') {
+              this.activeName = 'liquid'
+            }
           }
         }
       }

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index 868111a..f449337 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -5,7 +5,7 @@
   return new Date(nowTimeDate)
 }
 
-export function getToday(fmt) { // 默认显示今天
+export function getToday(fmt = 'yyyy-MM-dd hh:mm:ss') { // 默认显示今天
   return new Date().Format(fmt)
 }
 
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index 9e2594b..e47c6a2 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -26,17 +26,19 @@
   mounted() {
     if (window.location.href) {
       var query = window.location.href.split('?')
-      var values = query[1].split('&')
-      for (var i = 0; i < values.length; i++) {
-        var pos = values[i].indexOf('=')
-        if (pos === -1) continue
-        var paramname = values[i].substring(0, pos)
-        var value = values[i].substring(pos + 1)
-        if (paramname === 'deviceType') {
-          if (value === '1') {
-            this.activeName = 'wellcover'
-          } else if (value === '2') {
-            this.activeName = 'liquid'
+      if (query.length > 1) {
+        var values = query[1].split('&')
+        for (var i = 0; i < values.length; i++) {
+          var pos = values[i].indexOf('=')
+          if (pos === -1) continue
+          var paramname = values[i].substring(0, pos)
+          var value = values[i].substring(pos + 1)
+          if (paramname === 'deviceType') {
+            if (value === '1') {
+              this.activeName = 'wellcover'
+            } else if (value === '2') {
+              this.activeName = 'liquid'
+            }
           }
         }
       }
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index a08f8d6..f954700 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -5,10 +5,10 @@
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
           <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
+            <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable />
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所" />
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
@@ -17,22 +17,31 @@
               range-separator="至"
               value-format="yyyy-MM-dd HH:mm:ss"
               start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
+              end-placeholder="结束时间"
+            />
           </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">
+            搜索
+          </el-button>
         </el-row>
       </el-form>
     </div>
     <!--查询结果Table显示-->
     <div>
       <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+        <el-col :span="6">
+          <div class="title-header">
+            <i class="el-icon-menu" />数据列表
+          </div>
+        </el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
+          <el-button v-if="hasPerm('/welldata/export')" class="edit_btn" size="small" @click="batchExport">
+            导出记录
+          </el-button>
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <el-table-column :index="indexMethod" align="center" type="index"/>
+        <el-table-column :index="indexMethod" align="center" type="index" />
         <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="column.checkState" :class="checkState(scope.row)">{{ scope.row[column.value] }}</span>
@@ -52,7 +61,8 @@
         align="center"
         layout="total, sizes, prev, pager, next"
         @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
+        @current-change="handleCurrentChange"
+      />
     </div>
   </div>
 </template>
@@ -133,19 +143,11 @@
       deptShowTop: false
     }
   },
-  watch: {
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
-    }
-  },
   mounted() {
     if (window.location.href) {
+      const startTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
+      const endTime = getToday()
+      this.timeRange = [startTime, endTime]
       var query = window.location.href.split('?')
       if (query.length > 1) {
         var values = query[1].split('&')
@@ -174,7 +176,13 @@
   methods: {
     // 批量导出
     batchExport() {
-      // TODO:批量导出操作
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
       console.log('批量导出井盖')
       // 全屏加载动画
       const loading = this.$loading({
@@ -184,12 +192,6 @@
         background: 'rgba(0, 0, 0, 0.7)'
       })
       const listQuery = this.listQuery
-      if (listQuery.beginTime === '') {
-        listQuery.beginTime = getLastWeek().Format('yyyy-MM-dd hh:mm:ss')
-      }
-      if (listQuery.endTime === '') {
-        listQuery.endTime = getToday('yyyy-MM-dd hh:mm:ss')
-      }
       batchExportWellData(listQuery).then(res => {
         loading.close() // 关闭加载动画
         console.log('download===', res)
@@ -212,6 +214,13 @@
     },
     // 获取井盖数据
     fetchData(isNowPage = true) {
+      if (this.timeRange && this.timeRange.length > 0) {
+        this.listQuery.beginTime = this.timeRange[0]
+        this.listQuery.endTime = this.timeRange[1]
+      } else {
+        this.listQuery.beginTime = ''
+        this.listQuery.endTime = ''
+      }
       this.listLoading = true
       if (!isNowPage) { // 是否显示当前页，否则跳转第一页
         this.listQuery.offset = 1