diff --git a/src/views/ems/dzjk/gzgj/index.vue b/src/views/ems/dzjk/gzgj/index.vue index 109bfa1..ca8c4fd 100644 --- a/src/views/ems/dzjk/gzgj/index.vue +++ b/src/views/ems/dzjk/gzgj/index.vue @@ -4,12 +4,12 @@ - + - + @@ -157,7 +157,7 @@ export default { }, // 搜索 onSearch(){ - const [alarmStartTime='',alarmEndTime='']=this.dateRange + const [alarmStartTime='',alarmEndTime='']=(this.dateRange || []) // 选中了时间范围 if(alarmStartTime && alarmStartTime){ // 如果选择的时间范围是今天 @@ -182,7 +182,7 @@ export default { if(id !== this.activeBtn){ console.log('点击了不同的菜单,更新数据') this.activeBtn=id; - const [alarmStartTime,alarmEndTime]=this.dateRange + const [alarmStartTime,alarmEndTime]=(this.dateRange || []) // 切换到今日告警,如果已经选择了时间范围清空 if(alarmStartTime && alarmEndTime){ // 如果切换到了今日告警,时间范围不相等或者相等但是不是今天 清空时间选择范围 @@ -201,7 +201,7 @@ export default { this.loading=true const {deviceType,alarmLevel} = this.search const {siteId,pageNum,pageSize,activeBtn} =this - const [alarmStartTime='',alarmEndTime='']=this.dateRange + const [alarmStartTime='',alarmEndTime='']=(this.dateRange || []) let start='',end = '',now =new Date() if(activeBtn === 'today'){ start = end = now @@ -232,3 +232,4 @@ export default { } } + diff --git a/src/views/ems/dzjk/sbjk/dtdc/index.vue b/src/views/ems/dzjk/sbjk/dtdc/index.vue index fa24395..dded048 100644 --- a/src/views/ems/dzjk/sbjk/dtdc/index.vue +++ b/src/views/ems/dzjk/sbjk/dtdc/index.vue @@ -7,12 +7,12 @@ - + - +