LY 特种设备

master/src/main/java/com/ruoyi/project/sems/controller/SpecHomeController.java

@@ -178,6 +178,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
         );
         Map<String, Object> mapdt = new HashMap<String, Object>();
         mapdt.put("dtAll_num", dtAll);
@@ -186,12 +187,14 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
                 .like("CHECK_STRATEGY","强制")
         );
         int dzsbUn = tSpecdevDzsbService.count(new QueryWrapper<TSpecdevDzsb>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
                 .notLike("CHECK_STRATEGY","强制")
         );
 
@@ -203,6 +206,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
         );
         Map<String, Object> mapcc = new HashMap<String, Object>();
         mapcc.put("ccAll_num", ccAll);
@@ -235,7 +239,7 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -337,10 +341,9 @@ public class SpecHomeController extends BaseController
             int num = tSpecdevGlService.count(new QueryWrapper<TSpecdevGl>()
                     .eq("STATUS" , 1)
                     .eq("del_flag" , 0)
-                    .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -355,10 +358,9 @@ public class SpecHomeController extends BaseController
             int num = tSpecdevGlService.count(new QueryWrapper<TSpecdevGl>()
                     .eq("STATUS" , 1)
                     .eq("del_flag" , 0)
-                    .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                     .apply(true,applySql2,year)
                     .in("plant_code",plantIds)
-                    .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                    .in("unit",unitIds)
             );
             yearList2.add(year);
             countList2.add(num);
@@ -403,7 +405,7 @@ public class SpecHomeController extends BaseController
 //                    .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -566,51 +568,45 @@ public class SpecHomeController extends BaseController
         int safe1 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","1","1级","1.0","一级","Ⅰ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safe2 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","2","2级","2.0","二级","Ⅱ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
 
         int safe3 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","3","3级","3.0","三级","Ⅲ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
 
         int safe4 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","4","4级","4.0","四级","Ⅳ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safe5 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","5","5级","5.0","五级","Ⅴ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safeall = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safeNa = safeall - safe1 - safe2- safe3- safe4 - safe5;
         List safeList = new ArrayList();
@@ -636,41 +632,36 @@ public class SpecHomeController extends BaseController
         int safe1 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","1","1级","1.0","一级","Ⅰ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safe2 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","2","2级","2.0","二级","Ⅱ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safe3 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","3","3级","3.0","三级","Ⅲ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safe4 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
                 .in("safe_class","4","4级","4.0","四级","Ⅳ级")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safeall = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int safeNa = safeall - safe1 - safe2- safe3- safe4;
         List safeList = new ArrayList();
@@ -695,17 +686,15 @@ public class SpecHomeController extends BaseController
         int all = tSpecdevGlService.count(new QueryWrapper<TSpecdevGl>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         int cc = tSpecdevGlService.count(new QueryWrapper<TSpecdevGl>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
-                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
                 .in("CHECK_CONCLUSION","符合要求","允许运行")
-                .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
         );
         String per = "0";
         if (all != 0) {
@@ -730,7 +719,7 @@ public class SpecHomeController extends BaseController
                     .notIn("APPROVE_STATUS" , 0)
                     .in("plant_code",plantIds)
                     .eq("del_flag" , 0)
-                    .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                    .in("unit",unitIds)
             );
         if (ylrqList!= null){
             for (TSpecdevYlrq t: ylrqList
@@ -749,7 +738,7 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         if (ylgdList!= null){
             for (TSpecdevYlgd t: ylgdList
@@ -768,7 +757,7 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         if (GlList!= null){
             for (TSpecdevGl t: GlList
@@ -787,7 +776,7 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         if (dzsbList!= null){
             for (TSpecdevDzsb t: dzsbList
@@ -806,7 +795,7 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
+                .in("unit",unitIds)
         );
         if (dtList!= null){
             for (TSpecdevDt t: dtList
@@ -824,6 +813,7 @@ public class SpecHomeController extends BaseController
         List<TSpecdevCc> ccList = tSpecdevCcService.list(new QueryWrapper<TSpecdevCc>()
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
+                .in("unit",unitIds)
                 .eq("del_flag" , 0)
         );
         if (ccList!= null){

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -184,58 +184,60 @@ public class TSpecdevCcController extends BaseController
                     } else if (j == 1) {
                         entity.setPlantCode(cellValue);//装置名称
                     } else if (j == 2) {
+                        entity.setUnit(cellValue);//使用部门
+                    }else if (j == 3) {
                         entity.setUseDept(cellValue);//使用部门
-                    } else if (j == 3) {
-                        entity.setEngineer(cellValue);//装置维护人员
                     } else if (j == 4) {
-                        entity.setCarNo(cellValue);//车牌号
+                        entity.setEngineer(cellValue);//装置维护人员
                     } else if (j == 5) {
-                        entity.setDocno(cellValue);//档案号
+                        entity.setCarNo(cellValue);//车牌号
                     } else if (j == 6) {
-                        entity.setEngineNo(cellValue);//发动机号
+                        entity.setDocno(cellValue);//档案号
                     } else if (j == 7) {
-                        entity.setRegno(cellValue);//注册代码
+                        entity.setEngineNo(cellValue);//发动机号
                     } else if (j == 8) {
-                        entity.setColor(cellValue);//颜色
+                        entity.setRegno(cellValue);//注册代码
                     } else if (j == 9) {
-                        entity.setCapacity(cellValue);//工作能力
+                        entity.setColor(cellValue);//颜色
                     } else if (j == 10) {
-                        entity.setDevname(cellValue);//设备名称
+                        entity.setCapacity(cellValue);//工作能力
                     } else if (j == 11) {
-                        entity.setEngineType(cellValue);//动力形式
+                        entity.setDevname(cellValue);//设备名称
                     } else if (j == 12) {
+                        entity.setEngineType(cellValue);//动力形式
+                    } else if (j == 13) {
                         entity.setModel(cellValue);//型号
-                    }  else if (j == 13) {
-                        entity.setFrameNo(cellValue);//车架号
                     }  else if (j == 14) {
+                        entity.setFrameNo(cellValue);//车架号
+                    }  else if (j == 15) {
                         entity.setProductNo(cellValue);//产品编号
-                    } else if (j == 15) {
-                        entity.setCreateUnit(cellValue);//生产厂家
                     } else if (j == 16) {
-                        entity.setExUnit(cellValue);//防爆改造厂家
+                        entity.setCreateUnit(cellValue);//生产厂家
                     } else if (j == 17) {
-                        entity.setExGrade(cellValue);//最高防爆级别
+                        entity.setExUnit(cellValue);//防爆改造厂家
                     } else if (j == 18) {
+                        entity.setExGrade(cellValue);//最高防爆级别
+                    } else if (j == 19) {
                         if (cellValue.length() > 3) {//初检日期
                             entity.setFirstWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 19) {
-                        entity.setCheckStrategy(cellValue);//检验策略
                     } else if (j == 20) {
+                        entity.setCheckStrategy(cellValue);//检验策略
+                    } else if (j == 21) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 21) {
+                    } else if (j == 22) {
                         if (cellValue.length() > 3) {//下次年检日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 22) {
+                    } else if (j == 23) {
                         entity.setReportNo(cellValue);//报告编号
-                    }else if (j == 23) {
+                    }else if (j == 24) {
                         entity.setAssetOwner(cellValue);//资产形式
-                    } else if (j == 24) {
+                    } else if (j == 25) {
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 25) {
+                    }else if (j == 26) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 25) {
                         for (SysDept d : dept) {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -181,42 +181,44 @@ public class TSpecdevDtController extends BaseController
                     } else if (j == 1) {
                         entity.setPlantCode(cellValue);//装置名称
                     } else if (j == 2) {
+                        entity.setUnit(cellValue);//单元
+                    }else if (j == 3) {
                         entity.setDocno(cellValue);//档案号
-                    } else if (j == 3) {
-                        entity.setDevname(cellValue);//名称
                     } else if (j == 4) {
-                        entity.setRegno(cellValue);//设备注册编号
+                        entity.setDevname(cellValue);//名称
                     } else if (j == 5) {
-                        entity.setModel(cellValue);//型号
+                        entity.setRegno(cellValue);//设备注册编号
                     } else if (j == 6) {
-                        entity.setCapacity(cellValue);//额定载重
+                        entity.setModel(cellValue);//型号
                     } else if (j == 7) {
-                        entity.setFloor(cellValue);//层站数
+                        entity.setCapacity(cellValue);//额定载重
                     } else if (j == 8) {
-                        entity.setCreateUnit(cellValue);//制造单位
+                        entity.setFloor(cellValue);//层站数
                     } else if (j == 9) {
-                        entity.setLocation(cellValue);//使用地点
+                        entity.setCreateUnit(cellValue);//制造单位
                     } else if (j == 10) {
-                        entity.setMaintContractor(cellValue);//维保承包商
+                        entity.setLocation(cellValue);//使用地点
                     } else if (j == 11) {
+                        entity.setMaintContractor(cellValue);//维保承包商
+                    } else if (j == 12) {
                         if (cellValue.length() > 3) {//初检日期
                             entity.setFirstWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 12) {
+                    } else if (j == 13) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 13) {
-                        entity.setCheckUnit(cellValue);//检验单位
                     } else if (j == 14) {
-                        entity.setReportNo(cellValue);//报告编号
+                        entity.setCheckUnit(cellValue);//检验单位
                     } else if (j == 15) {
+                        entity.setReportNo(cellValue);//报告编号
+                    } else if (j == 16) {
                         if (cellValue.length() > 3) {//下次年检日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    }  else if (j == 16) {
+                    }  else if (j == 17) {
                         entity.setPerTestConclusion(cellValue);//备注
-                    } else if (j == 17) {
+                    } else if (j == 18) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 17) {
                         for (SysDept d : dept) {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -184,48 +184,50 @@ public class TSpecdevDzsbController extends BaseController
                     } else if (j == 1) {
                         entity.setPlantCode(cellValue);//装置
                     } else if (j == 2) {
+                        entity.setUnit(cellValue);//装置维修组
+                    }else if (j == 3) {
                         entity.setPlantMaint(cellValue);//装置维修组
-                    } else if (j == 3) {
+                    } else if (j == 4) {
                         entity.setEngineer(cellValue);//装置维修工程师
-                    } else if (j == 5) {
-                        entity.setDevno(cellValue);//设备位号
                     } else if (j == 6) {
+                        entity.setDevno(cellValue);//设备位号
+                    } else if (j == 7) {
                         entity.setDocno(cellValue);//档案号
-                    } else if (j == 4) {
+                    } else if (j == 5) {
                         entity.setDevname(cellValue);//设备名称
-                    } else if (j == 7) {
-                        entity.setModel(cellValue);//设备型号
                     } else if (j == 8) {
-                        entity.setCapacity(cellValue);//起吊重量
+                        entity.setModel(cellValue);//设备型号
                     } else if (j == 9) {
-                        entity.setLocation(cellValue);//设备使用地点
+                        entity.setCapacity(cellValue);//起吊重量
                     } else if (j == 10) {
-                        entity.setRegno(cellValue);//设备注册编号
+                        entity.setLocation(cellValue);//设备使用地点
                     } else if (j == 11) {
+                        entity.setRegno(cellValue);//设备注册编号
+                    } else if (j == 12) {
                         if (cellValue.length() > 3) {//投用日期
                             entity.setSubmitdate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 12) {
+                    } else if (j == 13) {
                         entity.setCreateUnit(cellValue);//制造单位
-                    }else if (j == 13) {
+                    }else if (j == 14) {
                         entity.setIsEx(cellValue);//是否防爆
-                    } else if (j == 14) {
-                        entity.setCheckStrategy(cellValue);//检验策略
                     } else if (j == 15) {
-                        entity.setCheckUnit(cellValue);//检验单位
+                        entity.setCheckStrategy(cellValue);//检验策略
                     } else if (j == 16) {
+                        entity.setCheckUnit(cellValue);//检验单位
+                    } else if (j == 17) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 17) {
-                        entity.setReportNo(cellValue);//报告编号
                     } else if (j == 18) {
+                        entity.setReportNo(cellValue);//报告编号
+                    } else if (j == 19) {
                         if (cellValue.length() > 3) {//下次到期日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 19) {    //检验结论
+                    } else if (j == 20) {    //检验结论
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 20) {
+                    }else if (j == 21) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 20) {
                         for (SysDept d : dept) {

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevCc.java

@@ -28,6 +28,10 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "装置")
     private String plantCode;
 
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
     /** 使用部门 */
     @Excel(name = "使用部门")
     private String useDept;
@@ -654,6 +658,14 @@ public class TSpecdevCc extends BaseEntity
         return reportNo;
     }
 
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDt.java

@@ -29,7 +29,7 @@ public class TSpecdevDt extends BaseEntity
     private String plantCode;
 
     /** 单元 */
-    //@Excel(name = "单元")
+    @Excel(name = "单元")
     private String unit;
 
     /** 档案号 */

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDzsb.java

@@ -29,7 +29,7 @@ public class TSpecdevDzsb extends BaseEntity
     private String plantCode;
 
     /** 单元 */
-    //@Excel(name = "单元")
+    @Excel(name = "单元")
     private String unit;
 
     /** 装置维修组 */

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiCc.java

@@ -26,6 +26,10 @@ public class TSpechiCc extends BaseEntity
     @Excel(name = "装置名称")
     private String plantCode;
 
+    /** 单元 */
+    @Excel(name = "单元")
+    private String unit;
+
     /** 车牌号 */
     @Excel(name = "车牌号")
     private String carNo;
@@ -205,6 +209,14 @@ public class TSpechiCc extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
     public String getDeptName() {
         return deptName;
     }

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TSpecdevCc" id="TSpecdevCcResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
+        <result property="unit"    column="unit"    />
         <result property="carNo"    column="car_no"    />
         <result property="devname"    column="devname"    />
         <result property="devno"    column="devno"    />

master/src/main/resources/mybatis/sems/his/TSpechiCcMapper.xml

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TSpechiCc" id="TSpechiCcResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
+        <result property="unit"    column="unit"    />
         <result property="carNo"    column="car_no"    />
         <result property="devname"    column="devname"    />
         <result property="devno"    column="devno"    />
@@ -53,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSpechiCcVo">
-        select d.id, d.plant_code, d.car_no, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner, d.dev_id, d.hi_type ,s.dept_name from t_spechi_cc d
+        select d.id, d.plant_code, d.unit, d.car_no, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner, d.dev_id, d.hi_type ,s.dept_name from t_spechi_cc d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTSpechiCcVo"/>
         <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
+            <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
             <if test="devno != null  and devno != ''"> and devno = #{devno}</if>
@@ -130,6 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="plantCode != null and plantCode != ''">plant_code,</if>
+            <if test="unit != null">unit,</if>
             <if test="carNo != null">car_no,</if>
             <if test="devname != null">devname,</if>
             <if test="devno != null">devno,</if>
@@ -176,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
+            <if test="unit != null">#{unit},</if>
             <if test="carNo != null">#{carNo},</if>
             <if test="devname != null">#{devname},</if>
             <if test="devno != null">#{devno},</if>
@@ -229,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="plantCode != null and plantCode != ''">plant_code,</if>
+            <if test="unit != null">unit,</if>
             <if test="carNo != null">car_no,</if>
             <if test="devname != null">devname,</if>
             <if test="devno != null">devno,</if>
@@ -275,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
+            <if test="unit != null">#{unit},</if>
             <if test="carNo != null">#{carNo},</if>
             <if test="devname != null">#{devname},</if>
             <if test="devno != null">#{devno},</if>
@@ -324,6 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_spechi_cc
         <trim prefix="SET" suffixOverrides=",">
             <if test="plantCode != null and plantCode != ''">plant_code = #{plantCode},</if>
+            <if test="unit != null">unit = #{unit},</if>
             <if test="carNo != null">car_no = #{carNo},</if>
             <if test="devname != null">devname = #{devname},</if>
             <if test="devno != null">devno = #{devno},</if>

ui/src/views/plant/organization/index2.vue

@@ -254,7 +254,7 @@ import {listOgzStaffmgr, listStaffmgr} from "@/api/plant/staffmgr";
                 tags: ["level0"],
               }
             }
-            if (post == this.$t('生产主管') || post == this.$t('炉区工长')) {
+            if (post == this.$t('生产主管') || post == this.$t('工长')) {
               nodeData = {
                 id: this.staffmgrList[i].id ,
                 name: this.staffmgrList[i].name ,

ui/src/views/plant/organization/index3.vue

@@ -254,7 +254,7 @@ import {listOgzStaffmgr, listStaffmgr} from "@/api/plant/staffmgr";
                 tags: ["level0"],
               }
             }
-            if (post == this.$t('生产主管') || post == this.$t('炉区工长')) {
+            if (post == this.$t('生产主管') || post == this.$t('工长')) {
               nodeData = {
                 id: this.staffmgrList[i].id ,
                 name: this.staffmgrList[i].name ,

ui/src/views/sems/specCc/bf.vue

@@ -60,6 +60,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specCcList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
@@ -127,10 +128,10 @@
     />
 
     <!-- 添加或修改特种设备叉车台账对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item :label="$t('装置')" prop="plantCode">
               <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
                 <el-option
@@ -142,6 +143,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('单元')" prop="unit">
+              <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
         <el-form-item :label="$t('使用部门')" prop="useDept">
           <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
@@ -583,6 +589,7 @@ export default {
       this.form = {
         id: null,
         plantCode: null,
+        unit: null,
         carNo: null,
         devname: null,
         devno: null,

ui/src/views/sems/specCc/index.vue

@@ -125,6 +125,7 @@
               :height="clientHeight" border :cell-style="tableCellStyle" @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
@@ -199,10 +200,10 @@
     />
 
     <!-- 添加或修改特种设备叉车台账对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item :label="$t('装置')" prop="plantCode">
               <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
                 <el-option
@@ -214,6 +215,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('单元')" prop="unit">
+              <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
         <el-form-item :label="$t('使用部门')" prop="useDept">
           <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
@@ -659,6 +665,7 @@
       this.form = {
         id: null,
         plantCode: null,
+        unit: null,
         carNo: null,
         devname: null,
         devno: null,
@@ -980,13 +987,13 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 23 && row.warnFlag == 1){
+      if (columnIndex == 24 && row.warnFlag == 1){
         return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 23 && row.warnFlag == 2){
+      if (columnIndex == 24 && row.warnFlag == 2){
         return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 23 && row.warnFlag == 3){
+      if (columnIndex == 24 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
     },

ui/src/views/sems/specCc/specCc-hisReform.vue

@@ -2,6 +2,7 @@
   <el-dialog :title="$t('改造记录')" :visible.sync="visible" width="1200px" append-to-body>
     <el-table v-loading="loading" ref="deviceTable" :data="specCcList" :height="clientHeight" border>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>

ui/src/views/sems/specCc/ty.vue

@@ -105,6 +105,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specCcList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
@@ -179,10 +180,10 @@
     />
 
     <!-- 添加或修改特种设备叉车台账对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item :label="$t('装置')" prop="plantCode">
               <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
                 <el-option
@@ -194,6 +195,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('单元')" prop="unit">
+              <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
         <el-form-item :label="$t('使用部门')" prop="useDept">
           <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
@@ -635,6 +641,7 @@ export default {
       this.form = {
         id: null,
         plantCode: null,
+        unit: null,
         carNo: null,
         devname: null,
         devno: null,

ui/src/views/sems/specCc/zx.vue

@@ -60,6 +60,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specCcList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" fixed="left"/>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
@@ -129,10 +130,10 @@
     />
 
     <!-- 添加或修改特种设备叉车台账对话框 -->
-    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="900px" append-to-body>
+    <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
             <el-form-item :label="$t('装置')" prop="plantCode">
               <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
                 <el-option
@@ -144,6 +145,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('单元')" prop="unit">
+              <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
         <el-form-item :label="$t('使用部门')" prop="useDept">
           <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
@@ -585,6 +591,7 @@ export default {
       this.form = {
         id: null,
         plantCode: null,
+        unit: null,
         carNo: null,
         devname: null,
         devno: null,

ui/src/views/sems/specDt/bf.vue

@@ -69,8 +69,8 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specDtList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
-
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" fixed="left"  prop="model" :show-overflow-tooltip="true"/>
@@ -128,7 +128,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
               <el-option
@@ -140,6 +140,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('档案号')" prop="docno">
           <el-input v-model="form.docno" :placeholder="$t('请输入')+ $t('档案号')" />

ui/src/views/sems/specDt/index.vue

@@ -134,8 +134,8 @@
               :height="clientHeight" border :cell-style="tableCellStyle"  @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
-
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" fixed="left"  prop="model" :show-overflow-tooltip="true"/>
@@ -206,7 +206,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
               <el-option
@@ -218,6 +218,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('档案号')" prop="docno">
           <el-input v-model="form.docno" :placeholder="$t('请输入')+ $t('档案号')" />
@@ -895,13 +900,13 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 18 && row.warnFlag == 1){
+      if (columnIndex == 19 && row.warnFlag == 1){
         return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 18 && row.warnFlag == 2){
+      if (columnIndex == 19 && row.warnFlag == 2){
         return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 18 && row.warnFlag == 3){
+      if (columnIndex == 19 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
     },

ui/src/views/sems/specDt/specDt-hisReform.vue

@@ -2,6 +2,7 @@
   <el-dialog :title="$t('改造记录')" :visible.sync="visible" width="1200px" append-to-body>
     <el-table v-loading="loading" ref="reTable" :data="specDtList" :height="clientHeight" border>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>

ui/src/views/sems/specDt/ty.vue

@@ -114,6 +114,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specDtList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
@@ -178,7 +179,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
               <el-option
@@ -190,6 +191,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('档案号')" prop="docno">
           <el-input v-model="form.docno" :placeholder="$t('请输入')+ $t('档案号')" />

ui/src/views/sems/specDt/zx.vue

@@ -69,6 +69,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specDtList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center"  fixed="left" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
@@ -128,7 +129,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="5">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm == 1">
               <el-option
@@ -140,6 +141,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('档案号')" prop="docno">
           <el-input v-model="form.docno" :placeholder="$t('请输入')+ $t('档案号')" />

ui/src/views/sems/specDzsb/bf.vue

@@ -70,6 +70,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specDzsbList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('状态')" align="center" fixed="left"  prop="status" :formatter="statusFormat" />
@@ -138,7 +139,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm==1">
               <el-option
@@ -150,6 +151,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('装置维修组')" prop="plantMaint">
           <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">

ui/src/views/sems/specDzsb/index.vue

@@ -134,6 +134,7 @@
               :height="clientHeight" border :cell-style="tableCellStyle" @sort-change="sortList">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('状态')" align="center" fixed="left"  prop="status" :formatter="statusFormat" />
@@ -209,7 +210,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm==1">
               <el-option
@@ -221,6 +222,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('装置维修组')" prop="plantMaint">
           <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
@@ -950,13 +956,13 @@
     },
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex == 19 && row.warnFlag == 1){
+      if (columnIndex == 20 && row.warnFlag == 1){
         return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 19 && row.warnFlag == 2){
+      if (columnIndex == 20 && row.warnFlag == 2){
         return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 19 && row.warnFlag == 3){
+      if (columnIndex == 20 && row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
     },

ui/src/views/sems/specDzsb/specDzsb-hisReform.vue

@@ -2,6 +2,7 @@
   <el-dialog :title="$t('改造记录')" :visible.sync="visible" width="1200px" append-to-body>
     <el-table v-loading="loading" ref="reTable" :data="specDzsbList"  :height="clientHeight" border>
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
 <!--      <el-table-column :label="$t('状态')" align="center" fixed="left"  prop="status" :formatter="statusFormat" />-->

ui/src/views/sems/specDzsb/ty.vue

@@ -115,6 +115,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specDzsbList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('状态')" align="center" fixed="left"  prop="status" :formatter="statusFormat" />
@@ -189,7 +190,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm==1">
               <el-option
@@ -201,6 +202,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('装置维修组')" prop="plantMaint">
           <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">

ui/src/views/sems/specDzsb/zx.vue

@@ -70,6 +70,7 @@
     <el-table v-loading="loading" ref="deviceTable" :data="specDzsbList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('状态')" align="center" fixed="left"  prop="status" :formatter="statusFormat" />
@@ -139,7 +140,7 @@
     <el-dialog v-dialogDrag :title="title" :visible.sync="open" width="1200px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
       <el-row>
-        <el-col :span="12">
+        <el-col :span="6">
           <el-form-item :label="$t('装置')" prop="plantCode">
             <el-select v-model="form.plantCode" :placeholder="$t('请选择')+ $t('装置')" filterable clearable size="small" v-bind:disabled="dataForm==1">
               <el-option
@@ -151,6 +152,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item :label="$t('单元')" prop="unit">
+            <el-input v-model="form.unit" :placeholder="$t('请选择')+ $t('单元')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
         <el-form-item :label="$t('装置维修组')" prop="plantMaint">
           <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">

ui/src/views/sems/specanalysis/LiftChart.vue

@@ -11,6 +11,7 @@
       <el-table  ref="deviceTable" :data="specDtList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
@@ -59,6 +60,7 @@
       <el-table  ref="deviceTable" :data="specCcList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
@@ -114,6 +116,7 @@
       <el-table  ref="deviceTable" :data="specDzsbList"
                  border >
         <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('装置维修工程师')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('设备名称')" align="center" fixed="left"  prop="devname" :show-overflow-tooltip="true"/>