巡检修改导出模板

洗眼器修改字段顺序和字段名

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

@@ -106,7 +106,7 @@ public class TCommonuseBicycleController extends BaseController {
 
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.24  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.24  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 16, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 16));//合并
             //第二行

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

@@ -93,7 +93,7 @@ public class TCommonuseDownspoutController extends BaseController {
             sheet.setColumnWidth(5, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.28  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.28  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 5, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 5));//合并
             //第二行

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

@@ -94,7 +94,7 @@ public class TCommonuseEarplugController extends BaseController {
             sheet.setColumnWidth(6, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.22  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.22  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 6, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));//合并
             //第二行

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

@@ -100,7 +100,7 @@ public class TCommonuseManholeCoverController extends BaseController {
             ;
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.25  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.25  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 11, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 11));//合并
             //第二行

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

@@ -101,7 +101,7 @@ public class TCommonuseMovementController extends BaseController {
             sheet.setColumnWidth(8, 3500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.23  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.23  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 8, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));//合并
             //第二行

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

@@ -95,7 +95,7 @@ public class TCommonuseSafetyBeltController extends BaseController {
             sheet.setColumnWidth(7, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.27  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.27  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 7, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
             //第二行

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

@@ -101,7 +101,7 @@ public class TCommonuseTesterController extends BaseController {
             sheet.setColumnWidth(7, 3500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.21  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.21  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 7, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
             //第二行

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

@@ -95,7 +95,7 @@ public class TCommonuseWalkieTalkieController extends BaseController {
             sheet.setColumnWidth(7, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.26  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.26  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 7, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
             //第二行

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

@@ -94,7 +94,7 @@ public class TCommonuseWaterPumpController extends BaseController {
             sheet.setColumnWidth(6, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.29  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.29  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 6, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));//合并
             //第二行

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

@@ -187,7 +187,7 @@ public class TEmergencyCabinetController extends BaseController {
         sheet.setColumnWidth(7, 3500);
         //第一行
         XSSFRow row1 = sheet.createRow(0);
-        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.07  Rev:04  2021/10/01");
+        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.07  Rev:05  2025/8/11");
         ExcelUtils.createVoidCell(1, 7, row1);
         sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
         //第二行
@@ -307,7 +307,7 @@ public class TEmergencyCabinetController extends BaseController {
         sheet.setColumnWidth(7, 3500);
         //第一行
         XSSFRow row1 = sheet.createRow(0);
-        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.08  Rev:04  2021/10/01");
+        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.08  Rev:05  2025/8/11");
         ExcelUtils.createVoidCell(1, 7, row1);
         sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
         //第二行

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

@@ -95,7 +95,7 @@ public class TEmergencyCctvController extends BaseController {
             sheet.setColumnWidth(6, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.13  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.13  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 6, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));//合并
             //第二行

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

@@ -94,7 +94,7 @@ public class TEmergencyCofferdamController extends BaseController {
             sheet.setColumnWidth(6, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.20  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.20  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 6, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));//合并
             //第二行

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

@@ -105,7 +105,7 @@ public class TEmergencyEyewashController extends BaseController {
         sheet.setColumnWidth(15, 2560);
         //第一行
         XSSFRow row1 = sheet.createRow(0);
-        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.14  Rev:04  2021/10/01");
+        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.14  Rev:05  2025/8/11");
         ExcelUtils.createVoidCell(1, 15, row1);
         sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 15));//合并
         //第二行

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

@@ -101,7 +101,7 @@ public class TEmergencyPagaController extends BaseController {
             sheet.setColumnWidth(7, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.12  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.12  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 7, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
             //第二行

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

@@ -104,7 +104,7 @@ public class TFireAlarmController extends BaseController {
             sheet.setColumnWidth(7, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.10  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.10  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 7, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
             //第二行

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

@@ -106,7 +106,7 @@ public class TFireAnnihilatorController extends BaseController {
         sheet.setColumnWidth(10, 3500);
         //第一行
         XSSFRow row1 = sheet.createRow(0);
-        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.01  Rev:04  2021/10/01");
+        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.01  Rev:05  2025/8/11");
         ExcelUtils.createVoidCell(1, 10, row1);
         sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 10));//合并
         //第二行

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

@@ -179,7 +179,7 @@ public class TFireDoorController extends BaseController {
         sheet.setColumnWidth(8, 4500);
         //第一行
         XSSFRow row1 = sheet.createRow(0);
-        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.1" + val + "  Rev:04  2021/10/01");
+        row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.1" + val + "  Rev:05  2025/8/11");
         ExcelUtils.createVoidCell(1, 8, row1);
         sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));//合并
         //第二行

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

@@ -102,7 +102,7 @@ public class TFireGasShieldController extends BaseController {
             sheet.setColumnWidth(10, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.11  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.11  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 10, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 10));//合并
             //第二行

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

@@ -101,7 +101,7 @@ public class TFireHoseBoxController extends BaseController {
             sheet.setColumnWidth(8, 3500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.04  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.04  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 8, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));//合并
             //第二行

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

@@ -101,7 +101,7 @@ public class TFirePostFireController extends BaseController {
             sheet.setColumnWidth(8, 3500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.03  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.03  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 8, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));//合并
             //第二行

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

@@ -98,7 +98,7 @@ public class TFireSandboxController extends BaseController {
             sheet.setColumnWidth(6, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.15  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.15  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 6, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));//合并
             //第二行

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

@@ -102,7 +102,7 @@ public class TFireSprinklerController extends BaseController {
             sheet.setColumnWidth(10, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.06  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.06  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 10, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 10));//合并
             //第二行

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

@@ -99,7 +99,7 @@ public class TFireStandpipeController extends BaseController {
             sheet.setColumnWidth(7, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.05  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.05  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 7, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 7));//合并
             //第二行

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

@@ -98,7 +98,7 @@ public class TFireSteamCurtainController extends BaseController {
             sheet.setColumnWidth(6, 4500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.19  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.19  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 6, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 6));//合并
             //第二行

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

@@ -101,7 +101,7 @@ public class TFireWaterCannonController extends BaseController {
             sheet.setColumnWidth(8, 3500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.02  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.02  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 8, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));//合并
             //第二行

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

@@ -105,7 +105,7 @@ public class TFireWeathervaneController extends BaseController {
             sheet.setColumnWidth(8, 3500);
             //第一行
             XSSFRow row1 = sheet.createRow(0);
-            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.18  Rev:04  2021/10/01");
+            row1.createCell(0).setCellValue("CBP-6.3.0-SCFSH-020.18  Rev:05  2025/8/11");
             ExcelUtils.createVoidCell(1, 8, row1);
             sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 8));//合并
             //第二行

ui/src/views/patrol/emergency/eyewash/index.vue

@@ -83,6 +83,11 @@
       <el-table-column align="center" fixed="left" type="selection" width="55"/>
       <el-table-column align="center" fixed="left" label="位号" prop="devNo" width="150"/>
       <el-table-column align="center" fixed="left" label="位置" prop="position" width="150"/>
+      <el-table-column align="center" label="洗眼器测试前已通知ERC" prop="noticed" width="255">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.inspection_status" :value="scope.row.noticed"/>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="洗眼器标识醒目并处于良好状况" prop="identifying" width="255">
         <template slot-scope="scope">
             <dict-tag :options="dict.type.inspection_status" :value="scope.row.identifying"/>
@@ -127,6 +132,11 @@
                     fit="cover" style="height: 50px;border-radius: 10px;margin-top: 5px"/>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="洗眼器手推板、脚踏板及喷淋拉杆灵活，能保持全开" prop="keepOpen" width="255">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.inspection_status" :value="scope.row.keepOpen"/>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="洗眼器从出水点起高度在10-30厘米并均匀流动" prop="exitPoint" width="255">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.inspection_status" :value="scope.row.exitPoint"/>
@@ -143,21 +153,11 @@
           <dict-tag :options="dict.type.inspection_status" :value="scope.row.exitClean"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="洗眼器出水温度不高于25℃" prop="exitTemp" width="255">
+      <el-table-column align="center" label="洗眼器出水温度适宜" prop="exitTemp" width="255">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.inspection_status" :value="scope.row.exitTemp"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="洗眼器手推板、脚踏板及喷淋拉杆灵活，能保持全开" prop="keepOpen" width="255">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.inspection_status" :value="scope.row.keepOpen"/>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="洗眼器测试前已通知ERC" prop="noticed" width="255">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.inspection_status" :value="scope.row.noticed"/>
-        </template>
-      </el-table-column>
       <el-table-column align="center" label="现场声光报警装置工作正常" prop="normalOperation" width="255">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.inspection_status" :value="scope.row.normalOperation"/>