From c181527b88758cec56479f2076f06c8df9dd45c6 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 30 五月 2022 15:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index f5b4d14..5f04a4f 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/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: [
                         ],
@@ -595,11 +595,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()

--
Gitblit v1.9.2