feat(ps): 优化巡检功能并新增导出模板支持

- 移除旧的Excel工具类导入，引入Apache POI库用于自定义导出
- 新增多个设备类型的巡检问题类型标识（patrolType）细化分类
- 在 eyewash 设备中增加“所处区域有良好的照明，且没有被遮挡”字段及其校验逻辑
- 修改报警信息提示文案，增强用户操作指引
- 调整巡检计划周期选择器显示顺序，并修复初始化状态逻辑
- 完善导出模板逻辑，支持动态填充数据和标题设置
- 更新MyBatis映射文件以支持新字段 light_unobstructed 的读写操作
- UI层面同步更新表格列展示与表单项控制逻辑

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionAlarmController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.project.ps.inspection.controller;
 
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -14,10 +13,17 @@ import com.ruoyi.project.ps.patrol.domain.TPsPatrolPlan;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolIssuesService;
 import com.ruoyi.project.ps.patrol.service.ITPsPatrolPlanService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellStyle;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Date;
 import java.util.List;
 
@@ -59,8 +65,11 @@ public class TPsInspectionAlarmController extends BaseController {
     @GetMapping("/export")
     public AjaxResult export(TPsInspectionAlarm tPsInspectionAlarm) {
         List<TPsInspectionAlarm> list = tPsInspectionAlarmService.selectTPsInspectionAlarmList(tPsInspectionAlarm);
-        ExcelUtil<TPsInspectionAlarm> util = new ExcelUtil<TPsInspectionAlarm>(TPsInspectionAlarm.class);
-        return util.exportExcel(list, "alarm");
+        if (!list.isEmpty()) {
+            return AjaxResult.success(exportTmpl(list));
+        } else {
+            return AjaxResult.error("暂无可导出数据");
+        }
     }
 
     /**
@@ -81,7 +90,7 @@ public class TPsInspectionAlarmController extends BaseController {
             return AjaxResult.success(tPsInspectionAlarmService.selectTPsInspectionAlarmById(tPsInspectionAlarm.getId()));
         }
         if (!"PS".equals(tPsInspectionAlarm.getPlant())) {
-            return AjaxResult.error("请使用PS装置账号进行扫码巡检！");
+            return AjaxResult.error("请使用_"+tPsInspectionAlarm.getPlant()+"_装置账号进行扫码巡检！");
         }
         if (StringUtils.isNull(tPsInspectionAlarm.getDevNo()) || StringUtils.isNull(tPsInspectionAlarm.getPlanId())) {
             return AjaxResult.error("位号或计划id不能为空！");
@@ -207,4 +216,31 @@ public class TPsInspectionAlarmController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(tPsInspectionAlarmService.deleteTPsInspectionAlarmByIds(ids));
     }
+
+    public String exportTmpl(List<TPsInspectionAlarm> list) {
+        OutputStream out;
+        String filename = null;
+        try {
+            String tempUrl = "static/word/ps/alarm.xlsx"; // 模板文件
+            InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
+            XSSFWorkbook wb = new XSSFWorkbook(is);
+            XSSFSheet sheet1 = wb.getSheetAt(0);
+
+            //填充数据
+            int rowIndex1 = 7;
+            int num1 = 1;
+
+            Row originalRow1 = sheet1.getRow(7);
+            Cell originalcell1 = originalRow1.getCell(0);
+            // 获取单元格样式
+            CellStyle originalStyle1 = originalcell1.getCellStyle();
+            if (!list.isEmpty()) {
+                Row line1 = sheet1.getRow(0);
+                line1.getCell(0).setCellValue(list.get(0).getPlant() + "装置滚动问题清单和行动计划");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return filename;
+    }
 }

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCabinetController.java

@@ -170,7 +170,7 @@ public class TPsInspectionCabinetController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionCabinet.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("2");
             issues.setDevDescribe(cabinet.getBoxNo() + "_" + cabinet.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCallsystemController.java

@@ -164,7 +164,7 @@ public class TPsInspectionCallsystemController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionCallsystem.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("3");
             issues.setDevDescribe(callsystem.getDevNo() + "_" + callsystem.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCofferController.java

@@ -164,7 +164,7 @@ public class TPsInspectionCofferController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionCoffer.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("4");
             issues.setDevDescribe(coffer.getCofferNo() + "_" + coffer.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionCurtainController.java

@@ -164,7 +164,7 @@ public class TPsInspectionCurtainController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionCurtain.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("5");
             issues.setDevDescribe(curtain.getCurtainName() + "_" + curtain.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionExtinguisherController.java

@@ -169,7 +169,7 @@ public class TPsInspectionExtinguisherController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionExtinguisher.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("6");
             issues.setDevDescribe(extinguisher.getFireExtinguisherNo() + "_" + extinguisher.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionEyewashController.java

@@ -132,8 +132,8 @@ public class TPsInspectionEyewashController extends BaseController {
         }
 
         // 检查是否存在异常项
-        if (StringUtils.isNotEqualsArray("1", tPsInspectionEyewash.getSignageOk(), tPsInspectionEyewash.getAccessClear(), tPsInspectionEyewash.getPartsOk(), tPsInspectionEyewash.getValveOpenLocked(), tPsInspectionEyewash.getDustcapOk(), tPsInspectionEyewash.getWaterHeight(), tPsInspectionEyewash.getWaterClean(), tPsInspectionEyewash.getWaterTemp(), tPsInspectionEyewash.getLeversOk(), tPsInspectionEyewash.getErcNotified(), tPsInspectionEyewash.getLocalAlarmOk(), tPsInspectionEyewash.getAlarmSignalOk()) &&
-                StringUtils.isNotEqualsArray("NA", tPsInspectionEyewash.getSignageOk(), tPsInspectionEyewash.getAccessClear(), tPsInspectionEyewash.getPartsOk(), tPsInspectionEyewash.getValveOpenLocked(), tPsInspectionEyewash.getDustcapOk(), tPsInspectionEyewash.getWaterHeight(), tPsInspectionEyewash.getWaterClean(), tPsInspectionEyewash.getWaterTemp(), tPsInspectionEyewash.getLeversOk(), tPsInspectionEyewash.getErcNotified(), tPsInspectionEyewash.getLocalAlarmOk(), tPsInspectionEyewash.getAlarmSignalOk())) {
+        if (StringUtils.isNotEqualsArray("1", tPsInspectionEyewash.getSignageOk(), tPsInspectionEyewash.getAccessClear(), tPsInspectionEyewash.getPartsOk(), tPsInspectionEyewash.getValveOpenLocked(), tPsInspectionEyewash.getDustcapOk(), tPsInspectionEyewash.getWaterHeight(), tPsInspectionEyewash.getWaterClean(), tPsInspectionEyewash.getWaterTemp(), tPsInspectionEyewash.getLeversOk(), tPsInspectionEyewash.getErcNotified(), tPsInspectionEyewash.getLocalAlarmOk(), tPsInspectionEyewash.getAlarmSignalOk(), tPsInspectionEyewash.getLightUnobstructed()) &&
+                StringUtils.isNotEqualsArray("NA", tPsInspectionEyewash.getSignageOk(), tPsInspectionEyewash.getAccessClear(), tPsInspectionEyewash.getPartsOk(), tPsInspectionEyewash.getValveOpenLocked(), tPsInspectionEyewash.getDustcapOk(), tPsInspectionEyewash.getWaterHeight(), tPsInspectionEyewash.getWaterClean(), tPsInspectionEyewash.getWaterTemp(), tPsInspectionEyewash.getLeversOk(), tPsInspectionEyewash.getErcNotified(), tPsInspectionEyewash.getLocalAlarmOk(), tPsInspectionEyewash.getAlarmSignalOk(), tPsInspectionEyewash.getLightUnobstructed())) {
             // 当前数据标记为存在问题
             tPsInspectionEyewash.setIssuesStatus(1L);
             tPsInspectionEyewash.setUpdatedate(date);
@@ -155,6 +155,7 @@ public class TPsInspectionEyewashController extends BaseController {
             entity.setErcNotified(tPsInspectionEyewash.getErcNotified());
             entity.setLocalAlarmOk(tPsInspectionEyewash.getLocalAlarmOk());
             entity.setAlarmSignalOk(tPsInspectionEyewash.getAlarmSignalOk());
+            entity.setLightUnobstructed(tPsInspectionEyewash.getLightUnobstructed());
             entity.setMonth(eyewash.getMonth());
             entity.setYear(eyewash.getYear());
             entity.setPlanId(eyewash.getPlanId());
@@ -171,7 +172,7 @@ public class TPsInspectionEyewashController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionEyewash.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("7");
             issues.setDevDescribe(eyewash.getDevNo());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionFgsController.java

@@ -164,7 +164,7 @@ public class TPsInspectionFgsController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionFgs.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("8");
             issues.setDevDescribe(fgs.getFgsNo() + "_" + fgs.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionFiredoorController.java

@@ -165,7 +165,7 @@ public class TPsInspectionFiredoorController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionFiredoor.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("9");
             issues.setDevDescribe(firedoor.getDoorNo() + "_" + firedoor.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionHydrantController.java

@@ -168,7 +168,7 @@ public class TPsInspectionHydrantController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionHydrant.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("10");
             issues.setDevDescribe(hydrant.getEquipId() + "_" + hydrant.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionLiftController.java

@@ -166,7 +166,7 @@ public class TPsInspectionLiftController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionLift.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("11");
             issues.setDevDescribe(lift.getDevNo() + "_" + lift.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionMonitorController.java

@@ -165,7 +165,7 @@ public class TPsInspectionMonitorController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionMonitor.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("12");
             issues.setDevDescribe(monitor.getDevNo() + "_" + monitor.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionPitController.java

@@ -163,7 +163,7 @@ public class TPsInspectionPitController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionPit.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("13");
             issues.setDevDescribe(pit.getDevNo() + "_" + pit.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionRainvalveController.java

@@ -163,7 +163,7 @@ public class TPsInspectionRainvalveController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionRainvalve.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("14");
             issues.setDevDescribe(rainvalve.getValveName() + "_" + rainvalve.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionSteamController.java

@@ -164,7 +164,7 @@ public class TPsInspectionSteamController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionSteam.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("15");
             issues.setDevDescribe(steam.getSteamName() + "_" + steam.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionSumpController.java

@@ -164,7 +164,7 @@ public class TPsInspectionSumpController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionSump.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("16");
             issues.setDevDescribe(sump.getSumpNo() + "_" + sump.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionUtilitystationController.java

@@ -165,7 +165,7 @@ public class TPsInspectionUtilitystationController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionUtilitystation.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("17");
             issues.setDevDescribe(utilitystation.getUtilityStationName() + "_" + utilitystation.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/controller/TPsInspectionVentvalveController.java

@@ -164,7 +164,7 @@ public class TPsInspectionVentvalveController extends BaseController {
             TPsPatrolIssues issues = new TPsPatrolIssues();
             issues.setLinkOldId(tPsInspectionVentvalve.getId());
             issues.setLinkNewId(entity.getId());
-            issues.setPatrolType("1");
+            issues.setPatrolType("18");
             issues.setDevDescribe(ventvalve.getVentvalveNo() + "_" + ventvalve.getPosition());
             issues.setStatus(0L);// 待处理
             tPsPatrolIssuesService.insertTPsPatrolIssues(issues);

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionEyewash.java

@@ -211,6 +211,20 @@ public class TPsInspectionEyewash extends BaseEntity {
 
     private String plant;
 
+    /**
+     * 所处区域有良好的照明，且没有被遮挡
+     * */
+    @Excel(name = "所处区域有良好的照明，且没有被遮挡")
+    private String lightUnobstructed;
+
+    public String getLightUnobstructed() {
+        return lightUnobstructed;
+    }
+
+    public void setLightUnobstructed(String lightUnobstructed) {
+        this.lightUnobstructed = lightUnobstructed;
+    }
+
     public String getPlant() {
         return plant;
     }

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionSump.java

@@ -68,9 +68,9 @@ public class TPsInspectionSump extends BaseEntity {
     private String insideSump;
 
     /**
-     * $column.columnComment
+     * 沙箱及地垫
      */
-    @Excel(name = "井内")
+    @Excel(name = "沙箱及地垫")
     private String boxPad;
 
     /**

master/src/main/java/com/ruoyi/project/ps/inspection/domain/TPsInspectionVentvalve.java

@@ -64,7 +64,7 @@ public class TPsInspectionVentvalve extends BaseEntity {
     /**
      * 功能测试位置及开关
      */
-    @Excel(name = "功能测试位置及开关")
+    @Excel(name = "功能位置及开关")
     private String functionalTest;
 
     /**

master/src/main/resources/mybatis/ps/inspection/TPsInspectionEyewashMapper.xml

@@ -35,10 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="issuesStatus"    column="issues_status"    />
         <result property="issuesFlag"    column="issues_flag"    />
         <result property="deptName" column="dept_name" />
+        <result property="lightUnobstructed"    column="light_unobstructed"    />
     </resultMap>
 
     <sql id="selectTPsInspectionEyewashVo">
-        select d.id, d.dev_no, d.signage_ok, d.access_clear, d.parts_ok, d.valve_open_locked, d.dustcap_ok, d.water_height, d.water_clean, d.water_temp, d.levers_ok, d.erc_notified, d.local_alarm_ok, d.alarm_signal_ok, d.confirmer, d.check_status, d.check_date, d.month, d.year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.plan_id, d.issues_status, d.issues_flag ,s.dept_name from t_ps_inspection_eyewash d
+        select d.id, d.dev_no, d.signage_ok, d.access_clear, d.parts_ok, d.valve_open_locked, d.dustcap_ok, d.water_height, d.water_clean, d.water_temp, d.levers_ok, d.erc_notified, d.local_alarm_ok, d.alarm_signal_ok, d.confirmer, d.check_status, d.check_date, d.month, d.year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.remarks, d.dept_id, d.plan_id, d.issues_status, d.issues_flag, d.light_unobstructed, s.dept_name from t_ps_inspection_eyewash d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -119,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id,</if>
             <if test="issuesStatus != null">issues_status,</if>
             <if test="issuesFlag != null">issues_flag,</if>
+            <if test="lightUnobstructed != null">light_unobstructed,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -150,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">#{planId},</if>
             <if test="issuesStatus != null">#{issuesStatus},</if>
             <if test="issuesFlag != null">#{issuesFlag},</if>
+            <if test="lightUnobstructed != null">#{lightUnobstructed},</if>
          </trim>
     </insert>
 
@@ -184,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="planId != null">plan_id = #{planId},</if>
             <if test="issuesStatus != null">issues_status = #{issuesStatus},</if>
             <if test="issuesFlag != null">issues_flag = #{issuesFlag},</if>
+            <if test="lightUnobstructed != null">light_unobstructed = #{lightUnobstructed},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/ps/inspection/eyewash/index.vue

@@ -82,6 +82,12 @@
           <dict-tag :options="dict.type.inspection_status" :value="scope.row.accessClear"/>
         </template>
       </el-table-column>
+      <el-table-column label="所处区域有良好的照明，且没有被遮挡" align="center" prop="lightUnobstructed" width="200"
+                       :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.inspection_status" :value="scope.row.lightUnobstructed"/>
+        </template>
+      </el-table-column>
       <el-table-column label="洗眼器配件没有损坏或丢失，也没有可见的腐蚀" align="center" prop="partsOk" width="220"
                        :show-overflow-tooltip="true">
         <template slot-scope="scope">

ui/src/views/ps/patrol/plan/index.vue

@@ -191,13 +191,13 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item v-if="dfFlag" label="周期" prop="detectionFrequency">
+          <el-radio v-model="form.detectionFrequency" label="1" @change="getCycle">上半月</el-radio>
+          <el-radio v-model="form.detectionFrequency" label="2" @change="getCycle">下半月</el-radio>
+        </el-form-item>
         <el-form-item label="计划名称" prop="planName">
           <el-input v-model="form.planName" placeholder="请输入计划名称"/>
         </el-form-item>
-        <el-form-item v-if="dfFlag" label="周期" prop="detectionFrequency">
-          <el-radio v-model="form.detectionFrequency" label="1">上半月</el-radio>
-          <el-radio v-model="form.detectionFrequency" label="2">下半月</el-radio>
-        </el-form-item>
         <el-form-item label="备注" prop="remarks">
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
@@ -489,6 +489,8 @@ export default {
     handleAdd() {
       this.reset();
       this.getMainList();
+      this.dfFlag=false;
+      this.form.detectionFrequency='';
       this.open = true;
       this.title = "添加临时检查计划";
     },
@@ -511,10 +513,11 @@ export default {
             this.dfFlag = true;
           } else {
             this.dfFlag = false;
+            this.form.detectionFrequency=null;
           }
           let s = '';
-          if (item.detectionFrequency != '') {
-            s = item.detectionFrequency == 1 ? '-上半月' : '-下半月';
+          if (this.form.detectionFrequency) {
+            s = this.form.detectionFrequency == 1 ? '-上半月' : '-下半月';
           }
           this.form.planName = this.form.planYear + '年-' + this.form.planMonth + '月' + s + "-临时计划-" + this.form.mainObj.devName;
           this.form.patrolType = this.form.mainObj.patrolType;