From f86e7a28563a8fa129a67cf3e0e6efa534fc3be7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Tue, 31 May 2022 15:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/components/inpectionPoint.vue
index 5846821..67bd0c0 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,16 +61,16 @@
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
@@ -78,15 +79,18 @@
this.controlActionVisible = false
if(this.title === '新建巡检计划设定'){
if(value){
- // this.inspectionPointData = JSON.parse(JSON.stringify(value.map( item => {
- // return {
- // id:item.id,
- // content:item.riskMeasureDesc
- // }
- // })))
- this.inspectionPointData.push({id:value.id,content:value.riskMeasureDesc})
+ 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)
@@ -105,11 +109,10 @@
message:res.data.message
})
}
- }
+ }
},
deleteById(value){
if(this.title === '新建巡检计划设定'){
- debugger
this.inspectionPointData.splice(value,1)
}else{
this.$confirm('删除此条措施，是否继续','提示',{
@@ -127,7 +130,7 @@
duration:2000,
})
}
-
+
})
})
}
@@ -136,6 +139,9 @@
async getControlActionList(){
let res = await getInspectionControlAction(this.inspectionTaskForm.workId)
this.inspectionPointData = res.data.result.checkContents
+ },
+ keepValue(value){
+ this.keepValueList = value
}
}
}
--
Gitblit v1.9.2