PSSR文件名修改为固定值

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseTesterController.java

@@ -268,7 +268,7 @@ public class TCommonuseTesterController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName =  "PSSR_16_便携式检测仪_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_16_便携式检测仪.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCabinetController.java

@@ -160,7 +160,7 @@ public class TEmergencyCabinetController extends BaseController {
             }
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_应急事故柜检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_应急事故柜检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCctvController.java

@@ -239,7 +239,7 @@ public class TEmergencyCctvController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 6));
 
             //返回
-            String fileName =  "PSSR_15_通讯监控_CCTV系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_15_通讯监控_CCTV系统检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java

@@ -281,7 +281,7 @@ public class TEmergencyEyewashController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 15));
 
         //返回
-        String fileName =  "PSSR_13_消气防设施_淋浴洗眼器检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+        String fileName = "PSSR_13_消气防设施_淋浴洗眼器检查记录.xlsx";
         OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
         workbook.write(os);
         workbook.close();

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyPagaController.java

@@ -244,7 +244,7 @@ public class TEmergencyPagaController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 7));
 
             //返回
-            String fileName =  "PSSR_15_通讯监控_PAGA系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_15_通讯监控_PAGA系统检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAidkitController.java

@@ -113,7 +113,7 @@ public class TFireAidkitController extends BaseController {
             if (confirmedDate!=null){
                 sheet.getRow(5).getCell(3).setCellValue(DateUtils.dateTime(confirmedDate));
             }
-            filename =  "PSSR_13_消气防设施_急救箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            filename =  filename = "PSSR_13_消气防设施_急救箱检查记录.xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAlarmController.java

@@ -264,7 +264,7 @@ public class TFireAlarmController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 7));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_现场可燃气体检测器、火灾报警系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_现场可燃气体检测器、火灾报警系统检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAnnihilatorController.java

@@ -277,7 +277,7 @@ public class TFireAnnihilatorController extends BaseController {
         sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
         //返回
-        String fileName =  "PSSR_13_消气防设施_手提式、小推车式灭火器、灭火器材箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+        String fileName = "PSSR_13_消气防设施_手提式、小推车式灭火器、灭火器材箱检查记录.xlsx";
         OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
         workbook.write(os);
         workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireDoorController.java

@@ -150,7 +150,7 @@ public class TFireDoorController extends BaseController {
                 sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
             }
             //返回
-            String fileName =  "PSSR_13_消气防设施_常闭式防爆门、防火门检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_常闭式防爆门、防火门检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireGasShieldController.java

@@ -254,7 +254,7 @@ public class TFireGasShieldController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_气体保护系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_气体保护系统检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireHoseBoxController.java

@@ -246,7 +246,7 @@ public class TFireHoseBoxController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_消防水带箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_消防水带箱检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFirePostFireController.java

@@ -246,7 +246,7 @@ public class TFirePostFireController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_地上消火栓检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_地上消火栓检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSandboxController.java

@@ -239,7 +239,7 @@ public class TFireSandboxController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 6));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_应急沙箱检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_应急沙箱检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSprinklerController.java

@@ -251,7 +251,7 @@ public class TFireSprinklerController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 10));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_自动喷淋灭火系统检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_自动喷淋灭火系统检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireStandpipeController.java

@@ -242,7 +242,7 @@ public class TFireStandpipeController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 7));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_消防竖管检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_消防竖管检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSteamCurtainController.java

@@ -242,7 +242,7 @@ public class TFireSteamCurtainController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 6));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_蒸汽幕检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_蒸汽幕检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWaterCannonController.java

@@ -246,7 +246,7 @@ public class TFireWaterCannonController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_消防水炮检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_消防水炮检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWeathervaneController.java

@@ -269,7 +269,7 @@ public class TFireWeathervaneController extends BaseController {
             sheet.addMergedRegion(new CellRangeAddress(nextRowNum, nextRowNum, 0, 8));
 
             //返回
-            String fileName =  "PSSR_13_消气防设施_获取风向标、风向袋、新风系统正压计检查记录_" + UUID.randomUUID().toString() + ".xlsx";
+            String fileName = "PSSR_13_消气防设施_获取风向标、风向袋、新风系统正压计检查记录.xlsx";
             OutputStream os = Files.newOutputStream(Paths.get(ExcelUtil.getAbsoluteFile(fileName)));
             workbook.write(os);
             workbook.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAirtightController.java

@@ -493,7 +493,7 @@ public class TPssrAirtightController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_08_气密_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_08_气密"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrAnalyzerController.java

@@ -232,7 +232,7 @@ public class TPssrAnalyzerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_31_在线分析仪_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_31_在线分析仪"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrApproveController.java

@@ -2161,12 +2161,12 @@ public class TPssrApproveController extends BaseController {
 //                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
 //                    files.add(new File(rootPath + subTitle + msg));
 
-                    TPssrMaterialRaw materialRaw = new TPssrMaterialRaw();
-                    materialRaw.setSubId(tPssrSubcontent.getId());//子表id
-                    result = materialRawController.export(materialRaw);
-                    msg = (String) result.get("msg");
-                    path = downloadPath + msg;
-                    this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
+//                    TPssrMaterialRaw materialRaw = new TPssrMaterialRaw();
+//                    materialRaw.setSubId(tPssrSubcontent.getId());//子表id
+//                    result = materialRawController.export(materialRaw);
+//                    msg = (String) result.get("msg");
+//                    path = downloadPath + msg;
+//                    this.copyFileIgnoreException(path, rootPath + subTitle + msg, files, rootPath + subTitle + msg);
 //                    Files.copy(Paths.get(path), Paths.get(rootPath + subTitle + msg), StandardCopyOption.REPLACE_EXISTING);//拷贝导出的文件
 //                    files.add(new File(rootPath + subTitle + msg));
                     break;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrBlindController.java

@@ -252,7 +252,7 @@ public class TPssrBlindController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_04_盲板_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_04_盲板"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrCircuitController.java

@@ -250,7 +250,7 @@ public class TPssrCircuitController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_11_短接_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_11_短接"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

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

@@ -284,7 +284,7 @@ public class TPssrCleaningController extends BaseController {
                 sheet.addMergedRegion(cellRangeAddress6);
                 sheet.addMergedRegion(cellRangeAddress7);
             }
-            filename = "PSSR_07_设备清洁_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_07_设备清洁"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFrameController.java

@@ -242,7 +242,7 @@ public class TPssrFrameController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_21_支（吊）架_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_21_支（吊）架"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrFranklinismController.java

@@ -224,7 +224,7 @@ public class TPssrFranklinismController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_29_静电接地跨接_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_29_静电接地跨接"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrGasdetectorController.java

@@ -230,7 +230,7 @@ public class TPssrGasdetectorController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_30_气体检测仪_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_30_气体检测仪"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrHygieneController.java

@@ -219,7 +219,7 @@ public class TPssrHygieneController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_05_现场卫生_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_05_现场卫生"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrInstrumentCalibrationController.java

@@ -233,7 +233,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_23_仪表校验_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_23_仪表校验"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLaboratoryController.java

@@ -228,7 +228,7 @@ public class TPssrLaboratoryController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_10_实验室_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_10_实验室"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLightingController.java

@@ -147,9 +147,9 @@ public class TPssrLightingController extends BaseController {
                 rowIndex++;
             }
             if ("1".equals(LightingType)) {
-                filename =  "PSSR_28_照明_" + UUID.randomUUID().toString() + ".xlsx";
+                filename = "PSSR_28_照明"  + ".xlsx";
             } else {
-                filename =  "PSSR_28_电伴热_" + UUID.randomUUID().toString() + ".xlsx";
+                filename = "PSSR_28_电伴热"  + ".xlsx";
             }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrLockController.java

@@ -162,7 +162,7 @@ public class TPssrLockController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_09_锁开锁关阀门状态_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_09_锁开锁关阀门状态"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMaterialController.java

@@ -257,7 +257,7 @@ public class TPssrMaterialController extends BaseController {
             }
             rowIndex++;
 
-            filename =  "PSSR_19_原辅料_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_19_原辅料"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMeasureController.java

@@ -241,7 +241,7 @@ public class TPssrMeasureController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_06_人身防护_现场转动设备防护措施检查表_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_06_人身防护_现场转动设备防护措施检查表"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -157,7 +157,7 @@ public class TPssrMocController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_03_设计变更_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_03_设计变更"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMotorController.java

@@ -231,7 +231,7 @@ public class TPssrMotorController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_27_电机设备_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_27_电机设备"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrNitrogenController.java

@@ -241,7 +241,7 @@ public class TPssrNitrogenController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_12_氮气置换_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_12_氮气置换"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -161,19 +161,19 @@ public class TPssrOverhaulExchangerController extends BaseController {
             }
             switch (devType.toString()) {
                 case "1":
-                    filename = "PSSR_01_检修项目_换热器_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_换热器"  + ".xlsx";
                     break;
                 case "2":
-                    filename = "PSSR_01_检修项目_电仪_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_电仪"  + ".xlsx";
                     break;
                 case "3":
-                    filename = "PSSR_01_检修项目_反应器_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_反应器"  + ".xlsx";
                     break;
                 case "4":
-                    filename = "PSSR_01_检修项目_裂解炉_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_裂解炉"  + ".xlsx";
                     break;
                 case "5":
-                    filename = "PSSR_01_检修项目_其他_" + UUID.randomUUID().toString() + ".xlsx";
+                    filename = "PSSR_01_检修项目_其他"  + ".xlsx";
                     break;
             }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -323,7 +323,7 @@ public class TPssrOverhaulFilterController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_01_检修项目_过滤器_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_01_检修项目_过滤器"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulTowerController.java

@@ -313,7 +313,7 @@ public class TPssrOverhaulTowerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_01_检修项目_塔罐_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_01_检修项目_塔罐"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulValveController.java

@@ -326,7 +326,7 @@ public class TPssrOverhaulValveController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_01_检修项目_阀门_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_01_检修项目_阀门"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPipeController.java

@@ -197,7 +197,7 @@ public class TPssrPipeController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_22_压力管道_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_22_压力管道"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPowerController.java

@@ -144,7 +144,7 @@ public class TPssrPowerController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_26_临时电源_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_26_临时电源"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProgrammeController.java

@@ -143,7 +143,7 @@ public class TPssrProgrammeController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_02_开工方案_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_02_开工方案"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrProtectionController.java

@@ -231,7 +231,7 @@ public class TPssrProtectionController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_06_人身防护_现场管道和设备保温防护检查表_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_06_人身防护_现场管道和设备保温防护检查表"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPublicController.java

@@ -142,7 +142,7 @@ public class TPssrPublicController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_17_公用工程_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_17_公用工程"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpCleaningController.java

@@ -241,7 +241,7 @@ public class TPssrPumpCleaningController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_20_机泵_机泵过滤器清理工作清单_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_20_机泵_机泵过滤器清理工作清单"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -244,7 +244,7 @@ public class TPssrPumpFillController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_20_机泵_机泵润滑油加注确认清单_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_20_机泵_机泵润滑油加注确认清单"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpOverhaulController.java

@@ -238,7 +238,7 @@ public class TPssrPumpOverhaulController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_20_机泵_机泵检修完成确认清单_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_20_机泵_机泵检修完成确认清单"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -238,7 +238,7 @@ public class TPssrSafetyBleedController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_14_安全设施_泄放阀_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_14_安全设施_泄放阀"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBreathController.java

@@ -238,7 +238,7 @@ public class TPssrSafetyBreathController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_14_安全设施_呼吸阀_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_14_安全设施_呼吸阀"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -238,7 +238,7 @@ public class TPssrSafetyBrustController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_14_安全设施_爆破片_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_14_安全设施_爆破片"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyFlamearresterController.java

@@ -226,7 +226,7 @@ public class TPssrSafetyFlamearresterController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_14_安全设施_阻火器_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_14_安全设施_阻火器"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -165,7 +165,7 @@ public class TPssrSafetyValveController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_14_安全设施_安全阀_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_14_安全设施_安全阀"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrTorchvocController.java

@@ -149,9 +149,9 @@ public class TPssrTorchvocController extends BaseController {
                 rowIndex++;
             }
             if ("1".equals(torchvocType)) {
-                filename =  "PSSR_18_环保设施_火炬_" + UUID.randomUUID().toString() + ".xlsx";
+                filename = "PSSR_18_环保设施_火炬"  + ".xlsx";
             } else {
-                filename =  "PSSR_18_环保设施_VOC_" + UUID.randomUUID().toString() + ".xlsx";
+                filename = "PSSR_18_环保设施_VOC"  + ".xlsx";
             }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrVesselController.java

@@ -158,7 +158,7 @@ public class TPssrVesselController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename = "PSSR_22_压力容器_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_22_压力容器"  + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();

master/src/main/resources/mybatis/pssr/TPssrOverhaulFilterMapper.xml

@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="approveStatus"    column="approve_status"    />
         <result property="deptName" column="dept_name" />
         <result property="completionStatus" column="completion_status" />
+        <result property="changeClean" column="change_clean" />
     </resultMap>
 
     <sql id="selectTPssrOverhaulFilterVo">
-        select d.completion_status,d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_filter d
+        select d.completion_status,d.change_clean,d.id,u.NICK_NAME confirmer_name, d.sub_id, d.approve_id, d.plant, d.unit, d.strainer_location, d.pid_no, d.iso_dwg_no, d.flange_size, d.qty_num, d.completion_date, d.resp_person, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_filter d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u on u.user_id = d.resp_person
     </sql>
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="completionStatus != null "> and completion_status = #{completionStatus}</if>
+            <if test="changeClean != null "> and change_clean = #{changeClean}</if>
             <if test="searchValue != null "> and (pid_no like concat('%',concat(#{searchValue},'%')) or iso_dwg_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
         </where>
@@ -102,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="completionStatus != null">completion_status,</if>
+            <if test="changeClean != null">change_clean,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -125,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="completionStatus != null">#{completionStatus},</if>
+            <if test="changeClean != null">#{changeClean},</if>
          </trim>
     </insert>
 
@@ -161,6 +165,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="completionStatus != null">completion_status = #{completionStatus},</if>
+            <if test="changeClean != null">change_clean = #{changeClean},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/pssr/overhaulExchanger/index.vue

@@ -184,13 +184,13 @@
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
       <el-table-column label="PI&D图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
       <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
-      <el-table-column label="完成时间" align="center" prop="completionDate" >
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmedName" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认时间" align="center" prop="completionDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人" align="center" prop="confirmedName" :show-overflow-tooltip="true"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center"
@@ -241,12 +241,12 @@
         <el-form-item label="设备名称" prop="equipmentName">
           <el-input v-model="form.equipmentName" placeholder="请输入设备名称"/>
         </el-form-item>
+        <el-form-item label="P&ID图号" prop="pidNo">
+          <el-input v-model="form.pidNo" placeholder="请输入图号"/>
+        </el-form-item>
         <el-form-item label="检修内容" prop="workDes">
           <el-input v-model="form.workDes" placeholder="请输入检修内容"/>
         </el-form-item>
-        <el-form-item label="图号" prop="pidNo">
-          <el-input v-model="form.pidNo" placeholder="请输入图号"/>
-        </el-form-item>
         <el-form-item label="完成状态" prop="completionStatus">
           <el-radio-group v-model="form.completionStatus">
             <el-radio label="✔">✔</el-radio>
@@ -287,7 +287,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间"  v-hasPermi="['pssr:date:edit']" prop="completionDate">
+        <el-form-item label="确认时间"  v-hasPermi="['pssr:date:edit']" prop="completionDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.completionDate"
                           type="date"

ui/src/views/pssr/overhaulFilter/index.vue

@@ -162,20 +162,19 @@
           <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
         </template>
       </el-table-column>
-      <el-table-column label="装置" align="center" prop="plant" :show-overflow-tooltip="true"/>
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="过滤网位置" align="center" prop="strainerLocation" :show-overflow-tooltip="true"/>
       <el-table-column label="P&ID号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
       <el-table-column label="管线号" align="center" prop="isoDwgNo" :show-overflow-tooltip="true"/>
       <el-table-column label="法兰尺寸" align="center" prop="flangeSize" :show-overflow-tooltip="true"/>
-      <el-table-column label="QTY数量" align="center" prop="qtyNum" :show-overflow-tooltip="true"/>
-      <el-table-column label="完成日期" align="center" prop="completionDate" >
+      <el-table-column label="更换/清洗" align="center" prop="changeClean" :show-overflow-tooltip="true"/>
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认时间" align="center" prop="completionDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
-      <el-table-column label="负责人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center"
@@ -220,9 +219,6 @@
     <!-- 添加或修改检修项目-过滤器对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="装置" prop="plant">
-          <el-input v-model="form.plant" placeholder="请输入装置"/>
-        </el-form-item>
         <el-form-item label="单元" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入单元"/>
         </el-form-item>
@@ -238,8 +234,11 @@
         <el-form-item label="法兰尺寸" prop="flangeSize">
           <el-input v-model="form.flangeSize" placeholder="请输入法兰尺寸"/>
         </el-form-item>
-        <el-form-item label="QTY数量" prop="qtyNum">
-          <el-input v-model="form.qtyNum" placeholder="请输入QTY数量"/>
+        <el-form-item label="更换/清洗" prop="changeClean">
+          <el-radio-group v-model="form.changeClean">
+            <el-radio label="更换">更换</el-radio>
+            <el-radio label="清洗">清洗</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="完成状态" prop="completionStatus">
           <el-radio-group v-model="form.completionStatus">
@@ -247,7 +246,7 @@
             <el-radio label="✖">✖</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="负责人" prop="respPerson">
+        <el-form-item label="确认人" prop="respPerson">
           <el-select v-model="form.respPerson" clearable filterable style="width: 100%;"
                      placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
@@ -683,6 +682,7 @@ export default {
         flangeSize: null,
         qtyNum: null,
         completionStatus: null,
+        changeClean: null,
         completionDate: null,
         respPerson: null,
         delFlag: null,

ui/src/views/pssr/overhaulTower/index.vue

@@ -182,15 +182,15 @@
       </el-table-column>
       <el-table-column label="位号/管线号" align="center" prop="tagNo" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="equipmentName" :show-overflow-tooltip="true"/>
-      <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
       <el-table-column label="PI&D图号" align="center" prop="pidNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="完成时间" align="center" prop="completionDate" >
+      <el-table-column label="检修内容" align="center" prop="workDes" :show-overflow-tooltip="true"/>
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认时间" align="center" prop="completionDate" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.completionDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" v-if="isApprove==0"

ui/src/views/pssr/overhaulValve/index.vue

@@ -154,23 +154,21 @@
           <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus" :show-type="getTagType(scope.row.approveStatus)"/>
         </template>
       </el-table-column>
-      <el-table-column label="项目" align="center" prop="item" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="装置" align="center" prop="plant" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="阀门位置" align="center" prop="valvePosition" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="类型" align="center" prop="type" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="尺寸" align="center" prop="pipeSize" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="等级" align="center" prop="valveClass" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="图号" align="center" prop="pidNo" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="阀门位置" align="center" prop="valvePosition" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="PID图号" align="center" prop="pidNo" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="升级改型更换/更换/维修" align="center" prop="changeType" :show-overflow-tooltip="true"
                        width="180"/>
-      <el-table-column label="完成日期" align="center" prop="doneDate" width="100">
+      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
+      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
+                       width="180"/>
+      <el-table-column label="确认时间" align="center" prop="doneDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.doneDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="完成状态" align="center" prop="completionStatus" :show-overflow-tooltip="true"/>
-      <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
-                       width="180"/>
       <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
       <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0"
@@ -215,11 +213,8 @@
     <!-- 添加或修改检修项目-阀门对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
-        <el-form-item label="项目" prop="item">
-          <el-input v-model="form.item" placeholder="请输入项目"/>
-        </el-form-item>
-        <el-form-item label="装置" prop="plant">
-          <el-input v-model="form.plant" placeholder="请输入装置"/>
+        <el-form-item label="阀门位置" prop="valvePosition">
+          <el-input v-model="form.valvePosition" placeholder="请输入阀门位置"/>
         </el-form-item>
         <el-form-item label="类型" prop="type">
           <el-input v-model="form.type" placeholder="请输入类型"/>
@@ -230,12 +225,9 @@
         <el-form-item label="等级" prop="valveClass">
           <el-input v-model="form.valveClass" placeholder="请输入等级"/>
         </el-form-item>
-        <el-form-item label="图号" prop="pidNo">
+        <el-form-item label="PID图号" prop="pidNo">
           <el-input v-model="form.pidNo" placeholder="请输入图号"/>
         </el-form-item>
-        <el-form-item label="阀门位置" prop="valvePosition">
-          <el-input v-model="form.valvePosition" placeholder="请输入阀门位置"/>
-        </el-form-item>
         <el-form-item label="升级改型更换/更换/维修" prop="changeType">
           <el-select v-model="form.changeType" placeholder="请选择升级改型更换/更换/维修" clearable size="small">
             <el-option label="升级改型更换" value="升级改型更换"/>