Merge remote-tracking branch 'origin/master'

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

@@ -1,7 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -303,13 +302,11 @@ public class TPssrApproveController extends BaseController {
 
 
         TStaffmgr tStaffmgr = new TStaffmgr();
-        tStaffmgr.setActualposts("24,26");
-        StringBuilder executor = new StringBuilder();
+        tStaffmgr.setActualposts("24");
+        tStaffmgr.setDeptId(103L);
+        String executor = "";
         for (SysUser user : userService.selectUserPost(tStaffmgr)) {
-            executor.append(user.getUserId().toString()).append(",");
-        }
-        if (StringUtils.isNotEmpty(executor.toString())) {
-            executor = new StringBuilder(executor.substring(0, executor.length() - 1));
+            executor = user.getUserId().toString();
         }
 
         // 开始申请流程
@@ -408,7 +405,11 @@ public class TPssrApproveController extends BaseController {
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
             historyService.deleteHistoricProcessInstance(approve.getProcessId());
 
             // 开始申请流程
@@ -488,7 +489,11 @@ public class TPssrApproveController extends BaseController {
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
             historyService.deleteHistoricProcessInstance(approve.getProcessId());
 
             tPssrBlind = new TPssrBlind();
@@ -534,7 +539,6 @@ public class TPssrApproveController extends BaseController {
         TPssrLock tPssrLock = new TPssrLock();
         tPssrLock.setApproveStatus(0L);
         tPssrLock.setSubId(sub.getId());
-        Set<String> unlockers = new HashSet<>();
         Set<String> lockeders = new HashSet<>();
         Set<String> confirmers = new HashSet<>();
         for (TPssrLock item : tPssrLockService.selectTPssrLockList(tPssrLock)) {
@@ -543,13 +547,10 @@ public class TPssrApproveController extends BaseController {
             item.setUpdaterCode(userId);
             tPssrLockService.updateTPssrLock(item);
 
-            // 拆锁人员
-            unlockers.add(item.getUnlocker());
-
-            // 上锁人员
+            // 确认人1
             lockeders.add(item.getLockeder());
 
-            // 确认人
+            // 确认人2
             confirmers.add(item.getConfirm());
         }
 
@@ -573,19 +574,18 @@ public class TPssrApproveController extends BaseController {
             Authentication.setAuthenticatedUserId(userId);//设置当前申请人
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(unlockers));
-            variables.put("confirmUsers2", new ArrayList<>(lockeders));
-            variables.put("confirmUsers3", new ArrayList<>(confirmers));
+            variables.put("confirmUsers1", new ArrayList<>(lockeders));
+            variables.put("confirmUsers2", new ArrayList<>(confirmers));
             variables.put("chargePerson", sub.getConfirm());
             //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr3confirm", String.valueOf(businessKey), variables);
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
             approve.setProcessId(pi.getProcessInstanceId());
             tPssrApproveService.updateTPssrApprove(approve);
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
             try {
-                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr3confirm");
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
             } catch (Exception e) {
                 logger.info("无运行时流程");
             }
@@ -596,14 +596,10 @@ public class TPssrApproveController extends BaseController {
             tPssrLock.setSubId(sub.getId());
             for (TPssrLock item : tPssrLockService.selectTPssrLockList(tPssrLock)) {
 
-
-                // 拆锁人员
-                unlockers.add(item.getUnlocker());
-
-                // 上锁人员
+                // 确认人1
                 lockeders.add(item.getLockeder());
 
-                // 确认人
+                // 确认人2
                 confirmers.add(item.getConfirm());
             }
 
@@ -613,12 +609,11 @@ public class TPssrApproveController extends BaseController {
             Authentication.setAuthenticatedUserId(userId);//设置当前申请人
             Map<String, Object> variables = new HashMap<>();
             variables.put("applyUser", userId);
-            variables.put("confirmUsers1", new ArrayList<>(unlockers));
-            variables.put("confirmUsers2", new ArrayList<>(lockeders));
-            variables.put("confirmUsers3", new ArrayList<>(confirmers));
+            variables.put("confirmUsers1", new ArrayList<>(lockeders));
+            variables.put("confirmUsers2", new ArrayList<>(confirmers));
             variables.put("chargePerson", sub.getConfirm());
             //采用key来启动流程定义并设置流程变量，返回流程实例
-            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr3confirm", String.valueOf(businessKey), variables);
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr2confirm", String.valueOf(businessKey), variables);
             approve.setProcessId(pi.getProcessInstanceId());
             tPssrApproveService.updateTPssrApprove(approve);
         }
@@ -679,7 +674,11 @@ public class TPssrApproveController extends BaseController {
         } else {
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr2confirm");
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
             historyService.deleteHistoricProcessInstance(approve.getProcessId());
 
             tPssrPipe = new TPssrPipe();

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

@@ -264,7 +264,7 @@ public class TPssrBlindController extends BaseController {
             for (Long id : tPssrBlind.getIds()) {
                 TPssrBlind blind = new TPssrBlind();
                 blind.setId(id);
-                blind.setApproveStatus(tPssrBlind.getApproveStatus());
+                blind.setApproveStatus(1L);
                 blind.setUpdatedate(new Date());
                 blind.setUpdaterCode(getUserId().toString());
                 tPssrBlindService.updateTPssrBlind(blind);
@@ -280,23 +280,26 @@ public class TPssrBlindController extends BaseController {
                     .processInstanceId(approve.getProcessId()).singleResult();
             String taskId = task.getId();
 
-            // 根据审批状态判断应驳回至哪一步
-            String condition = "0";
-            if (tPssrBlind.getApproveStatus() == 1) {
-                condition = "1";//确认人1
-            } else if (tPssrBlind.getApproveStatus() == 2) {
-                condition = "2";//确认人2
-            } else if (tPssrBlind.getApproveStatus() == 3) {
-                condition = "3";//确认人3
-            }
-
             //处理流程节点
             Map<String, Object> param = new HashMap<>();
-            param.put("condition", condition);
+            param.put("condition", 1);
             //认领任务
             processEngine.getTaskService().claim(taskId, userId);
-            taskService.addComment(taskId, approve.getProcessId(), "驳回至确认人" + condition);
+            taskService.addComment(taskId, approve.getProcessId(), "驳回至拆除" + tPssrBlind.getRemarks());
             taskService.complete(taskId, param);
+
+            // 修改审批表和sub表
+            approve.setApproveStatus(1L);
+            approve.setUpdatedate(new Date());
+            approve.setUpdaterCode(getUserId().toString());
+            tPssrApproveService.updateTPssrApprove(approve);
+
+            TPssrSubcontent subcontent = new TPssrSubcontent();
+            subcontent.setId(approve.getSubId());
+            subcontent.setApproveStatus(1L);
+            subcontent.setUpdatedate(new Date());
+            subcontent.setUpdaterCode(getUserId().toString());
+            tPssrSubcontentService.updateTPssrSubcontent(subcontent);
             return AjaxResult.success();
         }
         return AjaxResult.error();

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsApproveController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -11,7 +12,9 @@ import com.ruoyi.project.plant.domain.TStaffmgr;
 import com.ruoyi.project.plant.mapper.TStaffmgrMapper;
 import com.ruoyi.project.shiftmgr.domain.TShiftRoster;
 import com.ruoyi.project.shiftmgr.mapper.TShiftRosterMapper;
+import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.project.system.service.impl.SysUserServiceImpl;
 import com.ruoyi.project.training.bccnew.domain.*;
 import com.ruoyi.project.training.bccnew.service.*;
 import org.activiti.engine.ProcessEngine;
@@ -79,6 +82,10 @@ public class TTsApproveController extends BaseController {
 
     @Autowired
     private TStaffmgrMapper tStaffmgrMapper;
+    @Autowired
+    private SysUserServiceImpl sysUserService;
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
 
 
     /**
@@ -182,40 +189,49 @@ public class TTsApproveController extends BaseController {
         String processInstancesId = task.getProcessInstanceId();
         String userId = getUserId().toString();
         // 判断流程
+        Long newId = null;
         if ("1".equals(devTask.getCondition())) {
             devTask.setComment("补考");
                 switch (tTsApprove.getPlanType()) {
                     case "1": {
                         TTsLjplan item = tTsLjplanService.selectTTsLjplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setScorePass(1);
                         tTsLjplanService.updateTTsLjplan(item);
                         break;
                     }
                     case "2": {
                         TTsYsplan item = tTsYsplanService.selectTTsYsplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setScorePass(1);
                         tTsYsplanService.updateTTsYsplan(item);
                         break;
                     }
                     case "3": {
                         TTsFlplan item = tTsFlplanService.selectTTsFlplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setScorePass(1);
                         tTsFlplanService.updateTTsFlplan(item);
                         break;
                     }
                     case "4": {
                         TTsFtplan item = tTsFtplanService.selectTTsFtplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setScorePass(1);
                         tTsFtplanService.updateTTsFtplan(item);
                         break;
                     }
                 }
+            SysUser staff = sysUserService.selectUserByStaffId(tTsNewService.selectTTsNewById(newId).getStaffId());
+            jiGuangPushService.send("导师带徒-导师带徒级培训", "您有待补考的培训课程", staff.getUserId().toString());
+
         } else if ("0".equals(devTask.getCondition())) {
             devTask.setComment("重新学习");
                 switch (tTsApprove.getPlanType()) {
                     case "1": {
                         //查询旧数据
                         TTsLjplan item = tTsLjplanService.selectTTsLjplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setPlanStatus(1L);
                         tTsLjplanService.updateTTsLjplan(item);
                         TTsLjplanContent contentItem = new TTsLjplanContent();
@@ -279,6 +295,7 @@ public class TTsApproveController extends BaseController {
                     case "2": {
                         //查询旧数据
                         TTsYsplan item = tTsYsplanService.selectTTsYsplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setPlanStatus(1L);
                         tTsYsplanService.updateTTsYsplan(item);
                         TTsYsplanContent contentItem = new TTsYsplanContent();
@@ -342,6 +359,7 @@ public class TTsApproveController extends BaseController {
                     case "3": {
                         //查询旧数据
                         TTsFlplan item = tTsFlplanService.selectTTsFlplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setPlanStatus(1L);
                         tTsFlplanService.updateTTsFlplan(item);
                         TTsFlplanContent contentItem = new TTsFlplanContent();
@@ -405,6 +423,7 @@ public class TTsApproveController extends BaseController {
                     case "4": {
                         //查询旧数据
                         TTsFtplan item = tTsFtplanService.selectTTsFtplanById(tTsApprove.getContentId());
+                        newId= item.getNewId();
                         item.setPlanStatus(1L);
                         tTsFtplanService.updateTTsFtplan(item);
                         TTsFtplanContent contentItem = new TTsFtplanContent();
@@ -466,6 +485,8 @@ public class TTsApproveController extends BaseController {
                         break;
                     }
                 }
+            SysUser staff = sysUserService.selectUserByStaffId(tTsNewService.selectTTsNewById(newId).getStaffId());
+            jiGuangPushService.send("导师带徒-导师带徒级培训", "您有待重新学习的培训课程", staff.getUserId().toString());
         }
         // 处理流程节点
         Map<String, Object> param = new HashMap<>();

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFirstplanController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -48,6 +49,8 @@ public class TTsFirstplanController extends BaseController {
 
     @Autowired
     private ITTsApproveService tTsApproveService;
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
 
     /**
      * 查询进组培训列表
@@ -62,7 +65,7 @@ public class TTsFirstplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                if(i < list.size() - 1) {
+                if (i < list.size() - 1) {
                     list.get(i + 1).setStudy(1);
                 }
             }
@@ -87,7 +90,7 @@ public class TTsFirstplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                if(i < list.size() - 1) {
+                if (i < list.size() - 1) {
                     list.get(i + 1).setStudy(1);
                 }
             }
@@ -163,6 +166,15 @@ public class TTsFirstplanController extends BaseController {
                     need.setTimerNeed(0.0);
                 if (need.getTimerNeed() != null && need.getTimerNeed() <= timer + 1 && need.getPlanStatus() == 0) {
                     need.setPlanStatus(2L);
+                    if (need.getExamType().equals("线下考试")){
+                        sysUser = new SysUser();
+                        sysUser.setNickName(need.getTrainer());
+                        for (SysUser trainer : sysUserService.selectUserList(sysUser)) {
+                            sysUser = new SysUser();
+                            SysUser staff = sysUserService.selectUserByStaffId(tTsNew.getStaffId());
+                            jiGuangPushService.send("导师带徒-装置级培训", staff.getNickName() + "的学习已完成，请进行线下考试，并上传成绩。", trainer.getUserId().toString());
+                        }
+                    }
                 }
             }
             tTsFirstplanService.updateTTsFirstplan(need);
@@ -194,6 +206,13 @@ public class TTsFirstplanController extends BaseController {
                 return AjaxResult.error("仅讲师可确认成绩！");
             }
             tTsFirstplan.setTrainerConfirm(getNickName());
+
+
+            TTsNew tsNew = tTsNewService.selectTTsNewById(tTsFirstplan.getNewId());
+            SysUser sysUser = new SysUser();
+            SysUser staff = sysUserService.selectUserByStaffId(tsNew.getStaffId());
+            jiGuangPushService.send("导师带徒-装置级培训", "讲师已确认您"+tTsFirstplan.getTopic()+"的成绩，请您确认成绩后继续下一项培训。", staff.getUserId().toString());
+
         }
         if ("1".equals(tTsFirstplan.getStudentConfirm())) {
             tTsFirstplan.setStudentConfirm(getNickName());

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFlplanController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -45,6 +46,9 @@ public class TTsFlplanController extends BaseController {
     @Autowired
     private ITTsApproveService tTsApproveService;
 
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
+
     /**
      * 查询分离培训列表
      */
@@ -96,7 +100,7 @@ public class TTsFlplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                if(i < list.size() - 1) {
+                if (i < list.size() - 1) {
                     list.get(i + 1).setStudy(1);
                 }
             }
@@ -121,7 +125,7 @@ public class TTsFlplanController extends BaseController {
             }
             if ((list.get(i).getPlanStatus() == 5 || list.get(i).getPlanStatus() == 1) && i <= list.size() - 1) {
                 list.get(i).setStudy(1);
-                if(i < list.size() - 1) {
+                if (i < list.size() - 1) {
                     list.get(i + 1).setStudy(1);
                 }
             }
@@ -185,6 +189,15 @@ public class TTsFlplanController extends BaseController {
                     need.setPlanStatus(2L);
                 }
             }
+
+
+            sysUser = new SysUser();
+            sysUser.setNickName(need.getTrainer());
+            SysUser trainer = sysUserService.selectUserByStaffId(tTsNew.getMentorStaffId());
+            sysUser = new SysUser();
+            SysUser staff = sysUserService.selectUserByStaffId(tTsNew.getStaffId());
+            jiGuangPushService.send("导师带徒-导师带徒（分离）培训", staff.getNickName() + "的学习已完成，请进行线下考试，并上传成绩。", trainer.getUserId().toString());
+
             tTsFlplanService.updateTTsFlplan(need);
             return AjaxResult.success(need.getTimer());
         }
@@ -208,13 +221,17 @@ public class TTsFlplanController extends BaseController {
             }
         }
         TTsFlplan flplan = tTsFlplanService.selectTTsFlplanById(tTsFlplan.getId());
+
+        SysUser staff = sysUserService.selectUserByStaffId(tTsNewService.selectTTsNewById(flplan.getNewId()).getStaffId());
         if ("好".equals(tTsFlplan.getScore1())) {
             tTsFlplan.setPlanStatus(5L);
+            jiGuangPushService.send("导师带徒-导师带徒（分离）培训", "您的成绩为——好，可以进行下一项培训啦！", staff.getUserId().toString());
         }
         if ((("满意".equals(tTsFlplan.getScore1()) || "差".equals(tTsFlplan.getScore1())) && tTsFlplan.getScore2() == null) ||
                 (("满意".equals(tTsFlplan.getScore2()) || "差".equals(tTsFlplan.getScore2())) && tTsFlplan.getScore3() == null)) {
             tTsFlplan.setScorePass(0);
             tTsApproveService.doApprove(flplan.getId(), "3", getUserId(), getNickName(), "dsdtNoPass");
+            jiGuangPushService.send("导师带徒-导师带徒（分离）培训", "本次考试不合格，请等待经理审批后再次进行线下考试", staff.getUserId().toString());
         }
         if (("满意".equals(tTsFlplan.getScore1()) || "满意".equals(flplan.getScore1())) && "好".equals(tTsFlplan.getScore2())) {
             tTsFlplan.setPlanStatus(5L);

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsFtplanController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -44,6 +45,8 @@ public class TTsFtplanController extends BaseController {
 
     @Autowired
     private ITTsApproveService tTsApproveService;
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
 
     /**
      * 查询芳烃培训列表
@@ -184,6 +187,15 @@ public class TTsFtplanController extends BaseController {
                     need.setPlanStatus(2L);
                 }
             }
+
+
+            sysUser = new SysUser();
+            sysUser.setNickName(need.getTrainer());
+            SysUser trainer = sysUserService.selectUserByStaffId(tTsNew.getMentorStaffId());
+            sysUser = new SysUser();
+            SysUser staff = sysUserService.selectUserByStaffId(tTsNew.getStaffId());
+            jiGuangPushService.send("导师带徒-导师带徒（芳烃）培训", staff.getNickName() + "的学习已完成，请进行线下考试，并上传成绩。", trainer.getUserId().toString());
+
             tTsFtplanService.updateTTsFtplan(need);
             return AjaxResult.success(need.getTimer());
         }
@@ -207,12 +219,15 @@ public class TTsFtplanController extends BaseController {
             }
         }
         TTsFtplan ftplan = tTsFtplanService.selectTTsFtplanById(tTsFtplan.getId());
+        SysUser staff = sysUserService.selectUserByStaffId(tTsNewService.selectTTsNewById(ftplan.getNewId()).getStaffId());
         if ("好".equals(tTsFtplan.getScore1())) {
             tTsFtplan.setPlanStatus(5L);
+            jiGuangPushService.send("导师带徒-导师带徒（芳烃）培训", "您的成绩为——好，可以进行下一项培训啦！", staff.getUserId().toString());
         }
         if ((("满意".equals(tTsFtplan.getScore1()) || "差".equals(tTsFtplan.getScore1())) && tTsFtplan.getScore2() == null) ||
                 (("满意".equals(tTsFtplan.getScore2()) || "差".equals(tTsFtplan.getScore2())) && tTsFtplan.getScore3() == null)) {
             tTsFtplan.setScorePass(0);
+            jiGuangPushService.send("导师带徒-导师带徒（芳烃）培训", "本次考试不合格，请等待经理审批后再次进行线下考试", staff.getUserId().toString());
             tTsApproveService.doApprove(ftplan.getId(), "4", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsFtplan.getScore1()) || "满意".equals(ftplan.getScore1())) && "好".equals(tTsFtplan.getScore2())) {

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsLjplanController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -44,6 +45,8 @@ public class TTsLjplanController extends BaseController {
 
     @Autowired
     private ITTsApproveService tTsApproveService;
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
 
     /**
      * 查询裂解培训列表
@@ -188,6 +191,15 @@ public class TTsLjplanController extends BaseController {
                     need.setPlanStatus(2L);
                 }
             }
+
+
+            sysUser = new SysUser();
+            sysUser.setNickName(need.getTrainer());
+            SysUser trainer = sysUserService.selectUserByStaffId(tTsNew.getMentorStaffId());
+            sysUser = new SysUser();
+            SysUser staff = sysUserService.selectUserByStaffId(tTsNew.getStaffId());
+            jiGuangPushService.send("导师带徒-导师带徒（裂解）培训", staff.getNickName() + "的学习已完成，请进行线下考试，并上传成绩。", trainer.getUserId().toString());
+
             tTsLjplanService.updateTTsLjplan(need);
             return AjaxResult.success(need.getTimer());
         }
@@ -212,12 +224,18 @@ public class TTsLjplanController extends BaseController {
             }
         }
         TTsLjplan ljplan = tTsLjplanService.selectTTsLjplanById(tTsLjplan.getId());
+
+        SysUser staff = sysUserService.selectUserByStaffId(tTsNewService.selectTTsNewById(ljplan.getNewId()).getStaffId());
+
         if ("好".equals(tTsLjplan.getScore1())) {
             tTsLjplan.setPlanStatus(5L);
+            jiGuangPushService.send("导师带徒-导师带徒（裂解）培训", "您的成绩为——好，可以进行下一项培训啦！", staff.getUserId().toString());
+
         }
         if ((("满意".equals(tTsLjplan.getScore1()) || "差".equals(tTsLjplan.getScore1())) && tTsLjplan.getScore2() == null) ||
                 (("满意".equals(tTsLjplan.getScore2()) || "差".equals(tTsLjplan.getScore2())) && tTsLjplan.getScore3() == null)) {
             tTsLjplan.setScorePass(0);
+            jiGuangPushService.send("导师带徒-导师带徒（裂解）培训", "本次考试不合格，请等待经理审批后再次进行线下考试", staff.getUserId().toString());
             tTsApproveService.doApprove(ljplan.getId(), "1", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsLjplan.getScore1()) || "满意".equals(ljplan.getScore1())) && "好".equals(tTsLjplan.getScore2())) {

master/src/main/java/com/ruoyi/project/training/bccnew/controller/TTsYsplanController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.controller;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -44,6 +45,8 @@ public class TTsYsplanController extends BaseController {
 
     @Autowired
     private ITTsApproveService tTsApproveService;
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
 
     /**
      * 查询转岗培训列表
@@ -186,6 +189,15 @@ public class TTsYsplanController extends BaseController {
                     need.setPlanStatus(2L);
                 }
             }
+
+
+            sysUser = new SysUser();
+            sysUser.setNickName(need.getTrainer());
+            SysUser trainer = sysUserService.selectUserByStaffId(tTsNew.getMentorStaffId());
+            sysUser = new SysUser();
+            SysUser staff = sysUserService.selectUserByStaffId(tTsNew.getStaffId());
+            jiGuangPushService.send("导师带徒-导师带徒（压缩）培训", staff.getNickName() + "的学习已完成，请进行线下考试，并上传成绩。", trainer.getUserId().toString());
+
             tTsYsplanService.updateTTsYsplan(need);
             return AjaxResult.success(need.getTimer());
         }
@@ -209,12 +221,17 @@ public class TTsYsplanController extends BaseController {
             }
         }
         TTsYsplan ysplan = tTsYsplanService.selectTTsYsplanById(tTsYsplan.getId());
+        SysUser staff = sysUserService.selectUserByStaffId(tTsNewService.selectTTsNewById(ysplan.getNewId()).getStaffId());
+
         if ("好".equals(tTsYsplan.getScore1())) {
             tTsYsplan.setPlanStatus(5L);
+            jiGuangPushService.send("导师带徒-导师带徒（压缩）培训", "您的成绩为——好，可以进行下一项培训啦！", staff.getUserId().toString());
+
         }
         if ((("满意".equals(tTsYsplan.getScore1()) || "差".equals(tTsYsplan.getScore1())) && tTsYsplan.getScore2() == null) ||
                 (("满意".equals(tTsYsplan.getScore2()) || "差".equals(tTsYsplan.getScore2())) && tTsYsplan.getScore3() == null)) {
             tTsYsplan.setScorePass(0);
+            jiGuangPushService.send("导师带徒-导师带徒（压缩）培训", "本次考试不合格，请等待经理审批后再次进行线下考试", staff.getUserId().toString());
             tTsApproveService.doApprove(ysplan.getId(), "2", getUserId(), getNickName(), "dsdtNoPass");
         }
         if (("满意".equals(tTsYsplan.getScore1()) || "满意".equals(ysplan.getScore1())) && "好".equals(tTsYsplan.getScore2())) {

master/src/main/java/com/ruoyi/project/training/bccnew/service/impl/TTsApproveServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.training.bccnew.service.impl;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -64,6 +65,8 @@ public class TTsApproveServiceImpl implements ITTsApproveService {
 
     @Autowired
     private TaskService taskService;
+    @Autowired
+    private JiGuangPushService jiGuangPushService;
 
 
     /**
@@ -116,6 +119,7 @@ public class TTsApproveServiceImpl implements ITTsApproveService {
         if (StringUtils.isNotEmpty(executor.toString())) {
             executor = new StringBuilder(executor.substring(0, executor.length() - 1));
         }
+        jiGuangPushService.send("新的审批流程","您有一个导师带徒审批流程待完成，快去看看吧",executor.toString());
         variables.put("jluser", executor.toString());
         //采用key来启动流程定义并设置流程变量，返回流程实例
         ProcessInstance pi = runtimeService.startProcessInstanceByKey(processName, String.valueOf(businessKey), variables);

master/src/main/java/com/ruoyi/project/training/elearn/service/impl/TElPaperServiceImpl.java

@@ -1,12 +1,12 @@
 package com.ruoyi.project.training.elearn.service.impl;
 
+import com.ruoyi.common.jpush.JiGuangPushService;
 import com.ruoyi.framework.job.service.JobService;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.mapper.SysUserMapper;
 import com.ruoyi.project.training.bccnew.domain.TTsFirstplan;
 import com.ruoyi.project.training.bccnew.domain.TTsNew;
-import com.ruoyi.project.training.bccnew.mapper.TTsFirstplanMapper;
 import com.ruoyi.project.training.bccnew.service.ITTsFirstplanService;
 import com.ruoyi.project.training.bccnew.service.ITTsNewService;
 import com.ruoyi.project.training.domain.TTrainingbcc;
@@ -16,7 +16,6 @@ import com.ruoyi.project.training.elearn.mapper.*;
 import com.ruoyi.project.training.elearn.service.ITElPaperService;
 import com.ruoyi.project.training.mapper.TTrainingbccDeviceMapper;
 import com.ruoyi.project.training.mapper.TTrainingbccMapper;
-import com.ruoyi.project.training.service.ITTrainingbccDeviceService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,6 +76,8 @@ public class TElPaperServiceImpl implements ITElPaperService {
     private TTrainingbccMapper tTrainingbccMapper;
     @Resource
     private TTrainingbccDeviceMapper tTrainingbccDeviceMapper;
+    @Resource
+    private JiGuangPushService jiGuangPushService;
 
     /**
      * 查询在线考试
@@ -369,18 +370,18 @@ public class TElPaperServiceImpl implements ITElPaperService {
                 param.setExamId(paper.getExamId());
                 List<TTrainingbcc> tTrainingbccList = tTrainingbccMapper.selectTTrainingbccList(param);
                 if (!CollectionUtils.isEmpty(tTrainingbccList)) {
-                    for (TTrainingbcc t: tTrainingbccList
+                    for (TTrainingbcc t : tTrainingbccList
                     ) {
                         TTrainingbccDevice device = new TTrainingbccDevice();
                         device.setRegularId(t.getId());
                         device.setStaffId(user.getStaffId());
-                        List<TTrainingbccDevice> deviceList =  tTrainingbccDeviceMapper.selectTTrainingbccDeviceList(device);
+                        List<TTrainingbccDevice> deviceList = tTrainingbccDeviceMapper.selectTTrainingbccDeviceList(device);
                         if (!CollectionUtils.isEmpty(deviceList)) {
-                            for (TTrainingbccDevice d: deviceList
+                            for (TTrainingbccDevice d : deviceList
                             ) {
                                 long pass = objScore >= paper.getQualifyScore() ? 1 : 0;
                                 d.setExamState(pass);
-                                d.setExamNum(d.getExamNum()+ 1);
+                                d.setExamNum(d.getExamNum() + 1);
                                 if (d.getExamNum() >= 5) {
                                     d.setExamState(-1l);
                                 }
@@ -391,8 +392,8 @@ public class TElPaperServiceImpl implements ITElPaperService {
                     }
                 }
 
-            },"装置培训考试成绩").start();
-        }else if (exam.getExamType() == 3) {
+            }, "装置培训考试成绩").start();
+        } else if (exam.getExamType() == 3) {
             new Thread(() -> {
                 TTsNew tTsNew = new TTsNew();
                 tTsNew.setPlanStatus(0L);
@@ -401,27 +402,44 @@ public class TElPaperServiceImpl implements ITElPaperService {
                 if (!CollectionUtils.isEmpty(tTsNews)) {
                     TTsFirstplan tTsFirstplan = new TTsFirstplan();
                     tTsFirstplan.setExamId(paper.getExamId());
-                    tTsFirstplan.setNewId(tTsNews.get(0).getNewId());
+                    TTsNew tsNew = tTsNews.get(0);
+                    tTsFirstplan.setNewId(tsNew.getNewId());
                     for (TTsFirstplan tsFirstplan : tsFirstplanService.selectTTsFirstplanList(tTsFirstplan)) {
                         if (tsFirstplan.getExamType().equals("线上考试")) {
+                            String score = "";
+                            boolean flag = false;
                             if (paper.getUserScore() >= paper.getQualifyScore()) {
                                 if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
                                     tsFirstplan.setScore1("合格");
                                 } else if (StringUtils.isEmpty(tsFirstplan.getScore2())) {
                                     tsFirstplan.setScore2("合格");
                                 }
+                                score = "合格";
+                                flag = true;
                                 tsFirstplan.setPlanStatus(5L);
                             } else {
                                 if (StringUtils.isEmpty(tsFirstplan.getScore1())) {
                                     tsFirstplan.setScore1("不合格");
-                                }else if (tsFirstplan.getScore1().equals("不合格") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
+                                } else if (tsFirstplan.getScore1().equals("不合格") && StringUtils.isEmpty(tsFirstplan.getScore2())) {
                                     tsFirstplan.setScore2("不合格");
+                                    flag = true;
                                 }
+                                score = "不合格";
                             }
                             tsFirstplan.setUserId(user.getUserId());
                             tsFirstplan.setNickName(user.getNickName());
-                            logger.info("====tsFirstplan:{}",tsFirstplan);
+                            logger.info("====tsFirstplan:{}", tsFirstplan);
                             tTsFirstplanService.updateTTsFirstplan(tsFirstplan);
+
+                            if (flag) {
+                                SysUser sysUser = new SysUser();
+                                sysUser.setNickName(tsFirstplan.getTrainer());
+                                for (SysUser trainer : sysUserMapper.selectUserList(sysUser)) {
+                                    sysUser = new SysUser();
+                                    SysUser staff = sysUserMapper.selectUserByStaffId(tTsNew.getStaffId());
+                                    jiGuangPushService.send("导师带徒-装置级培训", staff.getNickName() + "的" + tsFirstplan.getTopic() + "成绩为" + score + "，请确认成绩。", trainer.getUserId().toString());
+                                }
+                            }
                         }
                     }
                 }
@@ -444,7 +462,7 @@ public class TElPaperServiceImpl implements ITElPaperService {
             item.setAnswerList(list);
         }
         //
-        SysUser user = sysUserMapper.selectUserById( paper.getUserId());
+        SysUser user = sysUserMapper.selectUserById(paper.getUserId());
         paper.setNickName(user.getNickName());
         paper.setQuList(quList);
         return paper;

master/src/main/resources/processes/pssr/pssrMgrConfirm.bpmn

@@ -2,42 +2,56 @@
 <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
   <process id="pssrMgrConfirm" name="PSSR装置经理审批" isExecutable="true">
     <startEvent id="applyUser" name="Start" activiti:initiator="${applyUser}"></startEvent>
-    <userTask id="jlUser" name="装置经理" activiti:candidateUsers="#{chargePerson}"></userTask>
-    <sequenceFlow id="flow1" sourceRef="applyUser" targetRef="jlUser"></sequenceFlow>
-    <endEvent id="endevent2" name="End"></endEvent>
-    <sequenceFlow id="flow3" sourceRef="jlUser" targetRef="endevent2">
+    <userTask id="allJlUser" name="所有装置经理" activiti:assignee="${allJlUser}">
+        <extensionElements>
+            <!-- 定义多实例任务，使用集合变量 allJlUsers 动态生成 -->
+            <activiti:multiInstanceLoopCharacteristics isSequential="false" activiti:collection="allJlUsers" activiti:elementVariable="allJlUser">
+                <completionCondition>${nrOfCompletedInstances == nrOfInstances}</completionCondition>
+            </activiti:multiInstanceLoopCharacteristics>
+        </extensionElements>
+    </userTask>
+    <sequenceFlow id="flow1" sourceRef="startevent1" targetRef="allJlUser"></sequenceFlow>
+    <userTask id="jlUser" name="装置经理"  activiti:assignee="#{jlUser}"></userTask>
+    <sequenceFlow id="flow2" sourceRef="allJlUser" targetRef="jlUser">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+    </sequenceFlow>
+    <endEvent id="endevent1" name="End"></endEvent>
+    <sequenceFlow id="flow3" sourceRef="jlUser" targetRef="endevent1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
-    <endEvent id="endevent3" name="End"></endEvent>
-    <sequenceFlow id="flow4" sourceRef="jlUser" targetRef="endevent3">
+    <endEvent id="endevent2" name="End"></endEvent>
+    <sequenceFlow id="flow4" sourceRef="allJlUser" targetRef="endevent2">
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+    </sequenceFlow>
+    <sequenceFlow id="flow5" sourceRef="jlUser" targetRef="endevent2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_pssrMgrConfirm">
     <bpmndi:BPMNPlane bpmnElement="pssrMgrConfirm" id="BPMNPlane_pssrMgrConfirm">
-      <bpmndi:BPMNShape bpmnElement="applyUser" id="BPMNShape_applyUser">
-        <omgdc:Bounds height="35.0" width="35.0" x="140.0" y="260.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="startevent1" id="BPMNShape_startevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="140.0" y="290.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="jlUser" id="BPMNShape_jlUser">
-        <omgdc:Bounds height="55.0" width="105.0" x="220.0" y="250.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="allJlUser" id="BPMNShape_allJlUser">
+        <omgdc:Bounds height="55.0" width="105.0" x="220.0" y="280.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
-        <omgdc:Bounds height="35.0" width="35.0" x="370.0" y="260.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="usertask2" id="BPMNShape_usertask2">
+        <omgdc:Bounds height="55.0" width="105.0" x="370.0" y="280.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent3" id="BPMNShape_endevent3">
-        <omgdc:Bounds height="35.0" width="35.0" x="250.0" y="340.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="520.0" y="290.0"></omgdc:Bounds>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
+        <omgdc:Bounds height="35.0" width="35.0" x="320.0" y="390.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="175.0" y="277.0"></omgdi:waypoint>
-        <omgdi:waypoint x="220.0" y="277.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3">
-        <omgdi:waypoint x="325.0" y="277.0"></omgdi:waypoint>
-        <omgdi:waypoint x="370.0" y="277.0"></omgdi:waypoint>
+        <omgdi:waypoint x="175.0" y="307.0"></omgdi:waypoint>
+        <omgdi:waypoint x="220.0" y="307.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
-        <omgdi:waypoint x="272.0" y="305.0"></omgdi:waypoint>
-        <omgdi:waypoint x="267.0" y="340.0"></omgdi:waypoint>
+        <omgdi:waypoint x="272.0" y="335.0"></omgdi:waypoint>
+        <omgdi:waypoint x="272.0" y="407.0"></omgdi:waypoint>
+        <omgdi:waypoint x="320.0" y="407.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>

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

@@ -493,7 +493,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -373,7 +373,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -451,7 +451,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -392,7 +392,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -120,25 +120,19 @@
           icon="el-icon-refresh-left"
           size="mini"
           v-if="isApprove==2"
-          @click="handleTurnDown(1)"
+          :disabled="multiple"
+          @click="handleTurnDown"
           v-hasPermi="['pssr:blind:edit']"
         >驳回至拆除
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-refresh-left"
-          size="mini"
-          v-if="isApprove==2"
-          @click="handleTurnDown(2)"
-          v-hasPermi="['pssr:blind:edit']"
-        >驳回至安装
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
+    <div style="width: 100%;text-align: center;margin-bottom: 15px">
+      <H2>蒸汽裂解装置隔离/盲板一览表</H2>
+    </div>
+
     <el-table v-loading="loading" :data="blindList" @selection-change="handleSelectionChange" :height="clientHeight"
               border>
       <el-table-column type="selection" width="55" align="center"/>
@@ -146,8 +140,8 @@
         <template slot-scope="scope">
           <el-tag v-if="scope.row.approveStatus==0">未审批</el-tag>
           <el-tag v-if="scope.row.approveStatus==1" type="warning">待确认</el-tag>
-          <el-tag v-if="scope.row.approveStatus==3" type="success">确认人1安装</el-tag>
-          <el-tag v-if="scope.row.approveStatus==4" type="success">确认人2拆除</el-tag>
+          <el-tag v-if="scope.row.approveStatus==3" type="success">已安装</el-tag>
+          <el-tag v-if="scope.row.approveStatus==4" type="success">已拆除</el-tag>
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认</el-tag>
         </template>
       </el-table-column>
@@ -243,6 +237,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.approveStatus!=2"
             v-hasPermi="['pssr:blind:edit']"
           >修改
           </el-button>
@@ -251,6 +246,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="scope.row.approveStatus!=2"
             v-hasPermi="['pssr:blind:remove']"
           >删除
           </el-button>
@@ -308,9 +304,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="隔离类型" prop="isoType">
-              <el-select v-model="form.isoType" placeholder="请选择隔离类型">
-                <el-option label="请选择字典生成" value=""/>
-              </el-select>
+              <el-input v-model="form.isoType" placeholder="请输入隔离类型"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -345,13 +339,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="安装时间" prop="installDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.installDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="选择安装时间">
-              </el-date-picker>
+            <el-form-item label="已经安装：" label-width="350px">
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -416,13 +404,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="拆装时间" prop="removedDate">
-              <el-date-picker clearable size="small" style="width: 200px"
-                              v-model="form.removedDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="选择拆装时间">
-              </el-date-picker>
+            <el-form-item label="已经拆除：" label-width="350px">
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -494,6 +476,113 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="approveOpen" width="60%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="单元/系统号" prop="unitNo">
+              <el-input v-model="form.unitNo" placeholder="请输入单元/系统号" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="P&ID图号" prop="pidNo">
+              <el-input v-model="form.pidNo" placeholder="请输入P&ID图号" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="管线号" prop="pipelineNo">
+              <el-input v-model="form.pipelineNo" placeholder="请输入管线号" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="介质" prop="medium">
+              <el-input v-model="form.medium" placeholder="请输入介质" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="隔离/盲板编号" prop="blindNo">
+              <el-input v-model="form.blindNo" placeholder="请输入隔离/盲板编号" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所在位置" prop="location">
+              <el-input v-model="form.location" placeholder="请输入所在位置" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="隔离类型" prop="isoType">
+              <el-input v-model="form.isoType" placeholder="请输入隔离类型" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="被隔离设备/管线位号" prop="tagNo">
+              <el-input v-model="form.tagNo" placeholder="请输入被隔离设备/管线位号" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="尺寸" prop="blindSize">
+              <el-input v-model="form.blindSize" placeholder="请输入尺寸" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="压力等级" prop="pressureRate">
+              <el-input v-model="form.pressureRate" placeholder="请输入压力等级" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否承压" prop="pressurized">
+              <el-input v-model="form.pressurized" placeholder="请输入是否承压" disabled/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否“8”字板" prop="figure">
+              <el-input v-model="form.figure" placeholder="请输入是否“8”字板" disabled/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="安装时间" prop="installDate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.installDate"
+                              :disabled="!isApprove==4"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择安装时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="拆装时间" prop="removedDate">
+              <el-date-picker clearable size="small" style="width: 200px"
+                              v-model="form.removedDate"
+                              type="date"
+                              :disabled="!isApprove==5"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择拆装时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
     <!-- 用户导入对话框 -->
     <el-dialog :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" width="400px"
                append-to-body>
@@ -536,6 +625,7 @@ import {
   exportBlind,
   getBlind,
   handleConfirmApprove,
+  handleTurnDownBlind,
   importTemplate,
   listBlind,
   updateBlind
@@ -586,6 +676,7 @@ export default {
       clientHeight: 300,
       // 是否显示弹出层
       open: false,
+      approveOpen: false,
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -664,7 +755,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     this.getList();
     this.getTreeselect();
@@ -674,12 +765,24 @@ export default {
   },
   methods: {
     handleTurnDown(val) {
-      let data = {
-        ids: this.ids,
-        subId: this.subId,
-        approveStatus: val,
-      }
-
+      this.$prompt('请输入驳回原因', '提示', {
+        confirmButtonText: '确认驳回',
+        cancelButtonText: '取消',
+      }).then(({value}) => {
+        let data = {
+          ids: this.ids,
+          subId: this.subId,
+          remarks: value
+        }
+        handleTurnDownBlind(data).then(res => {
+          this.msgSuccess("驳回成功");
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消驳回'
+        });
+      });
     },
     userFormat(userId) {
       for (let item of this.userOptions) {
@@ -807,7 +910,13 @@ export default {
       const id = row.id || this.ids
       getBlind(id).then(response => {
         this.form = response.data;
-        this.open = true;
+        if (response.data.approveStatus != 2) {
+          if (this.isApprove == 0) {
+            this.open = true;
+          } else {
+            this.approveOpen = true;
+          }
+        }
         this.title = "修改盲板";
       });
     },

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

@@ -529,7 +529,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -458,7 +458,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -519,7 +519,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -430,7 +430,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -451,7 +451,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -402,7 +402,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -465,7 +465,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -373,7 +373,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -430,7 +430,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -70,28 +70,28 @@
         >删除
         </el-button>
       </el-col>
-<!--      <el-col :span="1.5">
-        <el-button
-          type="info"
-          icon="el-icon-upload2"
-          size="mini"
-          @click="handleImport"
-          v-if="isApprove==0"
-          v-hasPermi="['pssr:lock:edit']"
-        >导入
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-if="isApprove==0"
-          v-hasPermi="['pssr:lock:export']"
-        >导出
-        </el-button>
-      </el-col>-->
+      <!--      <el-col :span="1.5">
+              <el-button
+                type="info"
+                icon="el-icon-upload2"
+                size="mini"
+                @click="handleImport"
+                v-if="isApprove==0"
+                v-hasPermi="['pssr:lock:edit']"
+              >导入
+              </el-button>
+            </el-col>
+            <el-col :span="1.5">
+              <el-button
+                type="warning"
+                icon="el-icon-download"
+                size="mini"
+                @click="handleExport"
+                v-if="isApprove==0"
+                v-hasPermi="['pssr:lock:export']"
+              >导出
+              </el-button>
+            </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -117,7 +117,13 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="lockList" @selection-change="handleSelectionChange" :selectable="checkSelectable" :height="clientHeight"
+    <div style="width: 100%;text-align: center;margin-bottom: 15px">
+      <H2>锁开锁关检查记录表</H2>
+      <h3>&af;</h3>
+      <span>检查要求：检查上锁位置和PID以及清单上描述的位置是否一致正确；阀门状态和PID标注状态描述是否一致正确；锁开锁关是否紧固；锁体和链条是否无损坏；是（√），否（×），不符合要求的立即联系责任人整改。</span>
+    </div>
+    <el-table v-loading="loading" :data="lockList" @selection-change="handleSelectionChange"
+              :selectable="checkSelectable" :height="clientHeight"
               border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="审批状态" align="center" prop="approveStatus" :show-overflow-tooltip="true" width="100">
@@ -173,7 +179,8 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="150"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0"
+                       class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -223,66 +230,53 @@
         <el-form-item label="PID标注状态" prop="pidStatus">
           <el-input v-model="form.pidStatus" placeholder="请输入PID标注状态"/>
         </el-form-item>
-        <el-form-item label="拆锁人" prop="unlocker">
-          <el-select v-model="form.unlocker" clearable filterable style="width: 100%;"
-                     placeholder="请选择拆锁人">
+        <el-form-item label="确认人1" prop="lockeder">
+          <el-select v-model="form.lockeder" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人1">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="拆锁时间" prop="unlockDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.unlockDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择拆锁时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="上锁人" prop="lockeder">
-          <el-select v-model="form.lockeder" clearable filterable style="width: 100%;"
-                     placeholder="请选择上锁人">
+        <el-form-item label="确认人2" prop="confirm">
+          <el-select v-model="form.confirm" clearable filterable style="width: 100%;"
+                     placeholder="请选择确认人2">
             <el-option v-for="user in userOptions"
                        :label="user.nickName"
                        :value="user.userId+''"
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="上锁时间" prop="lockedDate">
-          <el-date-picker clearable size="small" style="width: 200px"
-                          v-model="form.lockedDate"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="选择上锁时间">
-          </el-date-picker>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
-        <el-form-item label="上锁位置正确(是/否)" prop="positionRight">
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="approveOpen" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="175px">
+        <el-form-item label="上锁位置正确(是/否)" prop="positionRight" v-if="isApprove==1">
           <el-radio v-model="form.positionRight" label="✔" border>✔</el-radio>
           <el-radio v-model="form.positionRight" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="阀门状态正确(是/否)" prop="statusRight">
+        <el-form-item label="阀门状态正确(是/否)" prop="statusRight" v-if="isApprove==1">
           <el-radio v-model="form.statusRight" label="✔" border>✔</el-radio>
           <el-radio v-model="form.statusRight" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="锁开锁关紧固(是/否)" prop="fastening">
+        <el-form-item label="锁开锁关紧固(是/否)" prop="fastening" v-if="isApprove==1">
           <el-radio v-model="form.fastening" label="✔" border>✔</el-radio>
           <el-radio v-model="form.fastening" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="锁体和链条无损坏(是/否)" prop="noDamage">
+        <el-form-item label="锁体和链条无损坏(是/否)" prop="noDamage" v-if="isApprove==1">
           <el-radio v-model="form.noDamage" label="✔" border>✔</el-radio>
           <el-radio v-model="form.noDamage" label="✖" border>✖</el-radio>
         </el-form-item>
-        <el-form-item label="确认人" prop="confirm">
-          <el-select v-model="form.confirm" clearable filterable style="width: 100%;"
-                     placeholder="请选择确认人">
-            <el-option v-for="user in userOptions"
-                       :label="user.nickName"
-                       :value="user.userId+''"
-                       :key="user.userId"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="确认时间" prop="confirmationDate">
+        <el-form-item label="确认时间" prop="confirmationDate" v-if="isApprove==2">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"
@@ -390,6 +384,7 @@ export default {
       clientHeight: 300,
       // 是否显示弹出层
       open: false,
+      approveOpen: false,
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -448,7 +443,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     this.getList();
     this.getTreeselect();
@@ -565,7 +560,13 @@ export default {
       const id = row.id || this.ids
       getLock(id).then(response => {
         this.form = response.data;
-        this.open = true;
+        if (response.data.approveStatus != 2) {
+          if (this.isApprove == 0) {
+            this.open = true;
+          } else {
+            this.approveOpen = true;
+          }
+        }
         this.title = "修改锁开锁关阀门状态";
       });
     },

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

@@ -437,7 +437,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -451,7 +451,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -465,7 +465,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -134,7 +134,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>蒸汽裂解装置{{ unitDes }}岗位换热器检修清单</H2>
+      <H2>蒸汽裂解装置换热器检修清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulExchangerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -156,7 +156,7 @@
       <el-table-column label="确认人" align="center" prop="confirmedName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right"
-                       v-if="isApprove==0" width="120" class-name="small-padding fixed-width">
+                       v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -375,7 +375,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     if (this.isApprove != 0 && this.isApprove != 2) {
       this.queryParams.confirmedPerson = 1;

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

@@ -117,7 +117,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>蒸汽裂解装置{{ unitDes }}岗位过滤器清洗工作清单</H2>
+      <H2>蒸汽裂解装置过滤器清洗工作清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulFilterList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -142,7 +142,7 @@
       <el-table-column label="负责人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       <el-table-column label="操作" align="center" fixed="right"
-                       v-if="isApprove==0" width="120" class-name="small-padding fixed-width">
+                       v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

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

@@ -108,7 +108,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>蒸汽裂解装置{{ unitDes }}岗位管线更换清单</H2>
+      <H2>蒸汽裂解装置管线更换清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulPipeList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -129,7 +129,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" v-if="isApprove==0" fixed="right" width="120"
+      <el-table-column label="操作" align="center" v-if="isApprove==0" fixed="right"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -346,7 +346,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     if (this.isApprove != 0 && this.isApprove != 2) {
       this.queryParams.confirmer = 1;

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

@@ -117,7 +117,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>蒸汽裂解装置{{ unitDes }}岗位泵更换清单</H2>
+      <H2>蒸汽裂解装置泵更换清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulPumpList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -138,7 +138,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -359,7 +359,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     if (this.isApprove != 0 && this.isApprove != 2) {
       this.queryParams.confirmedPerson = 1;

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

@@ -119,7 +119,7 @@
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>蒸汽裂解装置{{ unitDes }}岗位塔罐检修清单</H2>
+      <H2>蒸汽裂解装置塔罐检修清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulTowerList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -140,7 +140,7 @@
       </el-table-column>
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"/>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120"
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -361,7 +361,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     if (this.isApprove != 0 && this.isApprove != 2) {
       this.queryParams.confirmedPerson = 1;

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

@@ -116,7 +116,7 @@
     </el-row>
 
     <div style="width: 100%;text-align: center;margin-bottom: 15px">
-      <H2>蒸汽裂解装置{{ unitDes }}岗位阀门更换、下线维修清单</H2>
+      <H2>蒸汽裂解装置阀门更换、下线维修清单</H2>
     </div>
     <el-table v-loading="loading" :data="overhaulValveList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
@@ -153,7 +153,7 @@
       <el-table-column label="确认人" align="center" prop="confirmerName" :show-overflow-tooltip="true"
                        width="180"/>
       <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" width="120"
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -423,7 +423,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     if (this.isApprove != 0 && this.isApprove != 2) {
       this.queryParams.identifyingPerson = 1;

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

@@ -419,7 +419,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -391,7 +391,7 @@ export default {
     this.subId = id
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -387,7 +387,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -416,7 +416,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -303,7 +303,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     this.getList();
     this.getTreeselect();

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

@@ -402,7 +402,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -479,7 +479,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -479,7 +479,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -451,7 +451,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -305,7 +305,7 @@ export default {
   created() {
     //设置表格高度对应屏幕高度
     this.$nextTick(() => {
-      this.clientHeight = document.body.clientHeight - 250
+      this.clientHeight = document.body.clientHeight - 350
     })
     listUserNoPage({}).then(res => {
       this.userOptions = res.data

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

@@ -513,7 +513,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -513,7 +513,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -513,7 +513,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -457,7 +457,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -527,7 +527,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();

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

@@ -412,7 +412,7 @@ export default {
   created() {
       //设置表格高度对应屏幕高度
       this.$nextTick(() => {
-          this.clientHeight = document.body.clientHeight -250
+          this.clientHeight = document.body.clientHeight - 350
       })
     this.getList();
     this.getTreeselect();