From ca151ff4c1cdc4a029f13ac6da7d42e4f8147287 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期六, 06 八月 2022 16:18:50 +0800
Subject: [PATCH] 重构双重预防

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

diff --git a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
index 60e93a7..ef8af35 100644
--- a/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
+++ b/src/views/doublePreventAction/hiddenDanger/inspectionTask/index.vue
@@ -2,67 +2,20 @@
     <div class="app-container">
         <div class="filter-container">
             <div class="basic_search">
-                <span>巡检开始时间:</span>
-                <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检开始时间"></el-date-picker>
-            </div>
-            <div class="basic_search">
-                <span>巡检结束时间:</span>
-                <el-date-picker v-model="listQuery.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="巡检结束时间"></el-date-picker>
-            </div>
-            <div class="basic_search">
-                <span>巡检任务类型:</span>
-                <el-select v-model="listQuery.type">
-                   <el-option
-                        v-for="item in typeList"
-                        :key="item.id"
-                        :value="item.id"
-                        :label="item.name"
-                    ></el-option>
+                <span>排查作业类型:</span>
+                <el-select class="analyseUnit_box" v-model="listQuery.checkWorkType" placeholder="排查作业类型" filterable clearable>
+                    <el-option v-for="item in checkWorkTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </div>
             <div class="basic_search">
-                <span>巡检任务状态:</span>
-                <el-select v-model="listQuery.status" clearable>
-                    <el-option
-                        v-for="item in statusList"
-                        :key="item.id"
-                        :value="item.id"
-                        :label="item.name"
-                    ></el-option>
+                <span>排查作业状态:</span>
+                <el-select class="analyseUnit_box" v-model="listQuery.checkWorkStatus" placeholder="排查作业状态" filterable clearable>
+                    <el-option v-for="item in checkWorkStatusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
             </div>
             <div class="basic_search">
-                <span>巡检任务创建人员:</span>
-                <el-select v-model="listQuery.createUid" 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>
-                    <el-option
-                        v-for="item in userList"
-                        :key="item.id"
-                        :value="item.id"
-                        :label="item.realname"
-                    ></el-option>
-                </el-select>
+                <span>排查作业名称:</span>
+                <el-input class="analyseUnit_box" v-model="listQuery.checkWorkName" placeholder="排查作业名称" clearable> </el-input>
             </div>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
             <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button>
@@ -78,54 +31,61 @@
                 highlight-current-row
                 style="width: 100%;"
             >
-                <el-table-column label="任务名称" prop="title" align="center">
-                </el-table-column>
-                <el-table-column label="检查类型" prop="type" align="center">
+                <el-table-column type="index" label="序号" width="60" />
+                <el-table-column prop="checkWorkName" label="排查名称" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="checkWorkType" label="排查类型" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <div v-for="item in typeList">
-                            <div v-show="item.id === scope.row.type">
-                                {{ item.name }}
-                            </div>
-                        </div>
+                        {{ parseNumber(scope.row.checkWorkType, '排查类型') }}
                     </template>
                 </el-table-column>
-                <el-table-column label="检查频次(小时)" prop="intervalSeconds" align="center">
+                <el-table-column prop="taskUnitName" label="任务单元" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="execDep" label="执行部门" show-overflow-tooltip>
+                </el-table-column>
+                <el-table-column prop="checkCycle" label="排查周期" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        {{ scope.row.intervalSeconds | parseHours}}
+                        <span>
+                            {{ scope.row.checkCycle }}
+                        </span>
+                        <span>
+                            {{ parseNumber(scope.row.checkCycleUnit, '排查周期') }}
+                        </span>
                     </template>
                 </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="execUname" align="center">
-                </el-table-column>
-                <el-table-column label="创建人" prop="createUname" align="center">
-                </el-table-column>
-                <el-table-column label="创建时间" prop="createTime" align="center">
-                </el-table-column>
-                <el-table-column label="状态" prop="createTime" align="center">
+                <el-table-column prop="validTime" label="有效时间" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <div v-for="item in statusList">
-                            <div v-show="scope.row.status === item.id">
-                                <el-tag :type="scope.row.status === 1 ? 'primary' : (scope.row.status === 2 ? 'warning' : (scope.row.status === 3 ? 'danger' : 'info'))">{{item.name}}</el-tag>
-                            </div>
-                        </div>
+                        <span>
+                            {{ scope.row.validTime }}
+                        </span>
+                        <span>
+                            {{ parseNumber(scope.row.validTimeUnit, '排查周期') }}
+                        </span>
                     </template>
                 </el-table-column>
+                <el-table-column prop="validTime" label="提醒时间" show-overflow-tooltip>
+                    <template slot-scope="scope">
+                        <span>
+                            {{ scope.row.noticeTime }}
+                        </span>
+                        <span>
+                            {{ parseNumber(scope.row.noticeTimeUnit, '排查周期') }}
+                        </span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="createByUserName" label="创建人" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
                     <template slot-scope="scope">
                         <el-button type="text" @click="showAnalyseUnitForm(scope.row,'编辑')">编辑</el-button>
                         <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button>
-                        <el-button type="text" @click="openTask(scope.row,'编辑')">开启</el-button>
-                        <el-button type="text" style="color: red" @click="closeTask(scope.row)">关闭</el-button>
                     </template>
                 </el-table-column>
             </el-table>
             <br>
             <el-pagination
                 v-show="recordTotal>0"
-                :current-page="listQuery.page"
+                :current-page="listQuery.pageIndex"
                 :page-sizes="[10, 20, 30, 50]"
                 :page-size="listQuery.pageSize"
                 :total="recordTotal"
@@ -145,123 +105,76 @@
 
             <div class="inspectionTask_form">
                 <el-form ref="inspectionTaskForm" :rules="inspectionTaskFormRules" :model="inspectionTaskForm" label-position="right" label-width="120px">
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="任务名称" prop="title">
-                                <el-input v-model="inspectionTaskForm.title" class="analyseUnit_input">
-                                </el-input>
+                    <el-row :gutter="35">
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="排查类型" prop="checkWorkType">
+                                <el-select class="analyseUnit_input" v-model="inspectionTaskForm.checkWorkType" placeholder="请输入排查类型" clearable> <el-option v-for="item in checkWorkTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option></el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="巡检任务类型" prop="type">
-                                <el-select v-model="inspectionTaskForm.type" class="analyseUnit_input" :disabled="ifShow">
-                                    <el-option
-                                        v-for="item in typeList"
-                                        :key="item.id"
-                                        :value="item.id"
-                                        :label="item.name"
-                                    ></el-option>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="排查名称" prop="checkWorkName">
+                                <el-input class="analyseUnit_input" v-model.trim="inspectionTaskForm.checkWorkName" placeholder="请输入排查名称" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="排查周期" prop="checkCycle">
+                                <el-input class="analyseUnit_input" type="number" v-model.trim="inspectionTaskForm.checkCycle" placeholder="请输入排查周期" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="时间单位" prop="checkCycleUnit">
+                                <el-select class="analyseUnit_input" v-model="inspectionTaskForm.checkCycleUnit" placeholder="请输入时间单位" clearable>
+                                    <el-option v-for="item in timeType" :key="item.id" :label="item.name" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="周期开始时间" prop="startTime">
-                                <el-date-picker v-model="inspectionTaskForm.startTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="周期开始时间" class="analyseUnit_input"></el-date-picker>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="有效时间" prop="validTime">
+                                <el-input class="analyseUnit_input" type="number" v-model.trim="inspectionTaskForm.validTime" placeholder="请输入有效时间" clearable></el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="检查频次" prop="intervalSeconds">
-                                <el-select v-model="inspectionTaskForm.intervalSeconds" class="analyseUnit_input">
-                                    <el-option
-                                    v-for="item in intervalSecondsList"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    >
-                                    </el-option>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="时间单位" prop="validTimeUnit">
+                                <el-select class="analyseUnit_input" v-model="inspectionTaskForm.validTimeUnit" placeholder="请输入时间单位" clearable>
+                                    <el-option v-for="item in timeType" :key="item.id" :label="item.name" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="12">
-                            <el-form-item label="提前通知时间" prop="noticeSeconds">
-                                <el-select v-model="inspectionTaskForm.noticeSeconds" class="analyseUnit_input">
-                                    <el-option
-                                        v-for="item in noticeSecondsList"
-                                        :key="item.id"
-                                        :label="item.name"
-                                        :value="item.id"
-                                    >
-                                    </el-option>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="提醒时间" prop="noticeTime">
+                                <el-input class="analyseUnit_input" type="number" v-model.trim="inspectionTaskForm.noticeTime" placeholder="请输入提醒时间" clearable></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="时间单位" prop="noticeTimeUnit">
+                                <el-select class="analyseUnit_input" v-model="inspectionTaskForm.noticeTimeUnit" placeholder="请输入时间单位" clearable>
+                                    <el-option v-for="item in timeType" :key="item.id" :label="item.name" :value="item.id"></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="任务有效时间" prop="effectSeconds">
-                                <el-select v-model="inspectionTaskForm.effectSeconds" class="analyseUnit_input">
-                                    <el-option
-                                        v-for="item in effectSecondsList"
-                                        :key="item.id"
-                                        :label="item.name"
-                                        :value="item.id"
-                                    >
-                                    </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">
-                                <el-select v-model="execDepartment" filterable clearable class="analyseUnit_input" @change="changeExec">
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="执行部门" prop="execDepId">
+                                <el-select class="analyseUnit_input" v-model="inspectionTaskForm.execDepId"  clearable filterable   >
                                     <el-option
                                         v-for="item in departmentList"
                                         :key="item.id"
-                                        :value="item.department"
                                         :label="item.department"
+                                        :value="item.id"
                                     ></el-option>
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="执行巡检人员" prop="execUid">
-                                <el-select v-model="inspectionTaskForm.execUid" filterable clearable class="analyseUnit_input">
-                                    <el-option
-                                        v-for="item in execUidList"
-                                        :key="item.id"
-                                        :value="item.id"
-                                        :label="item.realname"
-                                    ></el-option>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="任务单元" prop="taskUnitId">
+                                <el-select class="analyseUnit_input" v-model="inspectionTaskForm.taskUnitId" placeholder="请输入任务单元" clearable filterable>
+                                    <el-option v-for="item in taskUnitList" :key="item.taskUnitName" :label="item.taskUnitName" :value="item.id"></el-option>
                                 </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" class="mb20">
+                            <el-form-item label="首次任务开始时间" prop="firstStartTime">
+                                <el-date-picker class="analyseUnit_input" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" v-model="inspectionTaskForm.firstStartTime" placeholder="请选择首次任务开始时间" clearable></el-date-picker>
                             </el-form-item>
                         </el-col>
                     </el-row>
@@ -269,15 +182,7 @@
             </div>
 
 
-            <el-divider></el-divider>
 
-            <div class="inspectionTask_point">
-                <el-tabs class="active" v-model="activeName">
-                    <el-tab-pane label="检查项信息" name="inspectionPoint">
-                        <inspection-point @giveToForm="receiveToForm" ref="inspectionPoint" :title="title" :inspectionTaskForm="inspectionTaskForm"></inspection-point>
-                    </el-tab-pane>
-                </el-tabs>
-            </div>
 
             <div  align="right">
                 <el-button @click="inspectionTaskVisible = false">取消</el-button>
@@ -300,6 +205,7 @@
     } from "../../../../api/inspectionTask";
     import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
     import {safetyInspectionItemName} from "../../../../api/safetySelfInspection";
+    import {getAllCheckUnitList} from "../../../../api/checkUnit";
     export default {
         name: 'index',
         filters: {
@@ -359,53 +265,70 @@
                 execDepartment:'',
                 inspectionTaskVisible:false,
                 inspectionTaskFormRules:{
-                    title: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
-                    type: [{ required: true, message: '检查类型不能为空', trigger: 'change' }],
-                    intervalSeconds: [{ required: true, message: '检查频次不能为空', trigger: 'change' }],
-                    noticeSeconds: [{ required: true, message: '提前通知时间不能为空', trigger: 'change' }],
-                    startTime: [{ required: true, message: '周期开始时间不能为空', trigger: 'change' }],
-                    effectSeconds: [{ required: true, message: '任务有效时间不能为空', trigger: 'change' }],
-                    noticeUid: [{ required: true, message: '异常通知人员不能为空', trigger: 'change' }],
-                    execUid: [{ required: true, message: '执行巡检人员不能为空', trigger: 'change' }],
+                    checkWorkType: [{ required: true, message: '请填写排查作业类型', trigger: 'change' }],
+                    checkWorkName: [{ required: true, message: '请选择排查作业名称', trigger: 'blur' }],
+                    taskUnitId: [{ required: true, message: '请选择任务单元', trigger: 'change' }],
+                    execUserId: [{ required: true, message: '请选择执行人', trigger: 'change' }],
+                    checkCycle: [{ required: true, message: '请填写排查周期', trigger: 'blur' }],
+                    checkCycleUnit: [{ required: true, message: '请选择时间单位', trigger: 'change' }],
+                    validTime: [{ required: true, message: '请填写有效时间', trigger: 'blur' }],
+                    validTimeUnit: [{ required: true, message: '请选择时间单位', trigger: 'change' }],
+                    noticeTime: [{ required: true, message: '请填写提醒时间', trigger: 'blur' }],
+                    noticeTimeUnit: [{ required: true, message: '请选择时间单位', trigger: 'change' }],
+                    firstStartTime: [{ required: true, message: '请填写首次排查任务开始时间', trigger: 'blur' }],
+                    depId: [{ required: true, message: '请选择部门', trigger: 'change' }]
                 },
                 inspectionTaskForm:{
-                    type:null,
-                    createUid: null,
-                    effectSeconds: null,
-                    execUid: null,
-                    intervalSeconds: null,
-                    noticeSeconds: null,
-                    // noticeUid: null,
-                    title:'',
-                    riskControlMeasureIdList: [
-                    ],
-                    startTime: "",
+                    checkWorkType: null,
+                    checkWorkName: null,
+                    taskUnitId: null,
+                    execDepId: null,
+                    checkCycle: null,
+                    checkCycleUnit: null,
+                    validTime: null,
+                    validTimeUnit: null,
+                    noticeTime: null,
+                    noticeTimeUnit: null,
+                    firstStartTime: null
                 },
                 listQuery:{
-                    createUid: "",
-                    endTime: "",
-                    execUid: "",
-                    startTime: "",
-                    status:"",
-                    type: "",
-                    page: 1,
+                    checkWorkType: null,
+                    checkWorkStatus: null,
+                    checkWorkName: null,
+                    pageIndex: 1,
                     pageSize: 10,
 
                 },
+                checkWorkTypeList: [
+                    { id: 1, name: '日常作业' },
+                    { id: 2, name: '周期作业' }
+                ],
+                checkWorkStatusList: [
+                    { id: 1, name: '开启' },
+                    { id: 2, name: '关闭' }
+                ],
+                timeType: [
+                    { id: 2, name: '小时' },
+                    { id: 3, name: '日' },
+                    { id: 4, name: '月' },
+                    { id: 5, name: '年' }
+                ],
+                taskUnitList:[],
             }
         },
         created() {
             this.getInspectionTaskData()
             this.getDepartment()
             this.getUser()
+            this.getCheckUnitData()
         },
         methods: {
             async getInspectionTaskData(){
                 this.listLoading = true
                 let res = await getInspectionTask(this.listQuery)
                 if(res.data.code === '200'){
-                    this.recordTotal = JSON.parse(res.data.message).total
-                    this.inspectionTaskData = res.data.result
+                    this.recordTotal = res.data.count
+                    this.inspectionTaskData = res.data.data
                 }else if(res.data.code === '300'){
                     this.inspectionTaskData = []
                 }
@@ -417,6 +340,19 @@
                 }
                 this.listLoading = false
             },
+
+            async getCheckUnitData(){
+                let res = await getAllCheckUnitList();
+                if (res.data.code === '200') {
+                    this.taskUnitList = JSON.parse(JSON.stringify(res.data.data));
+                } else {
+                    this.$message({
+                        type: 'warning',
+                        message: res.data.msg
+                    });
+                }
+            },
+
             async getDepartment(){
                 let res = await getDepartmentList({pageSize:1000,pageIndex:1})
                 if(res.data.code === '200'){
@@ -453,6 +389,15 @@
                     })
                 }
             },
+
+            parseNumber(value, type) {
+                if (type === '排查类型') {
+                    return this.checkWorkTypeList.find((item) => item.id === value).name;
+                } else if (type === '排查周期') {
+                    return this.timeType.find((item) => item.id == value).name;
+                }
+            },
+
             showAnalyseUnitForm(value,type){
                 this.inspectionTaskVisible = true
                 this.$nextTick(() =>{
@@ -461,39 +406,28 @@
                 if(type === '新增'){
                     this.ifShow = false
                     this.title = '新建巡检计划设定'
-                    // this.noticeDepartment = ''
-                    this.execDepartment = ''
                     this.inspectionTaskForm = {
-                        type:null,
-                        createUid: parseInt(Cookies.get('userId')),
-                        effectSeconds: null,
-                        execUid: null,
-                        intervalSeconds: null,
-                        noticeSeconds: null,
-                        // noticeUid: null,
-                        title:'',
-                        riskControlMeasureIdList: [
-                        ],
-                        startTime: "",
+                        checkWorkType: null,
+                        checkWorkName: null,
+                        taskUnitId: null,
+                        execDepId: null,
+                        checkCycle: null,
+                        checkCycleUnit: null,
+                        validTime: null,
+                        validTimeUnit: null,
+                        noticeTime: null,
+                        noticeTimeUnit: null,
+                        firstStartTime: null
                     }
-                    setTimeout(() => {
-                        this.$refs.inspectionPoint.inspectionPointData = []
-                        this.$refs.inspectionPoint.ifEdit = false
-                    });
                 }else{
                     this.ifShow = true
                     this.title = '编辑巡检计划设定'
                     // 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.execUid
-                    // this.inspectionTaskForm.noticeUid = value.noticeUname
-                     setTimeout(() => {
-                        this.$refs.inspectionPoint.inspectionPointData =  this.inspectionTaskForm.checkContents
-                        this.$refs.inspectionPoint.ifEdit = true
-                    });
+                    for( let key in this.inspectionTaskForm){
+                        this.inspectionTaskForm[key] = JSON.parse(JSON.stringify(value))[key]
+                    }
+                    this.inspectionTaskForm.id = JSON.parse(JSON.stringify(value)).id
                 }
             },
             handleDepartment(value){
@@ -509,22 +443,6 @@
             submitAnalyseUnit(){
                 this.$refs["inspectionTaskForm"].validate((valid) =>{
                     if(valid){
-                        if(this.inspectionTaskForm.noticeSeconds >= this.inspectionTaskForm.intervalSeconds){
-                            this.$message({
-                                type:'warning',
-                                 message:'提前通知时间不能大于检查频次'
-                            })
-                        }else if(this.inspectionTaskForm.intervalSeconds <= this.inspectionTaskForm.effectSeconds){
-                                this.$message({
-                                type:'warning',
-                                 message:'任务持续时间不能大于检查频次'
-                            })
-                        }else if(this.justifyTime(this.inspectionTaskForm.startTime,this.inspectionTaskForm.noticeSeconds)){
-                                this.$message({
-                                type:'warning',
-                                message:'周期开始时间减去当前时间和提前通知时间要大于等于半小时'
-                            })
-                        }else{
                             if(this.title === '新建巡检计划设定'){
                                 addInspectionTask(this.inspectionTaskForm).then((res)=>{
                                     if(res.data.code === '200'){
@@ -544,17 +462,7 @@
                                     }
                                 })
                             }else{
-                                updateInspectionTask({
-                                    effectSeconds: this.inspectionTaskForm.effectSeconds,
-                                    execUid: this.inspectionTaskForm.execUid,
-                                    intervalSeconds: this.inspectionTaskForm.intervalSeconds,
-                                    noticeSeconds: this.inspectionTaskForm.noticeSeconds,
-                                    // noticeUid: this.inspectionTaskForm.noticeUid,
-                                    startTime: this.inspectionTaskForm.startTime,
-                                    status: this.inspectionTaskForm.status,
-                                    workId: this.inspectionTaskForm.workId,
-                                    title: this.inspectionTaskForm.title
-                                    }).then((res)=>{
+                                updateInspectionTask(this.inspectionTaskForm).then((res)=>{
                                     if(res.data.code === '200'){
                                         this.inspectionTaskVisible = false
                                         this.getInspectionTaskData()
@@ -572,7 +480,6 @@
                                     }
                                 })
                             }
-                        }
 
                     }else{
                         this.$message({
@@ -640,19 +547,12 @@
             },
 
             deleteById(val){
-                if(val.status !== 2){
-                    this.$message({
-                        type:'warning',
-                        message:'当前状态不可删除'
-                    })
-                    return
-                }
                 this.$confirm('删除此条信息,是否继续','提示',{
                     confirmButtonText:'确定',
                     cancelButtonText:'取消',
                     type:'warning',
                 }).then(()=> {
-                    deleteInspectionTask(val.workId).then( (res)=>{
+                    deleteInspectionTask({ id: val.id }).then( (res)=>{
                         if(res.data.code === '200'){
                             this.getInspectionTaskData()
                             this.$notify({
@@ -685,21 +585,24 @@
                 this.getInspectionTaskData()
             },
             handleCurrentChange(val){
-                this.listQuery.page = val
+                this.listQuery.pageIndex = val
                 this.getInspectionTaskData()
             },
         }
     }
 </script>
 <style scoped>
-    .basic_search{
-        display:inline-block;
-        padding-bottom: 10px;
-        padding-left: 10px;
-    }
-    .analyseUnit_input{
-        width:320px;
-    }
+.basic_search{
+    display:inline-block;
+    padding-bottom: 10px;
+    padding-left: 10px;
+}
+.analyseUnit_input{
+    width:90%;
+}
+.analyseUnit_box{
+    width:200px;
+}
     /deep/.el-divider--horizontal {
      margin-top: 0px !important;
     }

--
Gitblit v1.9.2