LY smes

master/src/main/java/com/ruoyi/common/thread/SpecOverLifeThead.java

@@ -19,7 +19,6 @@ public class SpecOverLifeThead implements Runnable {
     }
 
     /*
-    * 发送邮件
     */
     @Override
     public void run() {

master/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java

@@ -31,7 +31,7 @@ public class ScheduleConfig
         // JobStore配置
         prop.put("org.quartz.jobStore.class", "org.quartz.impl.jdbcjobstore.JobStoreTX");
         // 集群配置
-        prop.put("org.quartz.jobStore.isClustered", "true");
+        prop.put("org.quartz.jobStore.isClustered", "false");
         prop.put("org.quartz.jobStore.clusterCheckinInterval", "15000");
         prop.put("org.quartz.jobStore.maxMisfiresToHandleAtATime", "1");
         prop.put("org.quartz.jobStore.txIsolationLevelSerializable", "false");

master/src/main/java/com/ruoyi/framework/task/TSpecdevAllTask.java

@@ -108,13 +108,13 @@ public class TSpecdevAllTask extends BaseController {
         this.checkWarnFlagForDzsb(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlgd(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlrq(firstlevel, secondlevel, thirdlevel, sdf);
+        //
         SpecDevYlgdThread specDevYlgdThread = new SpecDevYlgdThread(specdevYlgdService);
         Thread t = new Thread(specDevYlgdThread);
         t.start();
         SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(specdevYlrqService);
         Thread t3 = new Thread(specOverLifeThead);
         t3.start();
-
         SpecDevYlrqThread specDevYlgrThread = new SpecDevYlrqThread(specdevYlrqService);
         Thread t2 = new Thread(specDevYlgrThread);
         t2.start();
@@ -135,7 +135,6 @@ public class TSpecdevAllTask extends BaseController {
         }
         for (TAlarmPrincipal o : userList) {
             //根据装置权限获取数据
-
             List<SysPlant> plantList = sysPlantService.selectSysPlantByDeptId(o.getDeptId());
             logger.info("部门id"+o.getDeptId() + "--部门：" + plantList.toString());
             List<String> plants = new ArrayList<>();
@@ -146,6 +145,7 @@ public class TSpecdevAllTask extends BaseController {
             List<TSpecdevGl> list = this.specdevGlService.list(new QueryWrapper<TSpecdevGl>()
                     .eq("del_flag", 0).eq("status", "1")
                     .in("plant_code", plants)
+
             );
             //获取动态处理预警级别
             TAlarmtype tAlarmtype = this.tAlarmtypeService.selectTAlarmtypeById(this.alarmtype);
@@ -176,6 +176,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevGl);
                         continue;
                     }
+                    if (day > thirdlevel) {
+                        this.updateForGl(0l, tSpecdevGl);
+                        continue;
+                    }
                 }
             }
             glSendEmail(sdf, firstList, o, this.glWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -235,6 +239,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevCc);
                         continue;
                     }
+                    if (day > thirdlevel) {
+                        this.updateForCc(0L, tSpecdevCc);
+                        continue;
+                    }
                 }
             }
             ccSendEmail(sdf, firstList, o, this.ccWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -294,6 +302,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevDzsb);
                         continue;
                     }
+                    if (day > thirdlevel ) {
+                        this.updateForDzsb(0L, tSpecdevDzsb);
+                        continue;
+                    }
                 }
             }
             dzsbSendEmail(sdf, firstList, o, this.dzsbWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -353,6 +365,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevYlrq);
                         continue;
                     }
+                    if (day > thirdlevel ) {
+                        this.updateForYlrq(0L, tSpecdevYlrq);
+                        continue;
+                    }
                 }
             }
             ylrqSendEmail(sdf, firstList, o, this.ylrqWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -412,6 +428,11 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevYlgd);
                         continue;
                     }
+                    // 半年-一年 预警标识为1级
+                    if (day > thirdlevel ) {
+                        this.updateForYlgd(0L, tSpecdevYlgd);
+                        continue;
+                    }
                 }
             }
             ylgdSendEmail(sdf, firstList, o, this.ylgdWarningContent(firstList, sdf), this.firstWarningLevel);
@@ -469,6 +490,10 @@ public class TSpecdevAllTask extends BaseController {
                         thirdList.add(tSpecdevDt);
                         continue;
                     }
+                    if (day > thirdlevel ) {
+                        this.updateForDt(0L, tSpecdevDt);
+                        continue;
+                    }
                 }
             }
             dtSendEmail(sdf, firstList, o, this.dtWarningContent(firstList, sdf), this.firstWarningLevel);

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

@@ -107,7 +107,7 @@ public class SpecHomeController extends BaseController
         //压力管道
         int ylgdAll = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
 
@@ -117,7 +117,7 @@ public class SpecHomeController extends BaseController
                         .eq("STATUS" , 1)
                         .eq("del_flag" , 0)
                         .in("plant_code",plantIds)
-                        .in("unit",unitIds)
+//                        .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
 //                        .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
         );
@@ -156,7 +156,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                 .in("unit",unitIds)
+//                 .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
 //                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds).or().isNull("unit"))
         );
@@ -167,7 +167,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                  .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                 .in("unit",unitIds)
+//                 .in("unit",unitIds)
 //                .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
 //                .and(unitIds.size()>0 ,i -> i.in("unit",unitIds).or().in("plant_code",unitIds))
                 );
@@ -178,7 +178,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
         );
         Map<String, Object> mapdt = new HashMap<String, Object>();
         mapdt.put("dtAll_num", dtAll);
@@ -187,14 +187,14 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .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)
+//                .in("unit",unitIds)
                 .notLike("CHECK_STRATEGY","强制")
         );
 
@@ -206,7 +206,7 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
+//                .in("unit",unitIds)
         );
         Map<String, Object> mapcc = new HashMap<String, Object>();
         mapcc.put("ccAll_num", ccAll);
@@ -239,7 +239,7 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
+//                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -343,7 +343,6 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -360,7 +359,6 @@ public class SpecHomeController extends BaseController
                     .eq("del_flag" , 0)
                     .apply(true,applySql2,year)
                     .in("plant_code",plantIds)
-                    .in("unit",unitIds)
             );
             yearList2.add(year);
             countList2.add(num);
@@ -405,7 +403,6 @@ 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)
-                    .in("unit",unitIds)
             );
             yearList.add(year);
             countList.add(num);
@@ -570,14 +567,12 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","1","1级","1.0","一级","Ⅰ级")
-                .in("unit",unitIds)
         );
         int safe2 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","2","2级","2.0","二级","Ⅱ级")
-                .in("unit",unitIds)
         );
 
         int safe3 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -585,7 +580,6 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","3","3级","3.0","三级","Ⅲ级")
-                .in("unit",unitIds)
         );
 
         int safe4 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
@@ -593,20 +587,17 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","4","4级","4.0","四级","Ⅳ级")
-                .in("unit",unitIds)
         );
         int safe5 = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","5","5级","5.0","五级","Ⅴ级")
-                .in("unit",unitIds)
         );
         int safeall = tSpecdevYlrqService.count(new QueryWrapper<TSpecdevYlrq>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
         );
         int safeNa = safeall - safe1 - safe2- safe3- safe4 - safe5;
         List safeList = new ArrayList();
@@ -634,34 +625,29 @@ public class SpecHomeController extends BaseController
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","1","1级","1.0","一级","Ⅰ级")
-                .in("unit",unitIds)
         );
         int safe2 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","2","2级","2.0","二级","Ⅱ级")
-                .in("unit",unitIds)
         );
         int safe3 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","3","3级","3.0","三级","Ⅲ级")
-                .in("unit",unitIds)
         );
         int safe4 = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
                 .in("safe_class","4","4级","4.0","四级","Ⅳ级")
-                .in("unit",unitIds)
         );
         int safeall = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
         );
         int safeNa = safeall - safe1 - safe2- safe3- safe4;
         List safeList = new ArrayList();
@@ -687,13 +673,11 @@ public class SpecHomeController extends BaseController
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
         );
         int cc = tSpecdevGlService.count(new QueryWrapper<TSpecdevGl>()
                 .eq("STATUS" , 1)
                 .eq("del_flag" , 0)
                 .in("plant_code",plantIds)
-                .in("unit",unitIds)
                 .in("CHECK_CONCLUSION","符合要求","允许运行")
         );
         String per = "0";
@@ -719,7 +703,6 @@ public class SpecHomeController extends BaseController
                     .notIn("APPROVE_STATUS" , 0)
                     .in("plant_code",plantIds)
                     .eq("del_flag" , 0)
-                    .in("unit",unitIds)
             );
         if (ylrqList!= null){
             for (TSpecdevYlrq t: ylrqList
@@ -738,7 +721,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (ylgdList!= null){
             for (TSpecdevYlgd t: ylgdList
@@ -757,7 +739,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (GlList!= null){
             for (TSpecdevGl t: GlList
@@ -776,7 +757,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (dzsbList!= null){
             for (TSpecdevDzsb t: dzsbList
@@ -795,7 +775,6 @@ public class SpecHomeController extends BaseController
                 .notIn("APPROVE_STATUS" , 0)
                 .in("plant_code",plantIds)
                 .eq("del_flag" , 0)
-                .in("unit",unitIds)
         );
         if (dtList!= null){
             for (TSpecdevDt t: dtList
@@ -813,7 +792,6 @@ 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/TSpecdevYlrqController.java

@@ -70,9 +70,9 @@ public class TSpecdevYlrqController extends BaseController
 //        Thread t = new Thread(specOverLifeThead);
 //        t.start();
 
-//        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
-//        Thread t2 = new Thread(specDevYlgdThread);
-//        t2.start();
+        SpecDevYlrqThread specDevYlgdThread = new SpecDevYlrqThread(tSpecdevYlrqService);
+        Thread t2 = new Thread(specDevYlgdThread);
+        t2.start();
         return getDataTable(list);
     }
 

master/src/main/resources/application.yml

@@ -93,24 +93,24 @@ spring:
         max-wait: -1ms
   # 邮箱配置
   mail:
-#    host: smtpout.basf-it-services.com
-#    protocol: smtp
-#    default-encoding: UTF-8
-#    password:
-#    username:
-#    port: 25
-#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
-#    properties.mail.debug: true
-#    from: CPMS.byc@BASF-YPC.com.cn
-    host: smtp.exmail.qq.com
+    host: smtpout.basf-it-services.com
     protocol: smtp
     default-encoding: UTF-8
-    password: vvTAT8hciG7FLk4C
-    username: email@seashoreept.com
-    port: 587
+    password:
+    username:
+    port: 25
     properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
     properties.mail.debug: true
-    from: email@seashoreept.com
+    from: CPMS.byc@BASF-YPC.com.cn
+#    host: smtp.exmail.qq.com
+#    protocol: smtp
+#    default-encoding: UTF-8
+#    password: vvTAT8hciG7FLk4C
+#    username: email@seashoreept.com
+#    port: 587
+#    properties.mail.stmp.socketFactory.class: javax.net.ssl.SSLSocketFactory
+#    properties.mail.debug: true
+#    from: email@seashoreept.com
 # token配置
 token:
     # 令牌自定义标识

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

@@ -1199,16 +1199,15 @@ export default {
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 8 && row.isRepeat == 1){
-        return "color:rgba(255, 26, 26, 0.98);background-color:rgba(255, 68,68, 0.5);"
+        return "color:rgba(255, 26, 26, 0.98);"
       }
-
-      if (columnIndex == 35 && row.warnFlag == 1){
+      if (row.warnFlag == 1){
         return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 35 && row.warnFlag == 2){
+      if (row.warnFlag == 2){
         return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 35 && row.warnFlag == 3){
+      if (row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
     },

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

@@ -1102,116 +1102,17 @@
     }*/
     //位号颜色变换
     tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if(columnIndex == 1 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 2 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 3 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 4 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 5 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 6 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 8 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 9 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 10 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 11 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 12 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 13 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 14 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 15 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 16 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 17 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 18 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 19 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 20 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 21 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 22 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 23 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 24 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 25 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 26 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 27 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 28 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 29 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 30 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 31 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 32 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 33 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
-      if(columnIndex == 34 && row.isRepeat == 1){
-        return "background-color:rgba(255, 68,68, 0.5);"
-      }
 
       if (columnIndex == 7 && row.isRepeat == 1){
-        return "color:rgba(255, 26, 26, 0.98); background-color:rgba(255, 68,68, 0.5);"
+        return "color:rgba(255, 26, 26, 0.98);"
       }
-      if (columnIndex == 28 && row.warnFlag == 1){
+      if (row.warnFlag == 1){
         return "background-color:rgba(255, 255,153, 0.5);"
       }
-      if (columnIndex == 28 && row.warnFlag == 2){
+      if ( row.warnFlag == 2){
         return "background-color:rgba(255, 180, 68, 0.5);"
       }
-      if (columnIndex == 28 && row.warnFlag == 3){
+      if ( row.warnFlag == 3){
         return "background-color:rgba(255, 68,68, 0.5);"
       }
     },

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

@@ -16,16 +16,16 @@
                   </el-option>
                 </el-select>
               </div>
-              <div style="text-align: center; margin-top: 0.2rem">
-                <el-select v-model="unitIds" @change="handleCommandUnit" multiple collapse-tags :placeholder="$t('请选择') + $t('单元')">
-                  <el-option
-                    v-for="item in unitList"
-                    :key="item.plantId"
-                    :label="item.name"
-                    :value="item.name">
-                  </el-option>
-                </el-select>
-              </div>
+<!--              <div style="text-align: center; margin-top: 0.2rem">-->
+<!--                <el-select v-model="unitIds" @change="handleCommandUnit" multiple collapse-tags :placeholder="$t('请选择') + $t('单元')">-->
+<!--                  <el-option-->
+<!--                    v-for="item in unitList"-->
+<!--                    :key="item.plantId"-->
+<!--                    :label="item.name"-->
+<!--                    :value="item.name">-->
+<!--                  </el-option>-->
+<!--                </el-select>-->
+<!--              </div>-->
             </div>
           </div>
         </div>
@@ -68,7 +68,7 @@
               </div>
               <div style="margin-left: 0.2rem; margin-top: 0.2rem">
                 <div class="en-spec-text" style="color: #e4da3a;">{{ $t('压力管道') }}</div>
-                <div class="specFontSmall"><span style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('设备数') }}</span>{{
+                <div class="specFontSmall" style="margin-top: 0.3rem"><span style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('设备数') }}</span>{{
                     devDatas.ylgdData.ylgdAll_num
                   }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('条') }}</span></div>
                 <div class="specFontSmall"><span style="font-size: 10px; color: #4a7d87;margin-right: 0.1rem">{{ $t('总长度') }}</span>{{ devDatas.ylgdData.ylgd_length }}<span
@@ -102,7 +102,7 @@
               <div style="margin-left: 0.2rem;margin-top: 0.2rem">
                 <div class="en-spec-text" style="color: #92D050;">{{ $t('起重机械') }}</div>
 
-                  <div class="specFontSmall"><span
+                  <div class="specFontSmall" style="margin-top: 0.3rem"><span
                     style="font-size: 10px; color: #4a7d87;">{{ $t('特种设备2') }}</span>{{
                       devDatas.dzsbData.dzsbAll_num
                     }}<span style="font-size: 10px; color: #4a7d87; margin-left: 0.1rem">{{ $t('台') }}</span></div>