From 873325daa14c27d05b74e1810a53ff477598f1e4 Mon Sep 17 00:00:00 2001 From: luobisheng <727299681@qq.com> Date: 星期五, 09 十二月 2022 11:33:31 +0800 Subject: [PATCH] 预警研判调度修改 --- src/views/intelligentPatrol/studyJudge/index.vue | 11 ++++------- src/views/operate/myWait/index.vue | 5 +++-- src/views/operate/disposal/casepool/dispatch/index.vue | 1 - 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/views/intelligentPatrol/studyJudge/index.vue b/src/views/intelligentPatrol/studyJudge/index.vue index 5872fd5..54ec2f1 100644 --- a/src/views/intelligentPatrol/studyJudge/index.vue +++ b/src/views/intelligentPatrol/studyJudge/index.vue @@ -87,7 +87,7 @@ </div> </div> <el-dialog :visible="isShowDialog" title="璋冨害淇℃伅"> - <MyDispatch v-if="isShowDialog" :mytype="1" @confirmInspection="handleConfirm" :isGetData="true" @changeDialog="closeDialog"></MyDispatch> + <MyDispatch v-if="isShowDialog" :mytype="1" @getDispatchData="confirmInspection" :isGetData="true" @changeDialog="closeDialog"></MyDispatch> </el-dialog> </div> </template> @@ -172,17 +172,17 @@ rules:{ state:[ { - required: true, trigger:['blur', 'change'], message: '澶勭悊鎰忚涓嶈兘涓虹┖' + required: true, trigger:['blur'], message: '澶勭悊鎰忚涓嶈兘涓虹┖' }, ], categoryId:[ { - required: true, trigger:['blur', 'change'], message: '澶х被鍚嶇О涓嶈兘涓虹┖' + required: true, trigger:['blur'], message: '澶х被鍚嶇О涓嶈兘涓虹┖' } ], typeId:[ { - required: true, trigger:['blur', 'change'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖' + required: true, trigger:['blur'], message: '灏忕被鍚嶇О涓嶈兘涓虹┖' } ], carNumber:[{ trigger:['blur', 'change'], validator: validateCarNumber }] @@ -262,9 +262,6 @@ }, confirmInspection(data) { - if (data) { - data.baseCaseId = data.id; - } const eventParams = Object.assign({}, this.eventInfoData); delete eventParams.store; basecase.confirmInspection({ ...eventParams, ...data }) diff --git a/src/views/operate/disposal/casepool/dispatch/index.vue b/src/views/operate/disposal/casepool/dispatch/index.vue index a3049d4..2984444 100644 --- a/src/views/operate/disposal/casepool/dispatch/index.vue +++ b/src/views/operate/disposal/casepool/dispatch/index.vue @@ -324,7 +324,6 @@ .then(({ baseCase, currentSitVo, filesPictureVo, handlePassVo }) => { this.vioData = currentSitVo; this.illData = currentSitVo; - debugger; this.imageResourceId = filesPictureVo.imageResources[0]?.id; }) .catch(err => this.$message.error(err)) diff --git a/src/views/operate/myWait/index.vue b/src/views/operate/myWait/index.vue index d970add..f87de5f 100644 --- a/src/views/operate/myWait/index.vue +++ b/src/views/operate/myWait/index.vue @@ -171,7 +171,7 @@ dialogUpdate: false, updateFlag: false, userInfo: "", - totalNum: null, + totalNum: 1, pageSize: 10, currentPage: 1, all: false, @@ -207,9 +207,10 @@ getTableData() { myWait .getMybackLog({ num: this.context, current: this.currentPage, pageSize: this.pageSize }) - .then(({ records }) => { + .then(({ records, total }) => { this.tableData = records; this.tableData = this.tableData.filter((item) => !!item); + this.totalNum = total; }) .catch((err) => this.$message({ type: "error", message: err })); }, -- Gitblit v1.8.0