소스 검색

PSSR多项内容及界面优化

jiangbiao 5 달 전
부모
커밋
ea1ab7c108
50개의 변경된 파일65개의 추가작업 그리고 64개의 파일을 삭제
  1. 1 1
      master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java
  2. 1 1
      master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml
  3. 1 1
      master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml
  4. 1 1
      master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml
  5. 1 1
      master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml
  6. 1 1
      master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml
  7. 1 1
      master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml
  8. 1 1
      master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml
  9. 1 1
      master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml
  10. 1 1
      master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml
  11. 1 1
      master/src/main/resources/mybatis/pssr/TPssrInstrumentTestMapper.xml
  12. 1 1
      master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml
  13. 1 1
      master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml
  14. 1 1
      master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml
  15. 1 1
      master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml
  16. 1 1
      master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml
  17. 1 1
      master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml
  18. 1 1
      master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml
  19. 1 1
      master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml
  20. 1 1
      master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml
  21. 1 1
      master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml
  22. 1 1
      master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml
  23. 1 1
      master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml
  24. 1 1
      master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml
  25. 1 1
      master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml
  26. 1 1
      master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml
  27. 1 1
      master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml
  28. 1 1
      master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml
  29. 1 1
      master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml
  30. 1 1
      master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml
  31. 1 1
      master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml
  32. 1 1
      master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml
  33. 1 1
      master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml
  34. 1 1
      master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml
  35. 1 1
      master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml
  36. 1 1
      master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml
  37. 1 1
      master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml
  38. 2 2
      ui/src/views/pssr/analyzer/index.vue
  39. 1 0
      ui/src/views/pssr/cleaning/index.vue
  40. 4 4
      ui/src/views/pssr/frame/index.vue
  41. 3 3
      ui/src/views/pssr/gasdetector/index.vue
  42. 3 3
      ui/src/views/pssr/instrumentCalibration/index.vue
  43. 3 3
      ui/src/views/pssr/instrumentCalibration/liquidometer.vue
  44. 4 4
      ui/src/views/pssr/instrumentCalibration/regulatingValve.vue
  45. 2 2
      ui/src/views/pssr/laboratory/index.vue
  46. 2 2
      ui/src/views/pssr/motor/index.vue
  47. 1 1
      ui/src/views/pssr/overhaulExchanger/index.vue
  48. 1 1
      ui/src/views/pssr/overhaulFilter/index.vue
  49. 1 1
      ui/src/views/pssr/overhaulTower/index.vue
  50. 1 1
      ui/src/views/pssr/overhaulValve/index.vue

+ 1 - 1
master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCleaningController.java

@@ -380,7 +380,7 @@ public class TPssrCleaningController extends BaseController {
             return AjaxResult.error("确认人不能为同一人,请重新选择!");
         }
         TPssrCleaning cleaning = tPssrCleaningService.selectTPssrCleaningById(tPssrCleaning.getId());
-        if (StringUtils.isEmpty(cleaning.getCheckContent())) {
+        if (StringUtils.isEmpty(cleaning.getCheckContent())||"[]".equals(cleaning.getCheckContent())) {
             tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
         } else {
             tPssrCleaning.setCheckContent(JSON.toJSONString(tPssrCleaning.getContentList()));

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrAirtightById" parameterType="Long" resultMap="TPssrAirtightResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrAnalyzerMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrAnalyzerById" parameterType="Long" resultMap="TPssrAnalyzerResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN in_confirm1 IS NULL AND in_confirm2 IS NULL THEN 0
         WHEN in_confirm1 IS NULL OR in_confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrBlindById" parameterType="Long" resultMap="TPssrBlindResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrCircuitMapper.xml

@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrCircuitById" parameterType="Long" resultMap="TPssrCircuitResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrCleaningMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrCleaningById" parameterType="Long" resultMap="TPssrCleaningResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrFrameMapper.xml

@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrFrameById" parameterType="Long" resultMap="TPssrFrameResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrGasdetectorMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrGasdetectorById" parameterType="Long" resultMap="TPssrGasdetectorResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrHygieneMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrHygieneById" parameterType="Long" resultMap="TPssrHygieneResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrInstrumentCalibrationMapper.xml

@@ -82,7 +82,7 @@ d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.conf
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrInstrumentCalibrationById" parameterType="Long" resultMap="TPssrInstrumentCalibrationResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrInstrumentTestMapper.xml

@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by createdate desc
+        order by id desc
     </select>
 
     <select id="selectTPssrInstrumentTestById" parameterType="Long" resultMap="TPssrInstrumentTestResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrLaboratoryMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrLaboratoryById" parameterType="Long" resultMap="TPssrLaboratoryResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrLockMapper.xml

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN lockeder IS NULL AND confirm IS NULL THEN 0
         WHEN lockeder IS NULL OR confirm IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,lock_code
     </select>
 
     <select id="selectTPssrLockById" parameterType="Long" resultMap="TPssrLockResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrMaterialMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrMaterialById" parameterType="Long" resultMap="TPssrMaterialResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrMaterialRawMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrMaterialRawById" parameterType="Long" resultMap="TPssrMaterialRawResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrMeasureMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrMeasureById" parameterType="Long" resultMap="TPssrMeasureResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrMocMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrMocById" parameterType="Long" resultMap="TPssrMocResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrMotorMapper.xml

@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrMotorById" parameterType="Long" resultMap="TPssrMotorResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrNitrogenMapper.xml

@@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrNitrogenById" parameterType="Long" resultMap="TPssrNitrogenResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrOverhaulExchangerMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CASE
         WHEN confirmed_person IS NULL THEN 0
         ELSE 1
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrOverhaulExchangerById" parameterType="Long" resultMap="TPssrOverhaulExchangerResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -69,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CASE
         WHEN resp_person IS NULL  THEN 0
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrOverhaulFilterById" parameterType="Long" resultMap="TPssrOverhaulFilterResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrOverhaulTowerMapper.xml

@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CASE
         WHEN confirmed_person IS NULL THEN 0
         ELSE 1
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrOverhaulTowerById" parameterType="Long" resultMap="TPssrOverhaulTowerResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrOverhaulValveMapper.xml

@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         CASE
         WHEN identifying_person IS NULL THEN 0
         ELSE 1
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrOverhaulValveById" parameterType="Long" resultMap="TPssrOverhaulValveResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrPipeMapper.xml

@@ -71,7 +71,7 @@
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrPipeById" parameterType="Long" resultMap="TPssrPipeResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrPowerMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrPowerById" parameterType="Long" resultMap="TPssrPowerResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrProgrammeMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrProgrammeById" parameterType="Long" resultMap="TPssrProgrammeResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrProtectionMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrProtectionById" parameterType="Long" resultMap="TPssrProtectionResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrPublicMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrPublicById" parameterType="Long" resultMap="TPssrPublicResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrPumpCleaningMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrPumpCleaningById" parameterType="Long" resultMap="TPssrPumpCleaningResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrPumpFillMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrPumpFillById" parameterType="Long" resultMap="TPssrPumpFillResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrPumpOverhaulMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrPumpOverhaulById" parameterType="Long" resultMap="TPssrPumpOverhaulResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrSafetyBleedMapper.xml

@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrSafetyBleedById" parameterType="Long" resultMap="TPssrSafetyBleedResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrSafetyBreathMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrSafetyBreathById" parameterType="Long" resultMap="TPssrSafetyBreathResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrSafetyBrustMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrSafetyBrustById" parameterType="Long" resultMap="TPssrSafetyBrustResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrSafetyFlamearresterMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrSafetyFlamearresterById" parameterType="Long" resultMap="TPssrSafetyFlamearresterResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrSafetyValveMapper.xml

@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrSafetyValveById" parameterType="Long" resultMap="TPssrSafetyValveResult">

+ 1 - 1
master/src/main/resources/mybatis/pssr/TPssrVesselMapper.xml

@@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
         WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
         ELSE 2
-        END,createdate desc
+        END,id desc
     </select>
 
     <select id="selectTPssrVesselById" parameterType="Long" resultMap="TPssrVesselResult">

+ 2 - 2
ui/src/views/pssr/analyzer/index.vue

@@ -129,8 +129,8 @@
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>现场在线分析仪检查确认清单</H2><br>     检查要求:<br>
-      1.外观检查:在线分析仪的外观无变形锈蚀,设备完好;取样管线及预处理系统连接正确。现场检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.功能检查:仪器的功能测试合格,具备投用条件。现场检查符合要求的,在“功能检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:在线分析仪的外观无变形锈蚀,设备完好;取样管线及预处理系统连接正确。现场检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.功能检查:仪器的功能测试合格,具备投用条件。现场检查符合要求的,在“功能检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。
 
     </div>

+ 1 - 0
ui/src/views/pssr/cleaning/index.vue

@@ -519,6 +519,7 @@ export default {
       rules: {
         confirm1: [{required: true, message: "人员不可为空", trigger: "blur"}],
         confirm2: [{required: true, message: "人员不可为空", trigger: "blur"}],
+        devType: [{required: true, message: "设备类型不可为空", trigger: "blur"}],
       }
     };
   },

+ 4 - 4
ui/src/views/pssr/frame/index.vue

@@ -145,10 +145,10 @@
       <H2>弹簧支(吊)架检查确认表</H2><br>
       <span>
           检查要求:<br/>
-          1.管部检查:管部组件无变形、无严重锈蚀、无断裂;焊缝无开裂。管部检查符合要求的,在“管部检查”项中打”✔“,不符合打“×”。<br/>
-          2.根部检查:根部组件无变形、无严重锈蚀、无断裂;焊缝无开裂;导向机构的滑动部位无杂物影响设备/管道的自由膨胀和伸缩;限位装置或导向机构的滑动副(如PTFE板)无变形、无老化。根部检查符合要求的,在“根部检查”项中打”✔“,不符合打“×”。<br/>
-          3.功能件检查:弹簧无严重锈蚀、无折迭、无分层、无裂纹、无断裂;弹簧无压并、无松脱;转体部位无卡阻;组合支吊架无偏载、无单边失载。功能件检查符合要求的,在“功能件检查”项中打”✔“,不符合打“×”。<br/>
-          4.连接件检查:筒节及其组件无严重锈蚀、无开裂;支(吊)杆无严重锈蚀、无松脱;锁定装置已解除。连接件检查符合要求的,在“连接件检查”项中打”✔“,不符合打“×”。<br/>
+          1.管部检查:管部组件无变形、无严重锈蚀、无断裂;焊缝无开裂。管部检查符合要求的,在“管部检查”项中打“✔”,不符合打“×”。<br/>
+          2.根部检查:根部组件无变形、无严重锈蚀、无断裂;焊缝无开裂;导向机构的滑动部位无杂物影响设备/管道的自由膨胀和伸缩;限位装置或导向机构的滑动副(如PTFE板)无变形、无老化。根部检查符合要求的,在“根部检查”项中打“✔”,不符合打“×”。<br/>
+          3.功能件检查:弹簧无严重锈蚀、无折迭、无分层、无裂纹、无断裂;弹簧无压并、无松脱;转体部位无卡阻;组合支吊架无偏载、无单边失载。功能件检查符合要求的,在“功能件检查”项中打“✔”,不符合打“×”。<br/>
+          4.连接件检查:筒节及其组件无严重锈蚀、无开裂;支(吊)杆无严重锈蚀、无松脱;锁定装置已解除。连接件检查符合要求的,在“连接件检查”项中打“✔”,不符合打“×”。<br/>
           以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。<br/>
       </span>
     </div>

+ 3 - 3
ui/src/views/pssr/gasdetector/index.vue

@@ -121,9 +121,9 @@
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>现场气体检测器检查确认清单</H2><br>
       检查要求:<br>
-      1.外观检查:气体检测器外观检查完好,无破损;标识位号清晰;电缆无破损,连接正常。现场检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.防雨罩检查:防雨罩外观无变形腐蚀,固定安装,无松动。现场检查符合要求的,在“防雨罩检查”项中打”✔“,不符合打“×”。<br>
-      3.显示检查:气体检测器显示屏无破损,数值显示正常。现场检查符合要求的,在“显示检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:气体检测器外观检查完好,无破损;标识位号清晰;电缆无破损,连接正常。现场检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.防雨罩检查:防雨罩外观无变形腐蚀,固定安装,无松动。现场检查符合要求的,在“防雨罩检查”项中打“✔”,不符合打“×”。<br>
+      3.显示检查:气体检测器显示屏无破损,数值显示正常。现场检查符合要求的,在“显示检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。
 
     </div>

+ 3 - 3
ui/src/views/pssr/instrumentCalibration/index.vue

@@ -130,9 +130,9 @@
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>现场流量计检修完工检查确认清单</H2><br>检查要求:<br>
-      1.外观检查:流量计外观检查无明显瑕疵,设备完整良好;仪表位号牌齐全。现场检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.安装检查:流量计回装位置正确。现场检查符合要求的,在“安装检查”项中打”✔“,不符合打“×”。<br>
-      3.功能检查:流量计校验完成,功能完好;一次阀已经投用,具备使用条件。现场检查符合要求的,在“功能检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:流量计外观检查无明显瑕疵,设备完整良好;仪表位号牌齐全。现场检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.安装检查:流量计回装位置正确。现场检查符合要求的,在“安装检查”项中打“✔”,不符合打“×”。<br>
+      3.功能检查:流量计校验完成,功能完好;一次阀已经投用,具备使用条件。现场检查符合要求的,在“功能检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。
 
     </div>

+ 3 - 3
ui/src/views/pssr/instrumentCalibration/liquidometer.vue

@@ -131,9 +131,9 @@
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <h2>现场液位计检修完工检查确认清单</h2><br>
       检查要求:<br>
-      1.外观检查:液位计外观检查无明显瑕疵,设备完整良好;仪表位号牌齐全。现场检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.安装检查:液位计回装位置正确。现场检查符合要求的,在“安装检查”项中打”✔“,不符合打“×”。<br>
-      3.功能检查:液位计已经校验或清洗测试完成,功能完好;一次阀已经投用,具备使用条件。现场检查符合要求的,在“功能检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:液位计外观检查无明显瑕疵,设备完整良好;仪表位号牌齐全。现场检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.安装检查:液位计回装位置正确。现场检查符合要求的,在“安装检查”项中打“✔”,不符合打“×”。<br>
+      3.功能检查:液位计已经校验或清洗测试完成,功能完好;一次阀已经投用,具备使用条件。现场检查符合要求的,在“功能检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。<br>
 
 

+ 4 - 4
ui/src/views/pssr/instrumentCalibration/regulatingValve.vue

@@ -131,10 +131,10 @@
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <h2>现场调节阀检查确认清单</h2><br>
       检查要求:<br>
-      1.外观检查:阀门外观检查无明显瑕疵,设备完整良好;电缆及保护套完好,敷设合理;仪表风管紧固,接头无泄漏;仪表位号牌齐全。现场检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.流向检查:阀门安装正确,阀门流向与管道介质流向一致。现场检查符合要求的,在“流向检查”项中打”✔“,不符合打“×”。<br>
-      3.附件检查:过滤减压阀完好,功能正常;定位器,电磁阀等其他附件完好。现场检查符合要求的,在“附件检查”项中打”✔“,不符合打“×”。<br>
-      4.功能检查:阀门行程调试正常;功能测试正常。现场检查符合要求的,在“附件检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:阀门外观检查无明显瑕疵,设备完整良好;电缆及保护套完好,敷设合理;仪表风管紧固,接头无泄漏;仪表位号牌齐全。现场检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.流向检查:阀门安装正确,阀门流向与管道介质流向一致。现场检查符合要求的,在“流向检查”项中打“✔”,不符合打“×”。<br>
+      3.附件检查:过滤减压阀完好,功能正常;定位器,电磁阀等其他附件完好。现场检查符合要求的,在“附件检查”项中打“✔”,不符合打“×”。<br>
+      4.功能检查:阀门行程调试正常;功能测试正常。现场检查符合要求的,在“附件检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。<br>
     </div>
 

+ 2 - 2
ui/src/views/pssr/laboratory/index.vue

@@ -139,8 +139,8 @@
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>实验室仪器检查确认清单</H2>
       <br>
-      1.外观检查:仪器的外观无变形损坏,设备完好;系统连接正确。检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.功能检查:仪器校验合格,在有效期内;功能正常,具备使用条件。检查符合要求的,在“功能检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:仪器的外观无变形损坏,设备完好;系统连接正确。检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.功能检查:仪器校验合格,在有效期内;功能正常,具备使用条件。检查符合要求的,在“功能检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。
 
     </div>

+ 2 - 2
ui/src/views/pssr/motor/index.vue

@@ -131,8 +131,8 @@
       <H2>现场设备电机检查确认清单</H2>
       <br>
       检查要求:<br>
-      1.外观检查:设备的电机外观检查无变形锈蚀,设备完整良好;电机电缆完好,敷设合理,连接正确。现场检查符合要求的,在“外观检查”项中打”✔“,不符合打“×”。<br>
-      2.功能检查:设备的电机试验合格;送电完成,具备投用条件。现场检查符合要求的,在“功能检查”项中打”✔“,不符合打“×”。<br>
+      1.外观检查:设备的电机外观检查无变形锈蚀,设备完整良好;电机电缆完好,敷设合理,连接正确。现场检查符合要求的,在“外观检查”项中打“✔”,不符合打“×”。<br>
+      2.功能检查:设备的电机试验合格;送电完成,具备投用条件。现场检查符合要求的,在“功能检查”项中打“✔”,不符合打“×”。<br>
       以上检查中不符合要求的,必须按照该条检查内容的要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。
     </div>
 

+ 1 - 1
ui/src/views/pssr/overhaulExchanger/index.vue

@@ -151,7 +151,7 @@
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>{{devName}}检修清单</H2><br>
-      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打”✔“,未完成的打“×。</span><br>
+      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打“✔”,未完成的打“×。</span><br>
       <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulExchangerList" @selection-change="handleSelectionChange"

+ 1 - 1
ui/src/views/pssr/overhaulFilter/index.vue

@@ -151,7 +151,7 @@
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>过滤器清洗工作清单</H2><br>
-      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打”✔“,未完成的打“×。</span><br>
+      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打“✔”,未完成的打“×。</span><br>
       <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulFilterList" @selection-change="handleSelectionChange"

+ 1 - 1
ui/src/views/pssr/overhaulTower/index.vue

@@ -152,7 +152,7 @@
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>塔罐检修清单</H2><br>
-      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打”✔“,未完成的打“×。</span><br>
+      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打“✔”,未完成的打“×。</span><br>
       <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulTowerList" @selection-change="handleSelectionChange"

+ 1 - 1
ui/src/views/pssr/overhaulValve/index.vue

@@ -134,7 +134,7 @@
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
       <H2>阀门更换、下线维修清单</H2><br>
-      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打”✔“,未完成的打“×。</span><br>
+      <span>检查确认检修项目是否已经完成,检修项目已经完成的在“完成状态”栏中打“✔”,未完成的打“×。</span><br>
       <span>未完成的检修项按照该条检修要求立即整改。如不能立即整改的,请立即汇报相关负责人并采取临时应对措施。</span>
     </div>
     <el-table v-loading="loading" :data="overhaulValveList" @selection-change="handleSelectionChange"