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

lyfO_o

2022-05-24 f15b467c2233ba069459c809fffbe994692e3315

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

@@ -467,7 +467,6 @@
                }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)
@@ -482,7 +481,6 @@
                }
            },
            handleDepartment(value){
                debugger
                let department = ''
                for(let i in this.userList){
                    if(this.userList[i].id === value){