LY

master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -332,7 +332,31 @@ public class THazardWorkPermitController extends BaseController {
         params.put("dEleCircuitNo", Texts.of(tHazardWorkPermit.getdEleCircuitNo()).fontSize(7).bold().create());
         // 1.3
         getCheck(params, tHazardWorkPermit.getdIsRadioactiveSources(), "dIsRadioactiveSources", "dIsRadioactiveSources2");
+        //E 栏
+            //1.是否可能有残留物料
+        getCheck(params, tHazardWorkPermit.geteIsPresent(), "eIsPresent", "eIsPresent2");
+        getCheck(params, tHazardWorkPermit.geteIsRequiredPpe(), "eIsRequiredPpe", "eIsRequiredPpe2");
+            //2.项目内容"
+        params.put("ePpeContent", Texts.of(tHazardWorkPermit.getePpeContent()).fontSize(7).bold().create());
+        getCheck(params, tHazardWorkPermit.geteIsSafeGoggles(), "eIsSafeGoggles", "eIsSafeGoggles2");
+        getCheck(params, tHazardWorkPermit.geteIsFaceShield(), "eIsFaceShield", "eIsFaceShield2");
+        getCheck(params, tHazardWorkPermit.geteIsProtectGloves(), "eIsProtectGloves", "eIsProtectGloves2");
+        params.put("eProtectGlovesContent", Texts.of(tHazardWorkPermit.geteProtectGlovesContent()).fontSize(7).bold().create());
 
+        getCheck(params, tHazardWorkPermit.geteIsRubberBoots(), "eIsRubberBoots", "eIsRubberBoots2");
+        getCheck(params, tHazardWorkPermit.geteIsRubberApron(), "eIsRubberApron", "eIsRubberApron2");
+        getCheck(params, tHazardWorkPermit.geteIsProtectSuit(), "eIsProtectSuit", "eIsProtectSuit2");
+        params.put("eProtectSuitContent", Texts.of(tHazardWorkPermit.geteProtectSuitContent()).fontSize(7).bold().create());
+            //2.7是否呼吸保护用品
+        getCheck(params, tHazardWorkPermit.geteIsResProtect(), "eIsResProtect", "eIsResProtect2");
+        params.put("eResProtectContent", Texts.of(tHazardWorkPermit.geteResProtectContent()).fontSize(7).bold().create());
+        getCheck(params, tHazardWorkPermit.geteIsFallArrest(), "eIsFallArrest", "eIsFallArrest2");
+        params.put("eFallArrestContent", Texts.of(tHazardWorkPermit.geteFallArrestContent()).fontSize(7).bold().create());
+            //2.9
+        getCheck(params, tHazardWorkPermit.geteIsOtherProtect(), "eIsOtherProtect", "eIsOtherProtect2");
+        params.put("eOtherProtectContent", Texts.of(tHazardWorkPermit.geteOtherProtectContent()).fontSize(7).bold().create());
+            //3.是否连续监控
+        getCheck(params, tHazardWorkPermit.geteIsContinueMonitoring(), "eIsContinueMonitoring", "eIsContinueMonitoring2");
 
         return params;
     }

master/src/main/resources/processes/reserveInvoice.bpmn

@@ -70,24 +70,24 @@
     </sequenceFlow>
     <boundaryEvent id="boundarytimer3" name=" " attachedToRef="zzzgtask" cancelActivity="true">
       <timerEventDefinition>
-        <timeDuration>PT2M</timeDuration>
+        <timeDuration>PT72H</timeDuration>
       </timerEventDefinition>
     </boundaryEvent>
     <sequenceFlow id="flow30" sourceRef="boundarytimer3" targetRef="end1"></sequenceFlow>
     <boundaryEvent id="boundarytimer4" name=" " attachedToRef="zzgcstask" cancelActivity="true">
       <timerEventDefinition>
-        <timeDuration>PT2M</timeDuration>
+        <timeDuration>PT72H</timeDuration>
       </timerEventDefinition>
     </boundaryEvent>
     <boundaryEvent id="boundarytimer5" name=" " attachedToRef="zzjltask" cancelActivity="true">
       <timerEventDefinition>
-        <timeDuration>PT2M</timeDuration>
+        <timeDuration>PT72H</timeDuration>
       </timerEventDefinition>
     </boundaryEvent>
     <sequenceFlow id="flow32" sourceRef="boundarytimer5" targetRef="end1"></sequenceFlow>
     <boundaryEvent id="boundarytimer6" name=" " attachedToRef="yhzgtask" cancelActivity="true">
       <timerEventDefinition>
-        <timeDuration>PT2M</timeDuration>
+        <timeDuration>PT72H</timeDuration>
       </timerEventDefinition>
     </boundaryEvent>
     <sequenceFlow id="flow35" sourceRef="boundarytimer6" targetRef="end1"></sequenceFlow>
@@ -246,4 +246,4 @@
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</definitions>
+</definitions>

ui/.env.development

@@ -3,7 +3,7 @@ ENV = 'development'
 
 # 开票管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
-#VUE_APP_BASE_API = 'http://47.114.101.16:8090'
+#VUE_APP_BASE_API = 'http://47.114.101.16/cpms'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

ui/src/lang/zh.js

@@ -1,8 +1,8 @@
 // zh.js
 export default {
   login: {
-    title: '开票管理系统',
-    logo: '开票管理系统',
+    title: '电子工作票管理系统',
+    logo: '电子工作票管理系统',
     logIn: '登  录',
     username: '账号',
     password: '密码',

ui/src/layout/components/Sidebar/Logo.vue

@@ -26,7 +26,7 @@ export default {
   },
   data() {
     return {
-      title: '开票管理系统',
+      title: '电子工作票管理系统',
       logo: logoImg
     }
   }

ui/src/views/index.vue

@@ -4,7 +4,7 @@
       <el-row :gutter="10">
         <el-col :xs="24" :sm="24" :lg="24">
           <div style="text-align: center">
-            <div style="color: white;font-size: 25px;cursor:default">开票系统</div>
+            <div style="color: white;font-size: 25px;cursor:default">电子工作票管理系统</div>
           </div>
         </el-col>
       </el-row>