diff --git a/pages/check/check.vue b/pages/check/check.vue index 1fc2909..41b370c 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -2,7 +2,7 @@ + :formatter="formatter" @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime"> + :formatter="formatter" @cancel="closeTime" @change="change" @confirm="confirmTime"> @@ -81,7 +81,6 @@ remarks: '', outTime: Number(new Date()) }, - minTime: Number(new Date()), rules: { visitorName: [{ required: true, diff --git a/pages/check/check.vue b/pages/check/check.vue index 1fc2909..41b370c 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -2,7 +2,7 @@ + :formatter="formatter" @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime"> + :formatter="formatter" @cancel="closeTime" @change="change" @confirm="confirmTime"> @@ -81,7 +81,6 @@ remarks: '', outTime: Number(new Date()) }, - minTime: Number(new Date()), rules: { visitorName: [{ required: true, diff --git a/pages/list/list.vue b/pages/list/list.vue index 95067bf..e66d0fe 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -90,8 +90,8 @@ :show="startTimeShow" mode="datetime" title="请选择开始时间" + v-model="startTimeDefult" :formatter="formatter" - :minDate="lastMonth" @cancel="closeTime" @confirm="confirmTime" > @@ -102,8 +102,8 @@ mode="datetime" title="请选择结束时间" :formatter="formatter" - :minDate="Number(new Date())" - @cancel="endTimeShow = false" + v-model="endTimeDefult" + @cancel="closeTime" @confirm="confirmEndTime" > @@ -153,9 +153,11 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }, + startTimeDefult:Number(new Date()), + endTimeDefult:Number(new Date()), list: [], isExportShow: false, ispassShow: false, @@ -164,7 +166,6 @@ checkboxList: [], checkExport: "所有", startTimeShow: false, - lastMonth: Number(new Date()) - 25920000000, endTimeShow: false, TimeNextShow: false, statusShow: false, @@ -403,7 +404,7 @@ }, //取消选择时间 closeTime() { - this.offset = 1; + this.offset = 1; this.startTimeShow = false; this.time = "筛选时间"; this.queryList = { @@ -411,9 +412,11 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; + this.startTimeShow = false; + this.endTimeShow = false; }, //确定选择结束时间 async confirmEndTime(e) { diff --git a/pages/check/check.vue b/pages/check/check.vue index 1fc2909..41b370c 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -2,7 +2,7 @@ + :formatter="formatter" @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime"> + :formatter="formatter" @cancel="closeTime" @change="change" @confirm="confirmTime"> @@ -81,7 +81,6 @@ remarks: '', outTime: Number(new Date()) }, - minTime: Number(new Date()), rules: { visitorName: [{ required: true, diff --git a/pages/list/list.vue b/pages/list/list.vue index 95067bf..e66d0fe 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -90,8 +90,8 @@ :show="startTimeShow" mode="datetime" title="请选择开始时间" + v-model="startTimeDefult" :formatter="formatter" - :minDate="lastMonth" @cancel="closeTime" @confirm="confirmTime" > @@ -102,8 +102,8 @@ mode="datetime" title="请选择结束时间" :formatter="formatter" - :minDate="Number(new Date())" - @cancel="endTimeShow = false" + v-model="endTimeDefult" + @cancel="closeTime" @confirm="confirmEndTime" > @@ -153,9 +153,11 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }, + startTimeDefult:Number(new Date()), + endTimeDefult:Number(new Date()), list: [], isExportShow: false, ispassShow: false, @@ -164,7 +166,6 @@ checkboxList: [], checkExport: "所有", startTimeShow: false, - lastMonth: Number(new Date()) - 25920000000, endTimeShow: false, TimeNextShow: false, statusShow: false, @@ -403,7 +404,7 @@ }, //取消选择时间 closeTime() { - this.offset = 1; + this.offset = 1; this.startTimeShow = false; this.time = "筛选时间"; this.queryList = { @@ -411,9 +412,11 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; + this.startTimeShow = false; + this.endTimeShow = false; }, //确定选择结束时间 async confirmEndTime(e) { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index feff1df..d937886 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -150,7 +150,7 @@ mode="datetime" title="请选择开始时间" :formatter="formatter" - :minDate="lastMonth" + v-model="startTimeDefult" @cancel="closeTime" @confirm="confirmTime" > @@ -161,7 +161,7 @@ mode="datetime" title="请选择结束时间" :formatter="formatter" - :minDate="Number(new Date())" + v-model="endTimeDefult" @cancel="endTimeShow = false" @confirm="confirmEndTime" > @@ -207,6 +207,8 @@ sort: '', order: '', }, + startTimeDefult:Number(new Date()), + endTimeDefult:Number(new Date()), userInfo: { handleMessage: '', name: '', @@ -249,7 +251,6 @@ statusShow: false, // 控制处理状态开关 showSex:false, // 选择具体处理情况开关 startTimeShow: false, - lastMonth: Number(new Date()) - 25920000000, endTimeShow: false, TimeNextShow: false, infoId:'', // 取消报警id @@ -294,7 +295,7 @@ this.statusInfo = "筛选状态"; this.time = "筛选时间"; this.getAlarmList() - this.searchList(false).then(() => { + this.getAlarmList().then(() => { uni.stopPullDownRefresh(); }); }, @@ -307,6 +308,7 @@ async batchCancelQr() { this.ispassShow = true this.type = 'all' + this.queryList.offset = 1 this.isBatchCancelShow = false }, // 获取id @@ -344,7 +346,6 @@ }, //搜索框发生改变 // async change(e) { - // // this.getAlarmList() // }, //确定导出 @@ -388,7 +389,6 @@ async possQr() { let res = null if(this.userInfo.jobStatus.trim() !== ''){ - delete this.userInfo.name if(this.type === 'all') { const params = { keywords:this.queryList.keywords || '', @@ -403,13 +403,14 @@ }else { res = await getCancelAlarm({...this.userInfo , id:this.infoId}) } - uni.showToast({ - title: `告警取消成功`, - icon: 'none', - duration: 2000, - }) - this.ispassShow = false - this.getAlarmList() + uni.showToast({ + title: `告警取消成功`, + icon: 'none', + duration: 2000, + }) + this.ispassShow = false + this.list = [] + this.getAlarmList() }else { uni.showToast({ title: `告警取消原因必选`, diff --git a/pages/check/check.vue b/pages/check/check.vue index 1fc2909..41b370c 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -2,7 +2,7 @@ + :formatter="formatter" @cancel="isinTimeShow=false" @change="change" @confirm="closeinTime"> + :formatter="formatter" @cancel="closeTime" @change="change" @confirm="confirmTime"> @@ -81,7 +81,6 @@ remarks: '', outTime: Number(new Date()) }, - minTime: Number(new Date()), rules: { visitorName: [{ required: true, diff --git a/pages/list/list.vue b/pages/list/list.vue index 95067bf..e66d0fe 100644 --- a/pages/list/list.vue +++ b/pages/list/list.vue @@ -90,8 +90,8 @@ :show="startTimeShow" mode="datetime" title="请选择开始时间" + v-model="startTimeDefult" :formatter="formatter" - :minDate="lastMonth" @cancel="closeTime" @confirm="confirmTime" > @@ -102,8 +102,8 @@ mode="datetime" title="请选择结束时间" :formatter="formatter" - :minDate="Number(new Date())" - @cancel="endTimeShow = false" + v-model="endTimeDefult" + @cancel="closeTime" @confirm="confirmEndTime" > @@ -153,9 +153,11 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }, + startTimeDefult:Number(new Date()), + endTimeDefult:Number(new Date()), list: [], isExportShow: false, ispassShow: false, @@ -164,7 +166,6 @@ checkboxList: [], checkExport: "所有", startTimeShow: false, - lastMonth: Number(new Date()) - 25920000000, endTimeShow: false, TimeNextShow: false, statusShow: false, @@ -403,7 +404,7 @@ }, //取消选择时间 closeTime() { - this.offset = 1; + this.offset = 1; this.startTimeShow = false; this.time = "筛选时间"; this.queryList = { @@ -411,9 +412,11 @@ startTime: "", endTime: "", status: "", - offset: this.offset, - limit: this.limit + offset: this.offset, + limit: this.limit }; + this.startTimeShow = false; + this.endTimeShow = false; }, //确定选择结束时间 async confirmEndTime(e) { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index feff1df..d937886 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -150,7 +150,7 @@ mode="datetime" title="请选择开始时间" :formatter="formatter" - :minDate="lastMonth" + v-model="startTimeDefult" @cancel="closeTime" @confirm="confirmTime" > @@ -161,7 +161,7 @@ mode="datetime" title="请选择结束时间" :formatter="formatter" - :minDate="Number(new Date())" + v-model="endTimeDefult" @cancel="endTimeShow = false" @confirm="confirmEndTime" > @@ -207,6 +207,8 @@ sort: '', order: '', }, + startTimeDefult:Number(new Date()), + endTimeDefult:Number(new Date()), userInfo: { handleMessage: '', name: '', @@ -249,7 +251,6 @@ statusShow: false, // 控制处理状态开关 showSex:false, // 选择具体处理情况开关 startTimeShow: false, - lastMonth: Number(new Date()) - 25920000000, endTimeShow: false, TimeNextShow: false, infoId:'', // 取消报警id @@ -294,7 +295,7 @@ this.statusInfo = "筛选状态"; this.time = "筛选时间"; this.getAlarmList() - this.searchList(false).then(() => { + this.getAlarmList().then(() => { uni.stopPullDownRefresh(); }); }, @@ -307,6 +308,7 @@ async batchCancelQr() { this.ispassShow = true this.type = 'all' + this.queryList.offset = 1 this.isBatchCancelShow = false }, // 获取id @@ -344,7 +346,6 @@ }, //搜索框发生改变 // async change(e) { - // // this.getAlarmList() // }, //确定导出 @@ -388,7 +389,6 @@ async possQr() { let res = null if(this.userInfo.jobStatus.trim() !== ''){ - delete this.userInfo.name if(this.type === 'all') { const params = { keywords:this.queryList.keywords || '', @@ -403,13 +403,14 @@ }else { res = await getCancelAlarm({...this.userInfo , id:this.infoId}) } - uni.showToast({ - title: `告警取消成功`, - icon: 'none', - duration: 2000, - }) - this.ispassShow = false - this.getAlarmList() + uni.showToast({ + title: `告警取消成功`, + icon: 'none', + duration: 2000, + }) + this.ispassShow = false + this.list = [] + this.getAlarmList() }else { uni.showToast({ title: `告警取消原因必选`, diff --git a/pagesA/checkInfo/checkInfo.vue b/pagesA/checkInfo/checkInfo.vue index 0b55845..0bb3ea3 100644 --- a/pagesA/checkInfo/checkInfo.vue +++ b/pagesA/checkInfo/checkInfo.vue @@ -114,8 +114,8 @@ this.imgUrl = '../../static/checkIcon/liquid.jpg' } // 将获取的值赋值给markers - this.marker[0].latitude = res.coordinateY - this.marker[0].longitude = res.coordinateX + this.marker[0].latitude = res.latGaode + this.marker[0].longitude = res.lngGaode this.marker[0].callout.content = this.info.deviceTypeName // 根据不同设备换取不同的地图图标 if (this.info.onlineStateName === '在线') {