diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 88332f1..0b9589e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,12 +159,14 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -171,6 +174,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       console.log('批量导出液位配置')

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 88332f1..0b9589e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,12 +159,14 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -171,6 +174,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       console.log('批量导出液位配置')
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
index 53a1a14..33a4554 100644
--- a/src/views/dataManage/deviceData/listMeterData.vue
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -64,6 +64,7 @@
 import { getMeterData, batchExportMeterData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListMeterData',
@@ -192,12 +193,14 @@
       if (params && params.deviceType === '10' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -205,6 +208,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 88332f1..0b9589e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,12 +159,14 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -171,6 +174,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       console.log('批量导出液位配置')
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
index 53a1a14..33a4554 100644
--- a/src/views/dataManage/deviceData/listMeterData.vue
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -64,6 +64,7 @@
 import { getMeterData, batchExportMeterData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListMeterData',
@@ -192,12 +193,14 @@
       if (params && params.deviceType === '10' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -205,6 +208,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 35cd0d8..d9ea760 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '5') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 88332f1..0b9589e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,12 +159,14 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -171,6 +174,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       console.log('批量导出液位配置')
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
index 53a1a14..33a4554 100644
--- a/src/views/dataManage/deviceData/listMeterData.vue
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -64,6 +64,7 @@
 import { getMeterData, batchExportMeterData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListMeterData',
@@ -192,12 +193,14 @@
       if (params && params.deviceType === '10' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -205,6 +208,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 35cd0d8..d9ea760 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '5') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index af6a4c2..0dbaf63 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '1') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // TODO:批量导出操作

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 88332f1..0b9589e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,12 +159,14 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -171,6 +174,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       console.log('批量导出液位配置')
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
index 53a1a14..33a4554 100644
--- a/src/views/dataManage/deviceData/listMeterData.vue
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -64,6 +64,7 @@
 import { getMeterData, batchExportMeterData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListMeterData',
@@ -192,12 +193,14 @@
       if (params && params.deviceType === '10' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -205,6 +208,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 35cd0d8..d9ea760 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '5') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index af6a4c2..0dbaf63 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '1') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // TODO:批量导出操作
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 01fda73..588f9ec 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -150,6 +151,7 @@
     }
   },
   created() {
+    this.timeRange = getWeekRange()
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
@@ -160,8 +162,9 @@
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '7') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -169,6 +172,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画

diff --git a/src/utils/dateutils.js b/src/utils/dateutils.js
index aa41264..db6fde7 100644
--- a/src/utils/dateutils.js
+++ b/src/utils/dateutils.js
@@ -29,7 +29,18 @@
 export function formatDate(date,fmt){
   return date.Format(fmt)
 }
-
+export function getWeekRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 7)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
+export function getMonthRange(fmt='yyyy-MM-dd HH:mm:ss'){
+  const tm1 = new Date()
+  const tm2 = new Date()
+  tm1.setTime(tm1.getTime() - 3600 * 1000 * 24 * 30)
+  return [tm1.Format('yyyy-MM-dd hh:mm:ss'),tm2.Format('yyyy-MM-dd hh:mm:ss')]
+}
 // 对Date的扩展，将 Date 转化为指定格式的String
 // 月(M)、日(d)、小时(h)、分(m)、秒(s)、季度(q) 可以用 1-2 个占位符，
 // 年(y)可以用 1-4 个占位符，毫秒(S)只能用 1 个占位符(是 1-3 位的数字)
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 384f342..46d9f65 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -84,6 +84,7 @@
 import { getAlarmList, batchExportAlarm, getAlarmType, getAlarmContentType } from '@/api/alarm'
 let isFromDetail = false
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListAlarmRecords',
@@ -180,18 +181,10 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
+    this.timeRange = getMonthRange()
     this.fetchAlarmType() // 告警类型下拉菜单
     console.log('records created')
   },
@@ -215,9 +208,7 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -231,9 +222,7 @@
         this.listQuery.keywords = ''
         this.listQuery.alarmType = ''
         this.listQuery.alarmContentType = ''
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-        this.timeRange = []
+        this.timeRange = getMonthRange()
         this.fetchData(false)
       }
     }
@@ -292,6 +281,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
diff --git a/src/views/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 1995630..10bd89c 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -49,6 +49,7 @@
 import { getDeviceType } from '@/api/device'
 import { getDayTime } from '@/utils/dateutils'
 import 'v-charts/lib/style.css'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'AlarmStaticsByDept',
@@ -89,6 +90,9 @@
     }
   },
   mounted() {
+    const tm1 = getDayTime(new Date().getTime() - 24 * 7 * 60 * 60 * 1000)
+    const tm2 = new Date()
+    this.timeRange = [tm1.Format('yyyy-MM-dd hh:mm:ss'), tm2.Format('yyyy-MM-dd hh:mm:ss')]
     this.fetchDeviceType()
     this.fetchData()
   },
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index e0399dc..ab176f8 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -78,24 +78,34 @@
     // 处理Tab点击事件，每次点击更新数据
     handleClick(tab, event) {
       if (tab.name === 'wellcover') {
+        this.$refs.welldatacomp.refreshTimeRange()
         this.$refs.welldatacomp.fetchData()
       } else if (tab.name === 'liquid') {
+        this.$refs.liquiddatacomp.refreshTimeRange()
         this.$refs.liquiddatacomp.fetchData()
       } else if (tab.name === 'harmful') {
+        this.$refs.harmfuldatacomp.refreshTimeRange()
         this.$refs.harmfuldatacomp.fetchData()
       } else if (tab.name === 'gas') {
+        this.$refs.gasdatacomp.refreshTimeRange()
         this.$refs.gasdatacomp.fetchData()
       } else if (tab.name === 'temp') {
+        this.$refs.tempdatacomp.refreshTimeRange()
         this.$refs.tempdatacomp.fetchData()
       } else if (tab.name === 'dig') {
+        this.$refs.digdatacomp.refreshTimeRange()
         this.$refs.digdatacomp.fetchData()
       } else if (tab.name === 'wellloca') {
+        this.$refs.welllocadatacomp.refreshTimeRange()
         this.$refs.welllocadatacomp.fetchData()
       } else if (tab.name === 'hyetometer') {
+        this.$refs.hyetometerdatacomp.refreshTimeRange()
         this.$refs.hyetometerdatacomp.fetchData()
       } else if (tab.name === 'flowmeter') {
+        this.$refs.flowmeterdatacomp.refreshTimeRange()
         this.$refs.flowmeterdatacomp.fetchData()
       } else if (tab.name === 'meter') {
+        this.$refs.meterdatacomp.refreshTimeRange()
         this.$refs.meterdatacomp.fetchData()
       }
     },
diff --git a/src/views/dataManage/deviceData/listDigData.vue b/src/views/dataManage/deviceData/listDigData.vue
index c2fa627..f526799 100644
--- a/src/views/dataManage/deviceData/listDigData.vue
+++ b/src/views/dataManage/deviceData/listDigData.vue
@@ -63,6 +63,7 @@
 import { getDigData, batchExportDigData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListDigData',
@@ -165,15 +166,18 @@
       if (params && params.deviceType === '6' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '6') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
@@ -206,6 +210,9 @@
     search() {
       this.fetchData(false)
     },
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 获取开挖配置数据
     fetchData(isNowPage = true) {
       this.listLoading = true
diff --git a/src/views/dataManage/deviceData/listFlowmeterData.vue b/src/views/dataManage/deviceData/listFlowmeterData.vue
index 1b895d8..6d8b221 100644
--- a/src/views/dataManage/deviceData/listFlowmeterData.vue
+++ b/src/views/dataManage/deviceData/listFlowmeterData.vue
@@ -64,6 +64,7 @@
 import { getFlowData, batchExportFlowData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListFlowmeterData',
@@ -172,19 +173,25 @@
       if (params && params.deviceType === '9' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '9') {
       this.listQuery.keywords = this.$route.query.devcode
+      this.timeRange = getWeekRange()
       this.fetchData(false)// 获取数据
     } else {
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listGasData.vue b/src/views/dataManage/deviceData/listGasData.vue
index 3145470..877d2bb 100644
--- a/src/views/dataManage/deviceData/listGasData.vue
+++ b/src/views/dataManage/deviceData/listGasData.vue
@@ -63,6 +63,7 @@
 import { getGasData, batchExportGasData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListGasData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '4' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '4') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHarmfulData.vue b/src/views/dataManage/deviceData/listHarmfulData.vue
index a80e470..ee36138 100644
--- a/src/views/dataManage/deviceData/listHarmfulData.vue
+++ b/src/views/dataManage/deviceData/listHarmfulData.vue
@@ -63,6 +63,7 @@
 import { getHarmfulData, batchExportHarmfulData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHarmfulData',
@@ -176,12 +177,14 @@
       if (params && params.deviceType === '3' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '3') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -189,6 +192,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listHyetometerData.vue b/src/views/dataManage/deviceData/listHyetometerData.vue
index 9546b1e..cb9e851 100644
--- a/src/views/dataManage/deviceData/listHyetometerData.vue
+++ b/src/views/dataManage/deviceData/listHyetometerData.vue
@@ -64,6 +64,7 @@
 import { getHyetoData, batchExportHyetoData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListHyetometerData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '8' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '8') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 88332f1..0b9589e 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -63,6 +63,7 @@
 import { getLiquidData, batchExportLiquidData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListLiquidData',
@@ -158,12 +159,14 @@
       if (params && params.deviceType === '2' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -171,6 +174,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       console.log('批量导出液位配置')
diff --git a/src/views/dataManage/deviceData/listMeterData.vue b/src/views/dataManage/deviceData/listMeterData.vue
index 53a1a14..33a4554 100644
--- a/src/views/dataManage/deviceData/listMeterData.vue
+++ b/src/views/dataManage/deviceData/listMeterData.vue
@@ -64,6 +64,7 @@
 import { getMeterData, batchExportMeterData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListMeterData',
@@ -192,12 +193,14 @@
       if (params && params.deviceType === '10' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '2') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -205,6 +208,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listTempData.vue b/src/views/dataManage/deviceData/listTempData.vue
index 35cd0d8..d9ea760 100644
--- a/src/views/dataManage/deviceData/listTempData.vue
+++ b/src/views/dataManage/deviceData/listTempData.vue
@@ -63,6 +63,7 @@
 import { getTempData, batchExportTempData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListTempData',
@@ -163,12 +164,14 @@
       if (params && params.deviceType === '5' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '5') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -176,6 +179,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index af6a4c2..0dbaf63 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -63,6 +63,7 @@
 import { getWellData, batchExportWellData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellCoverData',
@@ -152,12 +153,14 @@
       if (params && params.deviceType === '1' && params.devcode) {
         this.listQuery.keywords = params.devcode
       }
+      this.timeRange = getWeekRange()
       this.fetchData()
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '1') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -165,6 +168,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // TODO:批量导出操作
diff --git a/src/views/dataManage/deviceData/listWellLocaData.vue b/src/views/dataManage/deviceData/listWellLocaData.vue
index 01fda73..588f9ec 100644
--- a/src/views/dataManage/deviceData/listWellLocaData.vue
+++ b/src/views/dataManage/deviceData/listWellLocaData.vue
@@ -63,6 +63,7 @@
 import { getWellLocaData, batchExportWellLocaData } from '@/api/data'
 import DeptSelect from '../../../components/DeptSelect/index'
 import { parseUrl } from '@/utils/parseutils'
+import { getWeekRange } from '@/utils/dateutils'
 
 export default {
   name: 'ListWellLocaData',
@@ -150,6 +151,7 @@
     }
   },
   created() {
+    this.timeRange = getWeekRange()
     // 如果路径里带参数，解析devcode参数
     if (window.location.href) {
       const params = parseUrl(window.location.href)
@@ -160,8 +162,9 @@
     }
   },
   activated() {
+    this.timeRange = getWeekRange()
     // 要是路由里有参数
-    if (this.$route.query && this.$route.query.devcode) {
+    if (this.$route.query && this.$route.query.devcode && this.$route.query.deviceType === '7') {
       this.listQuery.keywords = this.$route.query.devcode
       this.fetchData(false)// 获取数据
     } else {
@@ -169,6 +172,9 @@
     }
   },
   methods: {
+    refreshTimeRange() {
+      this.timeRange = getWeekRange()
+    },
     // 批量导出
     batchExport() {
       // 全屏加载动画
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 59676a8..8e75bf8 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -106,6 +106,7 @@
 import { getAlarmType, getAlarmContentType } from '@/api/alarm'
 import { getJobList, batchExportJob, handleJob, getJobStatus } from '@/api/job'
 import { isOperation } from '@/utils/permission'
+import { getMonthRange } from '@/utils/dateutils'
 
 let isFromDetail = false
 export default {
@@ -230,15 +231,6 @@
       } else {
         this.alarmContentTypeList = []
       }
-    },
-    timeRange(val) {
-      if (val && val.length > 0) {
-        this.listQuery.beginTime = val[0]
-        this.listQuery.endTime = val[1]
-      } else {
-        this.listQuery.beginTime = ''
-        this.listQuery.endTime = ''
-      }
     }
   },
   created() {
@@ -267,12 +259,11 @@
       this.listQuery.keywords = ''
       this.listQuery.alarmType = ''
       this.listQuery.alarmContentType = ''
-      this.listQuery.beginTime = ''
-      this.listQuery.endTime = ''
-      this.timeRange = []
+      this.timeRange = getMonthRange()
       if (!isOperation()) {
         this.listQuery.alarmType = '1'
       }
+      this.timeRange = getMonthRange()
       this.fetchData(false)
     }
   },
@@ -328,6 +319,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