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

lyfO_o

2022-05-23 08bf6da5e3164a1b3ee5c79bb5d666e6385b4653

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

@@ -445,7 +445,7 @@
                if(type === '新增'){
                    this.ifShow = false
                    this.title = '新建巡检计划设定'
                    this.noticeDepartment = ''
                    // this.noticeDepartment = ''
                    this.execDepartment = ''
                    this.inspectionTaskForm = {
                        type:null,
@@ -454,7 +454,7 @@
                        execUid: null,
                        intervalSeconds: null,
                        noticeSeconds: null,
                        noticeUid: null,
                        // noticeUid: null,
                        title:'',
                        riskControlMeasureIdList: [
                        ],
@@ -467,6 +467,7 @@
                }else{
                    this.ifShow = true
                    this.title = '编辑巡检计划设定'
                    debugger
                    // this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
                    // this.changeNotice()
                    this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
@@ -481,6 +482,7 @@
                }
            },
            handleDepartment(value){
                debugger
                let department = ''
                for(let i in this.userList){
                    if(this.userList[i].id === value){
@@ -595,11 +597,11 @@
                })
            },
            receiveToForm(value) {
                // this.inspectionTaskForm.riskControlMeasureIdList = []
                // this.inspectionTaskForm.riskControlMeasureIdList = value.map( item => {
                //     return item.id
                // })
                this.inspectionTaskForm.riskControlMeasureIdList.push({id:value.id})
                this.inspectionTaskForm.riskControlMeasureIdList = []
                this.inspectionTaskForm.riskControlMeasureIdList = value.map( item => {
                    return item.id
                })
                // this.inspectionTaskForm.riskControlMeasureIdList.push({id:value.id})
            },
            refreshHandle(){
                this.getInspectionTaskData()