Merge remote-tracking branch 'remotes/origin/lyf' into master

lyfO_o

2022-04-20 0b0876c987aee5e7b8c8537c0ea2013a1d1ad8fc

 src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue

@@ -262,7 +262,7 @@

            <div class="inspectionTask_point">
                <el-tabs class="active" v-model="activeName">
                    <el-tab-pane label="巡检点信息" name="inspectionPoint">
                    <el-tab-pane label="检查项信息" name="inspectionPoint">
                        <inspection-point @giveToForm="receiveToForm" ref="inspectionPoint" :title="title" :inspectionTaskForm="inspectionTaskForm"></inspection-point>
                    </el-tab-pane>
                </el-tabs>
@@ -461,6 +461,7 @@
                    }
                    setTimeout(() => {
                        this.$refs.inspectionPoint.inspectionPointData = []
                        this.$refs.inspectionPoint.ifEdit = false
                    });
                }else{
                    this.ifShow = true
@@ -474,6 +475,7 @@
                    // this.inspectionTaskForm.noticeUid = value.noticeUname
                     setTimeout(() => {
                        this.$refs.inspectionPoint.inspectionPointData =  this.inspectionTaskForm.checkContents
                        this.$refs.inspectionPoint.ifEdit = true
                    });  
                }
            },