diff --git a/pages/information/information.vue b/pages/information/information.vue index 66e1c74..c21db03 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -166,7 +166,7 @@ }) }else if(this.callerInfo.inTime >= this.callerInfo.outTime){ return uni.showToast({ - title: `访客结束时间未选择`, + title: `结束时间必须得大于开始时间`, icon: 'none', duration: 2000, }) diff --git a/pages/information/information.vue b/pages/information/information.vue index 66e1c74..c21db03 100644 --- a/pages/information/information.vue +++ b/pages/information/information.vue @@ -166,7 +166,7 @@ }) }else if(this.callerInfo.inTime >= this.callerInfo.outTime){ return uni.showToast({ - title: `访客结束时间未选择`, + title: `结束时间必须得大于开始时间`, icon: 'none', duration: 2000, }) diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index d937886..3bfb1bf 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -294,8 +294,8 @@ }; this.statusInfo = "筛选状态"; this.time = "筛选时间"; - this.getAlarmList() - this.getAlarmList().then(() => { + this.getAlarmList(false) + this.getAlarmList(false).then(() => { uni.stopPullDownRefresh(); }); }, @@ -317,7 +317,7 @@ this.type = '' this.ispassShow = true }, - async getAlarmList() { // 获取到报警列表 + async getAlarmList(type) { // 获取到报警列表 const res = await getAlarm(this.queryList) if(res.rows && res.rows.length) { const resData = res.rows.map(item=> { @@ -331,7 +331,11 @@ return item }) this.nothingMore = false - this.list = this.list.concat(resData); + if(type){ + this.list = this.list.concat(resData); + }else { + this.list = resData + } }else { if(res.total === 0) { this.list = [] @@ -383,7 +387,7 @@ this.statusInfo = e.name this.queryList.status = e.id this.queryList.offset = 1 - this.getAlarmList() + this.getAlarmList(false) }, // 点击取消告警弹窗中的确认按钮 async possQr() { @@ -410,7 +414,7 @@ }) this.ispassShow = false this.list = [] - this.getAlarmList() + this.getAlarmList(false) }else { uni.showToast({ title: `告警取消原因必选`, @@ -456,7 +460,7 @@ this.isTimeZ = await this.yueFen(e.value); this.time = `${this.isTimeQ}${this.isTimeZ}`; this.endTimeShow = false; - this.getAlarmList(); + this.getAlarmList(false); }, //确定选择开始时间 async confirmTime(e) { @@ -532,7 +536,7 @@ if (this.nothingMore) return; this.queryList.offset += 1; this.loading = true; - await this.getAlarmList(); + await this.getAlarmList(true); this.loading = false; } },