From 68418bbc13c3dc440899dd8b963e2ca8f1f92ba8 Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期三, 18 五月 2022 17:35:19 +0800 Subject: [PATCH] '修改問題' --- src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue | 41 +++++++++++++++++++++++------------------ 1 files changed, 23 insertions(+), 18 deletions(-) diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue index 4b84299..0c849ee 100644 --- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue +++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue @@ -26,7 +26,7 @@ </el-table> </div> <el-dialog :visible.sync="controlActionVisible" append-to-body :close-on-click-modal="false" width="80%"> - <control-action ref="controlAction" @closeDialog="closeDialog" @giveRiskControlId="receiveRiskControlId"></control-action> + <control-action ref="controlAction" @closeDialog="closeDialog" @giveRiskControlId="receiveRiskControlId" @keepValue="keepValue"></control-action> </el-dialog> </div> </template> @@ -47,6 +47,7 @@ riskControlMeasureVisible:false, riskControlMeasureForm:[], inspectionPointData:[], + keepValueList:[], controlActionForm:{ workId:'', measureId:'', @@ -60,36 +61,36 @@ showControlAction (){ this.controlActionVisible = true setTimeout( () => { - this.$refs.controlAction.ifShowButton() + this.$refs.controlAction.ifShowButton(this.inspectionPointData) }) }, showMeasureDetail(val){ this.controlActionVisible = true setTimeout( () => { - this.$refs.controlAction.showMeasureDetail(val) - this.$refs.controlAction.ifShowSelf = false + this.$refs.controlAction.showMeasureDetail(val) + this.$refs.controlAction.ifShowSelf = false }) - + }, closeDialog(){ this.controlActionVisible = false }, async receiveRiskControlId(value) { - debugger this.controlActionVisible = false if(this.title === '新建巡检计划设定'){ if(value){ - // this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => { - // return { - // id:item.id, - // content:item.riskMeasureDesc - // } - // }))) - if(this.inspectionPointData.findIndex(item => item.id === value.id) === -1) { - this.inspectionPointData.push({id:value.id,content:value.troubleshootContent}) - this.$emit('giveToForm',this.inspectionPointData) + this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => { + return { + id:item.id, + content:item.troubleshootContent } - } + }))) + this.$emit('giveToForm',this.inspectionPointData) + // if(this.inspectionPointData.findIndex(item => item.id === value.id) === -1) { + // this.inspectionPointData.push({id:value.id,content:value.troubleshootContent}) + // this.$emit('giveToForm',this.inspectionPointData) + // } + } }else{ this.controlActionForm.workId = JSON.stringify(this.inspectionTaskForm.workId) this.controlActionForm.measureId =JSON.stringify(value.id) @@ -108,7 +109,7 @@ message:res.data.message }) } - } + } }, deleteById(value){ if(this.title === '新建巡检计划设定'){ @@ -129,7 +130,7 @@ duration:2000, }) } - + }) }) } @@ -138,6 +139,10 @@ async getControlActionList(){ let res = await getInspectionControlAction(this.inspectionTaskForm.workId) this.inspectionPointData = res.data.result.checkContents + }, + keepValue(value){ + debugger + this.keepValueList = value } } } -- Gitblit v1.9.2