From 67e108e46902188921e78a01e7d4f71c85618442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <> Date: Thu, 7 Sep 2023 17:05:22 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hiddenDanger/clap.component.vue | 16 +++++++--------- src/views/hiddenDanger/files.component.vue | 3 +-- src/views/hiddenDanger/manager.component.vue | 12 +++++------- .../hiddenDanger/safe/action.component.vue | 14 +++++++------- .../hiddenDanger/safe/plan.component.vue | 1 - .../hiddenDanger/safe/safe.component.html | 19 ++++++++++++++----- 6 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/views/hiddenDanger/clap.component.vue b/src/views/hiddenDanger/clap.component.vue index 5730277..c6b3690 100644 --- a/src/views/hiddenDanger/clap.component.vue +++ b/src/views/hiddenDanger/clap.component.vue @@ -532,6 +532,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent inspectUserId: this.account.userId, inspectUserName: this.account.nickName, number: null, + photo: null, inspectTime: moment().format("YYYY-MM-DD HH:mm") } if (!row) { @@ -542,9 +543,6 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent this.showUpdate = true; }) } else { - if (isRead) { - delete this.updateParams.photo; - } this.tableService.selectById(row.id).then((res: any) => { this.updateParams = Object.assign({ classifyName: this.$store.getters.prevention_dangrous_type_map[res.data.classify], @@ -559,8 +557,8 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent areaName: (this.areaList.find((item: any) => item.value === res.data.areaId) as any).name, type: "随手拍", }, res.data) - this.updateParams.majorHazard = parseInt(this.updateParams.majorHazard) - this.updateParams.majorHazardName = !this.updateParams.majorHazard || this.updateParams.majorHazard === 0 ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] + this.updateParams.majorHazard = +this.updateParams.majorHazard + this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] // 地图定位 this.center = [res.data.locationLng, res.data.locationLat]; @@ -568,6 +566,7 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent // 获取url if (res.data.resourceId) { + this.updateParams.photo = 1; this.tableService.getFileUrls({ ids: res.data.resourceId.split(",") }).then((photos: any) => { this.photoList = photos.data.map(item => { return { @@ -627,7 +626,9 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent type: res.data.type, id: res.data.id }); - this.updateParams.photo = this.photoList.length || null; + this.updateParams.photo = this.photoList.length; + const option = this.updateOptions.find(item => item.key === "photo") as any; + option.showError = false } } public onSuccess2(res, file, fileList) { @@ -668,9 +669,6 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent this.updateParams.resourceName = this.photoList.map(item => item.name).join(",") this.updateParams.resourceOtherId = this.fileList.map(item => item.id).join(",") this.updateParams.resourceOtherName = this.fileList.map(item => item.name).join(",") - if (this.updateParams.majorHazard && this.updateParams.majorHazard !== 0) { - this.updateParams.majorHazard = this.updateParams.majorHazard.toString() - } this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then(res => { this.$message.success(!this.updateParams.id ? "新增成功！" : "编辑成功"); diff --git a/src/views/hiddenDanger/files.component.vue b/src/views/hiddenDanger/files.component.vue index bd9ec65..ebe7999 100644 --- a/src/views/hiddenDanger/files.component.vue +++ b/src/views/hiddenDanger/files.component.vue @@ -693,8 +693,7 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent professionClassifyName: this.$store.getters.prevention_major_type_map[row.professionClassify], reformModeName: this.reformModeMap[row.reformMode], }, row); - this.updateParams.majorHazard = parseInt(this.updateParams.majorHazard) - this.updateParams.majorHazardName = !this.updateParams.majorHazard || this.updateParams.majorHazard === 0 ? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] + this.updateParams.majorHazardName = !this.updateParams.majorHazard? '不涉及' : this.$store.getters.prevention_risk_source_map[this.updateParams.majorHazard] this.getTableCallback() // 获取url diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue index 9f99c45..1034559 100644 --- a/src/views/hiddenDanger/manager.component.vue +++ b/src/views/hiddenDanger/manager.component.vue @@ -891,7 +891,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent { this.updateParams.number = res.data @@ -914,8 +914,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent item.name).join(",") this.updateParams.verifyResourceId = this.photoList2.map(item => item.id).join(",") this.updateParams.verifyResourceName = this.photoList2.map(item => item.name).join(",") - if (this.updateParams.majorHazard && this.updateParams.majorHazard !== 0) { - this.updateParams.majorHazard = this.updateParams.majorHazard.toString() - } this.tableService.addOrUpdate(this.updateParams, !this.updateParams.id).then(res => { this.$message.success(!this.updateParams.id ? "新增成功" : "编辑成功"); if (!preStatus) { @@ -1114,7 +1110,9 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent item.key === "photo") as any; + option.showError = false } } public onSuccess2(res, file, fileList) { diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue index e225185..8315962 100644 --- a/src/views/hiddenDanger/safe/action.component.vue +++ b/src/views/hiddenDanger/safe/action.component.vue @@ -1,7 +1,7 @@