From 68418bbc13c3dc440899dd8b963e2ca8f1f92ba8 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 18 五月 2022 17:35:19 +0800
Subject: [PATCH] '修改問題'

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

diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index 4928904..f5b4d14 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -42,17 +42,17 @@
                     ></el-option>
                 </el-select>
             </div>
-            <div class="basic_search">
-                <span>异常通知人员:</span>
-                <el-select v-model="listQuery.noticeUid" filterable clearable>
-                   <el-option
-                        v-for="item in userList"
-                        :key="item.id"
-                        :value="item.id"
-                        :label="item.realname"
-                    ></el-option>
-                </el-select>
-            </div>
+<!--            <div class="basic_search">-->
+<!--                <span>异常通知人员:</span>-->
+<!--                <el-select v-model="listQuery.noticeUid" filterable clearable>-->
+<!--                   <el-option-->
+<!--                        v-for="item in userList"-->
+<!--                        :key="item.id"-->
+<!--                        :value="item.id"-->
+<!--                        :label="item.realname"-->
+<!--                    ></el-option>-->
+<!--                </el-select>-->
+<!--            </div>-->
             <div class="basic_search">
                 <span>执行巡检人员:</span>
                 <el-select v-model="listQuery.execUid" filterable clearable>
@@ -96,8 +96,8 @@
                 </el-table-column>
                 <el-table-column label="任务开始时间" prop="startTime" align="center">
                 </el-table-column>
-                <el-table-column label="异常通知人" prop="noticeUname" align="center">
-                </el-table-column>
+<!--                <el-table-column label="异常通知人" prop="noticeUname" align="center">-->
+<!--                </el-table-column>-->
                 <el-table-column label="巡检人" prop="execUname" align="center">
                 </el-table-column>
                 <el-table-column label="创建人" prop="createUname" align="center">
@@ -202,32 +202,32 @@
                             </el-form-item>
                         </el-col>
                     </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="异常通知部门" prop="noticeDepartment">
-                                <el-select v-model="noticeDepartment" class="analyseUnit_input" filterable clearable @change="changeNotice">
-                                    <el-option
-                                        v-for="item in departmentList"
-                                        :key="item.id"
-                                        :value="item.department"
-                                        :label="item.department"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                        <el-form-item label="异常通知人员" prop="noticeUid">
-                            <el-select v-model="inspectionTaskForm.noticeUid" filterable clearable class="analyseUnit_input">
-                                <el-option
-                                    v-for="item in noticeUidList"
-                                    :key="item.id"
-                                    :value="item.id"
-                                    :label="item.realname"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    </el-row>
+<!--                    <el-row>-->
+<!--                        <el-col :span="12">-->
+<!--                            <el-form-item label="异常通知部门" prop="noticeDepartment">-->
+<!--                                <el-select v-model="noticeDepartment" class="analyseUnit_input" filterable clearable @change="changeNotice">-->
+<!--                                    <el-option-->
+<!--                                        v-for="item in departmentList"-->
+<!--                                        :key="item.id"-->
+<!--                                        :value="item.department"-->
+<!--                                        :label="item.department"-->
+<!--                                    ></el-option>-->
+<!--                                </el-select>-->
+<!--                            </el-form-item>-->
+<!--                        </el-col>-->
+<!--                        <el-col :span="12">-->
+<!--                        <el-form-item label="异常通知人员" prop="noticeUid">-->
+<!--                            <el-select v-model="inspectionTaskForm.noticeUid" filterable clearable class="analyseUnit_input">-->
+<!--                                <el-option-->
+<!--                                    v-for="item in noticeUidList"-->
+<!--                                    :key="item.id"-->
+<!--                                    :value="item.id"-->
+<!--                                    :label="item.realname"-->
+<!--                                ></el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
+<!--                    </el-col>-->
+<!--                    </el-row>-->
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="执行巡检部门" prop="execDepartment">
@@ -324,10 +324,10 @@
                 inspectionTaskData: [],
                 departmentList:[],
                 userList:[],
-                noticeUidList:[],
+                // noticeUidList:[],
                 execUidList:[],
                 statusList:[{name:'任务开启',id:1},{id:2,name:'任务关闭'}],
-                intervalSecondsList:[{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'},{id:17280,name:'2天'}],
+                intervalSecondsList:[{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:28800,name:'8小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'},{id:17280,name:'2天'},{id:604800,name:'每周'},{id:2592000,name:'每月'},{id:7862400,name:'每季度'}],
                 noticeSecondsList:[{id:600,name:'10分'},{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'}],
                 effectSecondsList:[{id:1800,name:'30分'},{id:3600,name:'1小时'},{id:7200,name:'2小时'},{id:21600,name:'6小时'},{id:43200,name:'12小时'},{id:86400,name:'1天'}],
                 typeList:[{id:1,name:'日常检查'},{id:2,name:'周期检查'}],
@@ -339,7 +339,7 @@
                 title:'',
                 company:'',
                 code:'',
-                noticeDepartment:'',
+                // noticeDepartment:'',
                 execDepartment:'',
                 inspectionTaskVisible:false,
                 inspectionTaskFormRules:{
@@ -359,7 +359,7 @@
                     execUid: null,
                     intervalSeconds: null,
                     noticeSeconds: null,
-                    noticeUid: null,
+                    // noticeUid: null,
                     title:'',
                     riskControlMeasureIdList: [
                     ],
@@ -369,7 +369,6 @@
                     createUid: "",
                     endTime: "",
                     execUid: "",
-                    noticeUid: "",
                     startTime: "",
                     status:"",
                     type: "",
@@ -413,13 +412,13 @@
                     })
                 }
             },
-            changeNotice(){
-                if(this.noticeDepartment === '') {
-                    this.noticeUidList = []
-                    this.inspectionTaskForm.noticeUid = ''
-                }
-                this.noticeUidList = this.userList.filter( item => item.department === this.noticeDepartment)
-            },
+            // changeNotice(){
+            //     if(this.noticeDepartment === '') {
+            //         this.noticeUidList = []
+            //         this.inspectionTaskForm.noticeUid = ''
+            //     }
+            //     this.noticeUidList = this.userList.filter( item => item.department === this.noticeDepartment)
+            // },
             changeExec(){
                 if(this.execDepartment === '') {
                     this.execUidList = []
@@ -468,12 +467,12 @@
                 }else{
                     this.ifShow = true
                     this.title = '编辑巡检计划设定'
-                    this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
-                    this.changeNotice()
+                    // this.noticeDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).noticeUid)
+                    // this.changeNotice()
                     this.execDepartment = this.handleDepartment(JSON.parse(JSON.stringify(value)).execUid)
                     this.changeExec()
                     this.inspectionTaskForm = JSON.parse(JSON.stringify(value))
-                    // this.inspectionTaskForm.execUid = value.execUname
+                    this.inspectionTaskForm.execUid = value.execUname
                     // this.inspectionTaskForm.noticeUid = value.noticeUname
                      setTimeout(() => {
                         this.$refs.inspectionPoint.inspectionPointData =  this.inspectionTaskForm.checkContents
@@ -534,7 +533,7 @@
                                     execUid: this.inspectionTaskForm.execUid,
                                     intervalSeconds: this.inspectionTaskForm.intervalSeconds,
                                     noticeSeconds: this.inspectionTaskForm.noticeSeconds,
-                                    noticeUid: this.inspectionTaskForm.noticeUid,
+                                    // noticeUid: this.inspectionTaskForm.noticeUid,
                                     startTime: this.inspectionTaskForm.startTime,
                                     status: this.inspectionTaskForm.status,
                                     workId: this.inspectionTaskForm.workId

--
Gitblit v1.9.2