-修改检测完成数计算

-修改经检测值计算<0时为0
-修改检测、维修任务新增、分配、修改、删除逻辑

master/src/main/java/com/ruoyi/project/base/domain/TBaseDevice.java

@@ -22,6 +22,8 @@ public class TBaseDevice extends BaseEntity {
      * 唯一标识id
      */
     private Long devId;
+
+    @TableField(exist = false)
     private Long[] devIds;
 
     /**

master/src/main/java/com/ruoyi/project/base/domain/TBasePlant.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.base.domain;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -72,6 +74,7 @@ public class TBasePlant extends BaseEntity
     @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date updatedate;
 
+    @TableField(exist = false)
     private Long[] plantIds;
 
     public Long[] getPlantIds() {

master/src/main/java/com/ruoyi/project/base/domain/TBasePoint.java

@@ -22,6 +22,8 @@ public class TBasePoint extends BaseEntity {
      * 唯一标识id
      */
     private Long pointId;
+
+    @TableField(exist = false)
     private Long[] pointIds;
 
     /**

master/src/main/java/com/ruoyi/project/base/domain/TBaseRegion.java

@@ -22,6 +22,8 @@ public class TBaseRegion extends BaseEntity {
      * 唯一标识id
      */
     private Long regionId;
+
+    @TableField(exist = false)
     private Long[] regionIds;
 
     /**

master/src/main/java/com/ruoyi/project/check/controller/TCheckCheckpointsController.java

@@ -134,10 +134,11 @@ public class TCheckCheckpointsController extends BaseController {
         if (i > 0) {
             if (2 == tCheckCheckpoints.getApproveStatus()) {
                 TTaskInspection tTaskInspection = taskInspectionService.selectTTaskInspectionById(tCheckCheckpoints.getInspectionId());
-                tTaskInspection.setTaskDoneNum(new BigDecimal(StringUtils.isNotEmpty(tTaskInspection.getTaskDoneNum()) ? tTaskInspection.getTaskDoneNum() : "0").add(new BigDecimal(tCheckCheckpoints.getCheckIds().length)).toString());
+                List<TCheckCheckpoints> points = tCheckCheckpointsService.selectPointsByIds(tCheckCheckpoints.getCheckIds());
+                tTaskInspection.setTaskDoneNum(new BigDecimal(StringUtils.isNotEmpty(tTaskInspection.getTaskDoneNum()) ? tTaskInspection.getTaskDoneNum() : "0").add(new BigDecimal(points.size())).toString());
                 tTaskInspection.setTaskUndoneNum(new BigDecimal(tTaskInspection.getTaskNum()).subtract(new BigDecimal(tTaskInspection.getTaskDoneNum())).toString());
                 taskInspectionService.updateTTaskInspection(tTaskInspection);
-                for (TCheckCheckpoints point : tCheckCheckpointsService.selectPointsByIds(tCheckCheckpoints.getCheckIds())) {
+                for (TCheckCheckpoints point : points) {
                     if (!point.getLeakageDegree().equals("1")) {
                         TCheckRepairpoints tCheckRepairpoint = new TCheckRepairpoints();
                         tCheckRepairpoint.setPointId(point.getPointId());
@@ -153,7 +154,7 @@ public class TCheckCheckpointsController extends BaseController {
                         tCheckRepairpoint.setInstrumentCode(point.getInstrumentCode());
                         tCheckRepairpoint.setLeakagePosition(point.getLeakagePosition());
                         tCheckRepairpoint.setLeakageDegree(point.getLeakageDegree());
-                        tCheckRepairpoint.setApproveStatus(0L);
+//                        tCheckRepairpoint.setApproveStatus(0L);
                         tCheckRepairpoint.setCreaterCode(getUserId());
                         tCheckRepairpoint.setCreatedate(new Date());
                         tCheckRepairpoint.setUpdaterCode(getUserId());
@@ -264,13 +265,14 @@ public class TCheckCheckpointsController extends BaseController {
                         throw new InterruptedException();//中止线程
                     } else {
                         TCheckEnvironment tCheckEnvironment = null;
-                        String netTest = null;
+                        String netTest;
                         try {
                             tCheckEnvironment = tCheckEnvironments.get(0);
                             BigDecimal back = new BigDecimal(tCheckEnvironment.getBackgroundValue());// 当天的环境本底值
                             BigDecimal test = new BigDecimal(entity.getTestValue());// 当天检测值
                             // 计算净检测值
                             netTest = test.subtract(back).setScale(2, RoundingMode.HALF_UP).toString();
+                            netTest = new BigDecimal(netTest).compareTo(BigDecimal.ZERO) < 0 ? "0" : netTest;
                             entity.setNetTestValue(netTest);
                         } catch (Exception e) {
                             logger.info("计算本底值错误");
@@ -299,7 +301,7 @@ public class TCheckCheckpointsController extends BaseController {
                                 }
                             }
                         }
-                        int upload  = tCheckCheckpointsService.updateTCheckCheckpointsByUpload(entity); //更新检测点数据
+                        int upload = tCheckCheckpointsService.updateTCheckCheckpointsByUpload(entity); //更新检测点数据
                         if (upload == 1) {
                             successNumber.getAndIncrement();
                         } else {

master/src/main/java/com/ruoyi/project/check/controller/TCheckEnvironmentController.java

@@ -6,7 +6,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.check.domain.TCheckCalibration;
 import com.ruoyi.project.check.domain.TCheckEnvironment;
+import com.ruoyi.project.check.service.ITCheckCalibrationService;
 import com.ruoyi.project.check.service.ITCheckEnvironmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -28,6 +30,9 @@ public class TCheckEnvironmentController extends BaseController
     @Autowired
     private ITCheckEnvironmentService tCheckEnvironmentService;
 
+    @Autowired
+    private ITCheckCalibrationService tCheckCalibrationService;
+
     /**
      * 查询环境本底值记录列表
      */
@@ -71,6 +76,9 @@ public class TCheckEnvironmentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TCheckEnvironment tCheckEnvironment)
     {
+        TCheckCalibration calibration = new TCheckCalibration();
+        calibration.setInstrumentId(tCheckEnvironment.getInstrumentId());
+        calibration.setCalibrationTime(tCheckEnvironment.getTestTime());
         tCheckEnvironment.setUpdatedate(new Date());
         tCheckEnvironment.setUpdaterCode(getUserId());
         tCheckEnvironment.setCreaterCode(getUserId());

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionController.java

@@ -100,8 +100,10 @@ public class TTaskInspectionController extends BaseController {
     @Log(title = "检测任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TTaskInspection tTaskInspection) {
-        TTaskInspectionPlan tTaskInspectionPlan = taskInspectionPlanService.selectTTaskInspectionPlanById(tTaskInspection.getPlanId());
-        tTaskInspection.setPlantId(tTaskInspectionPlan.getPlantId());
+        if ("1".equals(tTaskInspection.getTaskType())) {
+            TTaskInspectionPlan tTaskInspectionPlan = taskInspectionPlanService.selectTTaskInspectionPlanById(tTaskInspection.getPlanId());
+            tTaskInspection.setPlantId(tTaskInspectionPlan.getPlantId());
+        }
         tTaskInspection.setCreaterCode(getUserId());
         return toAjax(tTaskInspectionService.insertTTaskInspection(tTaskInspection));
     }
@@ -113,8 +115,10 @@ public class TTaskInspectionController extends BaseController {
     @Log(title = "检测任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TTaskInspection tTaskInspection) {
-        TTaskInspectionPlan tTaskInspectionPlan = taskInspectionPlanService.selectTTaskInspectionPlanById(tTaskInspection.getPlanId());
-        tTaskInspection.setPlantId(tTaskInspectionPlan.getPlantId());
+        if ("1".equals(tTaskInspection.getTaskType())) {
+            TTaskInspectionPlan tTaskInspectionPlan = taskInspectionPlanService.selectTTaskInspectionPlanById(tTaskInspection.getPlanId());
+            tTaskInspection.setPlantId(tTaskInspectionPlan.getPlantId());
+        }
         tTaskInspection.setUpdaterCode(getUserId());
         return toAjax(tTaskInspectionService.updateTTaskInspection(tTaskInspection));
     }
@@ -126,7 +130,16 @@ public class TTaskInspectionController extends BaseController {
     @Log(title = "检测任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(tTaskInspectionService.deleteTTaskInspectionByIds(ids));
+        QueryWrapper<TCheckCheckpoints> wrapper = new QueryWrapper<>();
+        for (Long id : ids) {
+            wrapper.clear();
+            wrapper.eq("inspection_id", id);
+            Integer count = tCheckCheckpointsMapper.selectCount(wrapper);
+            if (count == 0) {
+                tTaskInspectionService.deleteTTaskInspectionByIds(ids);
+            }
+        }
+        return AjaxResult.success();
     }
 
     @PreAuthorize("@ss.hasPermi('task:inspection:edit')")
@@ -138,6 +151,9 @@ public class TTaskInspectionController extends BaseController {
             wrapper.clear();
             wrapper.eq("inspection_id", id);
             Integer count = tCheckCheckpointsMapper.selectCount(wrapper);
+            if (count == 0) {
+                continue;
+            }
             TTaskInspection tTaskInspection = new TTaskInspection();
             tTaskInspection.setId(id);
             tTaskInspection.setTaskNum(count.toString());

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionPlanController.java

@@ -1,10 +1,7 @@
 package com.ruoyi.project.task.controller;
 
 import java.sql.Time;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,7 +17,9 @@ import com.ruoyi.project.base.service.ITBasePlantService;
 import com.ruoyi.project.base.service.ITBasePointService;
 import com.ruoyi.project.base.service.ITBaseRegionService;
 import com.ruoyi.project.check.domain.TCheckCheckpoints;
+import com.ruoyi.project.check.domain.TCheckLawitems;
 import com.ruoyi.project.check.service.ITCheckCheckpointsService;
+import com.ruoyi.project.check.service.ITCheckLawitemsService;
 import com.ruoyi.project.task.mapper.TTaskInspectionPlanMapper;
 import com.ruoyi.system.service.ISysDictTypeService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -76,6 +75,9 @@ public class TTaskInspectionPlanController extends BaseController {
     @Autowired
     private ITCheckCheckpointsService tCheckCheckpointsService;
 
+    @Autowired
+    private ITCheckLawitemsService tCheckLawitemsService;
+
     /**
      * 查询检测计划列表
      */
@@ -132,6 +134,7 @@ public class TTaskInspectionPlanController extends BaseController {
         int nowQuarter = DateUtils.getNowQuarter(); // 获取当前季度
         Calendar calendar = Calendar.getInstance(); // 获取当前时间
         String year = String.valueOf(calendar.get(Calendar.YEAR)); // 获取当前年份
+        List<TCheckLawitems> tCheckLawitems = tCheckLawitemsService.selectTCheckLawitemsByLawStatus();
         for (TBasePlant tBasePlant : tBasePlantService.selectAllPlantName()) {// 查询已审核所有装置
             // 查询今年当前季度是否有监测计划
             QueryWrapper<TTaskInspectionPlan> plansWrapper = new QueryWrapper<TTaskInspectionPlan>().eq("plan_year", year).eq("plan_quarter", nowQuarter).eq("plant_id", tBasePlant.getPlantId()).eq("del_flag", 0);
@@ -155,7 +158,6 @@ public class TTaskInspectionPlanController extends BaseController {
             tTaskInspectionPlan.setInspectionPlanName(tBasePlant.getPlantName() + "_" + year + "第" + nowQuarter + "季度检测计划");
             if (nowQuarter == 1 && nowQuarter == 3) {
                 // 当前季度为1、3季度时，检测频次为一季一次
-                // TODO 当装置中没有动密封点时，跳过此计划
                 tTaskInspectionPlan.setDetectionFrequency("2");
                 // 检测结束时间为开始时间+3个月
                 tTaskInspectionPlan.setEndTime(DateUtils.addTime(new Date(), Calendar.MONTH, 3));
@@ -170,11 +172,22 @@ public class TTaskInspectionPlanController extends BaseController {
             // 统计当前装置下的所有(动)密封点
             QueryWrapper<TBasePoint> points = new QueryWrapper<TBasePoint>().eq("plant_id", tBasePlant.getPlantId()).eq("del_flag", 0).eq("approve_status", 2);
 
-            // TODO: 当1、3季度时需要加上动密封点的判断
+            // 当1、3季度时仅查询动密封点
+            // 匹配法规标准
             if (nowQuarter == 1 && nowQuarter == 3) {
-//                points.in("point_type",);
+                Set<String> pointTypes = new HashSet<>();
+                for (TCheckLawitems lawitem : tCheckLawitems) {
+                    if (lawitem.getPlantType().equals(tBasePlant.getPlantType())&&lawitem.getDetectionFrequency().equals("2")){
+                        pointTypes.add(lawitem.getPointType());
+                    }
+                }
+                points.in("point_type",pointTypes);
             }
             Integer count = tBasePointMapper.selectCount(points);
+            if (count==0){
+                // 当前计划中没有密封点时，跳过此计划
+                continue;
+            }
             tTaskInspectionPlan.setPointNum(count.toString());
             tTaskInspectionPlan.setCreaterCode(getUserId());
             tTaskInspectionPlan.setCreatedate(new Date());
@@ -185,11 +198,11 @@ public class TTaskInspectionPlanController extends BaseController {
             tTaskInspectionPlan.setPlanQuarter(String.valueOf(nowQuarter));
             tTaskInspectionPlans.add(tTaskInspectionPlan);
 
-            // TODO:匹配法规标准
             // 新增检测点
             List<TCheckCheckpoints> tCheckCheckpoints = new ArrayList<>();
             List<TBasePoint> tBasePoints = tBasePointMapper.selectList(points);
             for (TBasePoint tBasePoint : tBasePoints) {
+
                 TCheckCheckpoints tCheckCheckpoint = new TCheckCheckpoints();
                 tCheckCheckpoint.setPointId(tBasePoint.getPointId());
                 tCheckCheckpoint.setPlantName(tBasePlant.getPlantName());
@@ -198,7 +211,7 @@ public class TTaskInspectionPlanController extends BaseController {
 //                tCheckCheckpoint.setRegionName(tBaseRegionService.selectTBaseRegionById(tBasePoint.getRegionId()).getRegionName());
                 tCheckCheckpoint.setRegionId(tBasePoint.getRegionId());
                 tCheckCheckpoint.setLayer(tBasePoint.getLayer());
-//                TBaseDevice tBaseDevice = tBaseDeviceService.selectTBaseDeviceById(tBasePoint.getPointId());
+//                TBaseDevice tBaseDevice = tBaseDeviceService.selectTBaseDeviceById(tBasePoint.getDevId());
 //                tCheckCheckpoint.setDevName(tBaseDevice.getDevDescribe());
 //                tCheckCheckpoint.setDevCode(tBaseDevice.getDevCode());
                 tCheckCheckpoint.setDevId(tBasePoint.getDevId());

master/src/main/java/com/ruoyi/project/task/controller/TTaskRepairController.java

@@ -143,6 +143,9 @@ public class TTaskRepairController extends BaseController
             wrapper.clear();
             wrapper.eq("repair_id", id);
             Integer count = tTaskRepairpointsMapper.selectCount(wrapper);
+            if (count ==0) {
+                continue;
+            }
             TTaskRepair tTaskRepair = new TTaskRepair();
             tTaskRepair.setId(id);
             tTaskRepair.setTaskNum(count.toString());

master/src/main/resources/mybatis/base/TBaseDeviceMapper.xml

@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where plant_id=#{plantId} and region_id=#{regionId} and `dev_code`=#{devCode} and `dev_describe`=#{devDescribe} and del_flag=0
     </select>
 
-    <insert id="insertTBaseDevice" parameterType="TBaseDevice" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTBaseDevice" parameterType="TBaseDevice" useGeneratedKeys="true" keyProperty="devId">
         insert into t_base_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="plantId != null">plant_id,</if>

master/src/main/resources/mybatis/base/TBasePlantMapper.xml

@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where plant_name = #{name} and del_flag=0
     </select>
 
-    <insert id="insertTBasePlant" parameterType="TBasePlant" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTBasePlant" parameterType="TBasePlant" useGeneratedKeys="true" keyProperty="plantId">
         insert into t_base_plant
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="plantCode != null">plant_code,</if>

master/src/main/resources/mybatis/base/TBaseRegionMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where region_name = #{name} and plant_id=#{plantId} and del_flag=0
     </select>
 
-    <insert id="insertTBaseRegion" parameterType="TBaseRegion" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertTBaseRegion" parameterType="TBaseRegion" useGeneratedKeys="true" keyProperty="regionId">
         insert into t_base_region
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="plantId != null">plant_id,</if>

master/src/main/resources/mybatis/check/TCheckCheckpointsMapper.xml

@@ -353,6 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus ==2">
                 and approve_status=1
             </if>
+            and test_value is not null
         </where>
     </update>
 

master/src/main/resources/mybatis/check/TCheckRepairpointsMapper.xml

@@ -311,6 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="approveStatus ==2">
                 and approve_status=1
             </if>
+            and repair_date is not null
         </where>
     </update>
 

ui/src/views/base/device/index.vue

@@ -98,6 +98,7 @@
           plain
           icon="el-icon-position"
           size="mini"
+          :disabled="multiple"
           @click="handleToApprove"
         >送审
         </el-button>
@@ -108,6 +109,7 @@
           plain
           icon="el-icon-s-check"
           size="mini"
+          :disabled="multiple"
           @click="handleApprove"
         >审核
         </el-button>

ui/src/views/base/plant/index.vue

@@ -95,6 +95,7 @@
           plain
           icon="el-icon-position"
           size="mini"
+          :disabled="multiple"
           @click="handleToApprove"
         >送审
         </el-button>
@@ -105,6 +106,7 @@
           plain
           icon="el-icon-s-check"
           size="mini"
+          :disabled="multiple"
           @click="handleApprove"
         >审核
         </el-button>

ui/src/views/base/point/index.vue

@@ -163,6 +163,7 @@
           plain
           icon="el-icon-position"
           size="mini"
+          :disabled="multiple"
           @click="handleToApprove"
         >送审
         </el-button>
@@ -173,6 +174,7 @@
           plain
           icon="el-icon-s-check"
           size="mini"
+          :disabled="multiple"
           @click="handleApprove"
         >审核
         </el-button>
@@ -778,7 +780,7 @@ export default {
         return "color:#ff0000;";
       }
       if (columnIndex === 3 && row.leakageDegree == 1) {
-        return "color:#13C2C2;font-size:200%";
+        return "color:#00ff00;font-size:200%";
       }
       if (columnIndex === 3 && row.leakageDegree == 2) {
         return "color:#FFDF00;font-size:200%";

ui/src/views/base/region/index.vue

@@ -83,6 +83,7 @@
           plain
           icon="el-icon-position"
           size="mini"
+          :disabled="multiple"
           @click="handleToApprove"
         >送审
         </el-button>
@@ -93,6 +94,7 @@
           plain
           icon="el-icon-s-check"
           size="mini"
+          :disabled="multiple"
           @click="handleApprove"
         >审核
         </el-button>

ui/src/views/check/environment/index.vue

@@ -395,7 +395,7 @@ export default {
         instrumentId: [
           {required: true, message: '请选择仪器', trigger: "blur"}
         ],
-        backgroundValue: [
+        testTime: [
           {required: true, message: this.$t('检测日期') + this.$t('不能为空'), trigger: "blur"}
         ],
         assemblyCode: [

ui/src/views/check/inspectionCheck/pointEnter.vue

@@ -70,6 +70,7 @@
             plain
             icon="el-icon-position"
             size="mini"
+            :disabled="leftMultiple"
             @click="handleToApprove"
             v-if="isEnter"
           >送审
@@ -81,6 +82,7 @@
             plain
             icon="el-icon-s-check"
             size="mini"
+            :disabled="leftMultiple"
             @click="handleApprove"
             v-if="isEnter"
           >审核
@@ -271,7 +273,7 @@ export default {
         return "color:#ff0000;";
       }
       if (columnIndex === 3 && row.leakageDegree == 1) {
-        return "color:#13C2C2;font-size:200%";
+        return "color:#00ff00;font-size:200%";
       }
       if (columnIndex === 3 && row.leakageDegree == 2) {
         return "color:#FFDF00;font-size:200%";
@@ -351,7 +353,7 @@ export default {
       console.log(this.upload.url)
       if (row.isEnter && row.status == 1) {
         this.isEnter = true;
-      }else{
+      } else {
         this.isEnter = false;
       }
       this.dialog.dialogFormVisible = true;
@@ -377,7 +379,7 @@ export default {
           this.leftTotal = response.total;
         })
       } else {
-        this.checkAgain= false;
+        this.checkAgain = false;
         if (this.row.taskType == 2) { //录入页面进来
           this.queryParams.repairId = 0;
         } else {
@@ -401,8 +403,14 @@ export default {
       let data = {};
       data.checkIds = this.left;
       data.approveStatus = 1;
-      approveCheckpoints(data).then(response => {
-        this.getList();
+      this.$modal.confirm("是否确认送审？").then(() => {
+        return approveCheckpoints(data).then(response => {
+          this.$modal.msgSuccess("送审成功");
+          this.getList();
+        }).catch(() => {
+            this.$modal.msgWarning("送审失败！请确认数据是否填写完整！");
+          }
+        )
       })
     },
     handleApprove() {
@@ -410,8 +418,14 @@ export default {
       data.checkIds = this.left;
       data.approveStatus = 2;
       data.inspectionId = this.row.id;
-      approveCheckpoints(data).then(response => {
-        this.getList();
+      this.$modal.confirm("确认审核？").then(() => {
+        return approveCheckpoints(data).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).catch(() => {
+            this.$modal.msgWarning("审核失败！请确认数据是否填写完整！");
+          }
+        )
       })
     }
   }

ui/src/views/check/repairCheck/repairEnter.vue

@@ -1,7 +1,7 @@
 <template xmlns="http://www.w3.org/1999/html">
   <div class="checkTable">
     <el-dialog :visible.sync="dialog.dialogFormVisible" width="1800px" :close-on-click-modal="false"
-               title='检测点清单'>
+               title='维修点清单'>
       <el-row>
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
           <el-form-item label="装置" prop="plantId">
@@ -49,7 +49,7 @@
             size="mini"
             @click="handleExport"
             v-hasPermi="['check:checkpoints:export']"
-          >导出检测点清单
+          >导出维修点清单
           </el-button>
         </el-col>
         <el-col :span="1.5">
@@ -61,7 +61,7 @@
             @click="handleImport"
             v-if="isEnter"
             v-hasPermi="['check:checkpoints:add']"
-          >导入检测数据
+          >导入维修数据
           </el-button>
         </el-col>
         <el-col :span="1.5">
@@ -70,6 +70,7 @@
             plain
             icon="el-icon-position"
             size="mini"
+            :disabled="leftMultiple"
             @click="handleToApprove"
             v-if="isEnter"
           >送审
@@ -81,6 +82,7 @@
             plain
             icon="el-icon-s-check"
             size="mini"
+            :disabled="leftMultiple"
             @click="handleApprove"
             v-if="isEnter"
           >审核
@@ -270,7 +272,7 @@ export default {
         return "color:#ff0000;";
       }
       if (columnIndex === 3 && row.leakageDegree == 1) {
-        return "color:#13C2C2;font-size:200%";
+        return "color:#00ff00;font-size:200%";
       }
       if (columnIndex === 3 && row.leakageDegree == 2) {
         return "color:#FFDF00;font-size:200%";
@@ -381,8 +383,14 @@ export default {
       let data = {};
       data.checkIds = this.left;
       data.approveStatus = 1;
-      approveRepairpoints(data).then(response => {
-        this.getList();
+      this.$modal.confirm("是否确认送审？").then(() => {
+          return approveRepairpoints(data).then(response => {
+            this.$modal.msgSuccess("送审成功");
+            this.getList();
+          }).catch(() => {
+              this.$modal.msgWarning("送审失败！请确认数据是否填写完整！");
+            }
+          )
       })
     },
     handleApprove() {
@@ -391,8 +399,14 @@ export default {
       data.approveStatus = 2;
       data.repairCount = 1;
       data.repairId = this.row.id;
-      approveRepairpoints(data).then(response => {
-        this.getList();
+      this.$modal.confirm("确认审核？").then(() => {
+        return approveRepairpoints(data).then(response => {
+          this.$modal.msgSuccess("审核成功");
+          this.getList();
+        }).catch(() => {
+            this.$modal.msgWarning("审核失败！请确认数据是否填写完整！");
+          }
+        )
       })
     }
   }

ui/src/views/task/inspection/index.vue

@@ -168,24 +168,14 @@
     <!-- 添加或修改检测任务对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="检测计划" prop="planId">
-          <el-select v-model="form.planId" placeholder="请选择计划" clearable size="small" style="width: 100%">
-            <el-option
-              v-for="dict in planOperation"
-              :key="dict.id"
-              :label="dict.inspectionPlanName"
-              :value="dict.id"
-            />
-          </el-select>
-        </el-form-item>
         <el-form-item label="任务名称" prop="taskName">
           <el-input v-model="form.taskName" placeholder="请输入任务名称"/>
         </el-form-item>
         <el-form-item label="任务编号" prop="taskCode">
           <el-input v-model="form.taskCode" placeholder="请输入任务编号"/>
         </el-form-item>
-        <el-form-item label="任务类型" prop="planId">
-          <el-select v-model="form.taskType" placeholder="请选择任务类型" clearable size="small" style="width: 100%">
+        <el-form-item label="任务类型" prop="taskType">
+          <el-select v-model="form.taskType" placeholder="请选择任务类型" :disabled="isEdit" clearable size="small" style="width: 100%">
             <el-option
               v-for="dict in taskTypeOperation"
               :key="dict.dictValue"
@@ -194,6 +184,26 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="检测计划" prop="planId" v-if="this.form.taskType==1||this.form.taskType==null">
+          <el-select v-model="form.planId" placeholder="请选择计划" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in planOperation"
+              :key="dict.id"
+              :label="dict.inspectionPlanName"
+              :value="dict.id"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="装置" prop="plantId" v-if="this.form.taskType==2">
+          <el-select v-model="form.plantId" placeholder="请选择装置" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in plantOperation"
+              :key="dict.plantId"
+              :label="dict.plantName"
+              :value="dict.plantId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="任务起始时间" prop="startTime">
           <el-date-picker clearable style="width: 100%"
                           v-model="form.startTime"
@@ -239,16 +249,20 @@ import {
 import {getAllPlan} from "@/api/task/plan";
 import DividePoint from "@/views/task/inspection/dividePoint";
 import PointEnter from "@/views/check/inspectionCheck/pointEnter";
+import {MessageBox} from "element-ui";
+import {getAllPlantName} from "@/api/base/plant";
 
 export default {
   name: "Inspection",
   components: {PointEnter, DividePoint},
   data() {
     return {
+      isEdit:false,
       pointVisible: false,
       enterVisible: false,
       taskTypeOperation: [],
       planOperation: [],
+      plantOperation: [],
       divideOperation: [],
       // 页面高度
       clientHeight: 300,
@@ -298,6 +312,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        plantId: [
+          {required: true, message: '请选择装置', trigger: "blur"}
+        ],
         planId: [
           {required: true, message: '请选择计划任务', trigger: "blur"}
         ],
@@ -337,6 +354,9 @@ export default {
     getAllPlan().then(response => {
       this.planOperation = response.data;
     });
+    getAllPlantName().then(response => {
+      this.plantOperation = response.data;
+    });
   },
   methods: {
     openCheckPoint(row) {
@@ -419,6 +439,7 @@ export default {
         updatedate: null
       };
       this.resetForm("form");
+      this.isEdit=false;
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -445,13 +466,14 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      for (let statusKey of this.status) {
-        if (statusKey === "1") {
-          this.$modal.alert('已分配的任务不可修改！');
-          return
-        }
+      if (row.status != 0) {
+        MessageBox.alert('已分配的任务不可修改！', '注意！', {
+          confirmButtonText: '确定',
+        })
+        return
       }
       this.reset();
+      this.isEdit=true;
       const id = row.id || this.ids
       getInspection(id).then(response => {
         this.form = response.data;
@@ -470,7 +492,7 @@ export default {
       }
       this.reset();
       const ids = this.ids
-      this.$modal.confirm('是否确认分配？').then(function () {
+      this.$modal.confirm('是否确认分配？(若任务下无检测点则不会将其进行分配。)').then(function () {
         return divideInspection(ids);
       }).then(() => {
         this.getList();
@@ -501,8 +523,23 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      if (row.status === undefined) {
+        for (let i = 0; i < this.status.length; i++) {
+          if (this.status[i] != 0) {
+            MessageBox.alert('已分配的任务不可删除！', '注意！', {
+              confirmButtonText: '确定',
+            })
+            return
+          }
+        }
+      } else if (row.status != 0) {
+        MessageBox.alert('已分配的任务不可删除！', '注意！', {
+          confirmButtonText: '确定',
+        })
+        return
+      }
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除数据项？').then(function () {
+      this.$modal.confirm('是否确认删除数据项？(若任务下已选择密封点，则不会将该任务删除 ，请确认是否清除已选择的检测点。)').then(function () {
         return delInspection(ids);
       }).then(() => {
         this.getList();

ui/src/views/task/repair/index.vue

@@ -230,6 +230,7 @@ import {divideInspection} from "@/api/task/inspection";
 import {getAllPlantName} from "@/api/base/plant";
 import RepairPoint from "@/views/task/repair/repairPoint";
 import RepairEnter from "@/views/check/repairCheck/repairEnter";
+import {MessageBox} from "element-ui";
 
 export default {
   name: "Repair",
@@ -451,6 +452,12 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      if (row.status != 0) {
+        MessageBox.alert('已分配的任务不可修改！', '注意！', {
+          confirmButtonText: '确定',
+        })
+        return
+      }
       this.reset();
       const id = row.id || this.ids
       getRepair(id).then(response => {
@@ -481,6 +488,21 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
+      if (row.status === undefined) {
+        for (let i = 0; i < this.divideStatus.length; i++) {
+          if (this.divideStatus[i] != 0) {
+            MessageBox.alert('已分配的任务不可删除！', '注意！', {
+              confirmButtonText: '确定',
+            })
+            return
+          }
+        }
+      } else if (row.status != 0) {
+        MessageBox.alert('已分配的任务不可删除！', '注意！', {
+          confirmButtonText: '确定',
+        })
+        return
+      }
       const ids = row.id || this.ids;
       this.$modal.confirm('是否确认删除数据项？').then(function () {
         return delRepair(ids);

ui/src/views/task/repair/repairPoint.vue

@@ -248,7 +248,7 @@ export default {
     tableCellStyle({row, column, rowIndex, columnIndex}) {
 
       if (columnIndex === 2 && row.leakageDegree == 1) {
-        return "color:#13C2C2;font-size:200%";
+        return "color:#00ff00;font-size:200%";
       }
       if (columnIndex === 2 && row.leakageDegree == 2) {
         return "color:#FFDF00;font-size:200%";