LY smes

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

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevCc;
+import com.ruoyi.project.sems.service.ITSpecdevCcService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevCcThread implements Runnable {
+
+    private ITSpecdevCcService specdevCcService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevCcThread(ITSpecdevCcService specdevCcService) {
+        this.specdevCcService = specdevCcService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevCc> list = this.specdevCcService.list(new QueryWrapper<TSpecdevCc>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevCc t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevCcService.updateTSpecdevCc(t);
+        }
+        for (TSpecdevCc tSpecdevCc : list) {
+            for (TSpecdevCc specdevCc : list) {
+                if (tSpecdevCc.getId() == specdevCc.getId() || StringUtils.isEmpty(tSpecdevCc.getRegno())
+                        || StringUtils.isEmpty(specdevCc.getRegno())) {
+                    continue;
+                }
+                if (tSpecdevCc.getRegno().equals(specdevCc.getRegno()) && tSpecdevCc.getPlantCode().equals(specdevCc.getPlantCode())) {
+                    specdevCc.setIsRepeat(1L);
+                    this.specdevCcService.updateTSpecdevCc(specdevCc);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevDt;
+import com.ruoyi.project.sems.service.ITSpecdevDtService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevDtThread implements Runnable {
+
+    private ITSpecdevDtService specdevDtService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevDtThread(ITSpecdevDtService specdevDtService) {
+        this.specdevDtService = specdevDtService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevDt> list = this.specdevDtService.list(new QueryWrapper<TSpecdevDt>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevDt t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevDtService.updateTSpecdevDt(t);
+        }
+        for (TSpecdevDt tSpecdevDt : list) {
+            for (TSpecdevDt specdevDt : list) {
+                if (tSpecdevDt.getId() == specdevDt.getId() || StringUtils.isEmpty(tSpecdevDt.getRegno())
+                        || StringUtils.isEmpty(specdevDt.getRegno())) {
+                    continue;
+                }
+                if (tSpecdevDt.getRegno().equals(specdevDt.getRegno()) && tSpecdevDt.getPlantCode().equals(specdevDt.getPlantCode())) {
+                    specdevDt.setIsRepeat(1L);
+                    this.specdevDtService.updateTSpecdevDt(specdevDt);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevDzsb;
+import com.ruoyi.project.sems.service.ITSpecdevDzsbService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevDzsbThread implements Runnable {
+
+    private ITSpecdevDzsbService specdevDzsbService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevDzsbThread(ITSpecdevDzsbService specdevDzsbService) {
+        this.specdevDzsbService = specdevDzsbService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevDzsb> list = this.specdevDzsbService.list(new QueryWrapper<TSpecdevDzsb>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevDzsb t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevDzsbService.updateTSpecdevDzsb(t);
+        }
+        for (TSpecdevDzsb tSpecdevDzsb : list) {
+            for (TSpecdevDzsb specdevDzsb : list) {
+                if (tSpecdevDzsb.getId() == specdevDzsb.getId() || StringUtils.isEmpty(tSpecdevDzsb.getDevno())
+                        || StringUtils.isEmpty(specdevDzsb.getDevno())) {
+                    continue;
+                }
+                if (tSpecdevDzsb.getDevno().equals(specdevDzsb.getDevno()) && tSpecdevDzsb.getPlantCode().equals(specdevDzsb.getPlantCode())) {
+                    specdevDzsb.setIsRepeat(1L);
+                    this.specdevDzsbService.updateTSpecdevDzsb(specdevDzsb);
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.ruoyi.common.thread;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.project.sems.domain.TSpecdevGl;
+import com.ruoyi.project.sems.service.ITSpecdevGlService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class SpecDevGlThread implements Runnable {
+
+    private ITSpecdevGlService specdevGlService;
+    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    public SpecDevGlThread(ITSpecdevGlService specdevGlService) {
+        this.specdevGlService = specdevGlService;
+    }
+
+    @Override
+    public void run() {
+        List<TSpecdevGl> list = this.specdevGlService.list(new QueryWrapper<TSpecdevGl>()
+                .eq("del_flag", 0).eq("status", "1"));
+        logger.info("开始循环");
+        //重置Repeat
+        for (TSpecdevGl t : list
+             ) {
+            t.setIsRepeat(0L);
+            this.specdevGlService.updateTSpecdevGl(t);
+        }
+        for (TSpecdevGl tSpecdevGl : list) {
+            for (TSpecdevGl specdevGl : list) {
+                if (tSpecdevGl.getId() == specdevGl.getId() || StringUtils.isEmpty(tSpecdevGl.getDevno())
+                        || StringUtils.isEmpty(specdevGl.getDevno())) {
+                    continue;
+                }
+                if (tSpecdevGl.getDevno().equals(specdevGl.getDevno()) && tSpecdevGl.getPlantCode().equals(specdevGl.getPlantCode())) {
+                    specdevGl.setIsRepeat(1L);
+                    this.specdevGlService.updateTSpecdevGl(specdevGl);
+                }
+            }
+        }
+    }
+}

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

@@ -37,7 +37,7 @@ public class SpecDevYlgdThread implements Runnable {
                         || StringUtils.isEmpty(specdevYlgd.getDevno())) {
                     continue;
                 }
-                if (tSpecdevYlgd.getDevno().equals(specdevYlgd.getDevno())) {
+                if (tSpecdevYlgd.getDevno().equals(specdevYlgd.getDevno()) && tSpecdevYlgd.getPlantCode().equals(specdevYlgd.getPlantCode())) {
                     specdevYlgd.setIsRepeat(1L);
                     this.specdevYlgdService.updateTSpecdevYlgd(specdevYlgd);
                 }

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

@@ -41,7 +41,7 @@ public class SpecDevYlrqThread implements Runnable {
                         || StringUtils.isEmpty(specdevYlrq.getDevno())) {
                     continue;
                 }
-                if (tSpecdevYlrq.getDevno().equals(specdevYlrq.getDevno())) {
+                if (tSpecdevYlrq.getDevno().equals(specdevYlrq.getDevno()) && tSpecdevYlrq.getPlantCode().equals(specdevYlrq.getPlantCode())) {
                     specdevYlrq.setIsRepeat(1L);
                     this.specdevYlrqService.updateTSpecdevYlrq(specdevYlrq);
                 }

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

@@ -2,9 +2,7 @@ package com.ruoyi.framework.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.sendEmail.IMailService;
-import com.ruoyi.common.thread.SpecDevYlgdThread;
-import com.ruoyi.common.thread.SpecDevYlrqThread;
-import com.ruoyi.common.thread.SpecOverLifeThead;
+import com.ruoyi.common.thread.*;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.config.RuoYiConfig;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -109,15 +107,28 @@ public class TSpecdevAllTask extends BaseController {
         this.checkWarnFlagForYlgd(firstlevel, secondlevel, thirdlevel, sdf);
         this.checkWarnFlagForYlrq(firstlevel, secondlevel, thirdlevel, sdf);
         //
+        SpecOverLifeThead specOverLifeThead = new SpecOverLifeThead(specdevYlrqService);
+        Thread t0 = new Thread(specOverLifeThead);
+        t0.start();
+        //
         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();
+        SpecDevCcThread specDevCcThread = new SpecDevCcThread(specdevCcService);
+        Thread t3 = new Thread(specDevCcThread);
+        t3.start();
+        SpecDevDtThread specDevDtThread = new SpecDevDtThread(specdevDtService);
+        Thread t4 = new Thread(specDevDtThread);
+        t4.start();
+        SpecDevGlThread specDevGlThread = new SpecDevGlThread(specdevGlService);
+        Thread t5 = new Thread(specDevGlThread);
+        t5.start();
+        SpecDevDzsbThread specDevDzsbThread = new SpecDevDzsbThread(specdevDzsbService);
+        Thread t6 = new Thread(specDevDzsbThread);
+        t6.start();
     }
 
     private void checkWarnFlagForGl(Long firstlevel, Long secondlevel, Long thirdlevel, SimpleDateFormat sdf) {

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

@@ -218,6 +218,16 @@ public class TSpecdevCc extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public String getPerTestConclusion() {
         return perTestConclusion;
     }

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

@@ -187,6 +187,16 @@ public class TSpecdevDt extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public String getPerTestConclusion() {
         return perTestConclusion;
     }

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

@@ -188,6 +188,16 @@ public class TSpecdevDzsb extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public String getPerTestConclusion() {
         return perTestConclusion;
     }

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

@@ -211,6 +211,16 @@ public class TSpecdevGl extends BaseEntity
     @TableField(exist = false)
     private String checkYear;
 
+    private Long isRepeat;
+
+    public Long getIsRepeat() {
+        return isRepeat;
+    }
+
+    public void setIsRepeat(Long isRepeat) {
+        this.isRepeat = isRepeat;
+    }
+
     public Long getHiFlag() {
         return hiFlag;
     }

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

@@ -50,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="assetOwner"    column="asset_owner"    />
         <result property="hiFlag" column="hiFlag" />
         <result property="perTestConclusion" column="per_test_conclusion" />
+        <result property="isRepeat" column="is_repeat"/>
     </resultMap>
 
     <sql id="selectTSpecdevCcVo">
@@ -66,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                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 ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_CC h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
+                ,d.is_repeat
         from t_specdev_cc d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -84,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code asc , d.unit,  d.id
+        order by d.is_repeat desc, d.plant_code asc , d.unit,  d.id
     </select>
 
     <select id="selectTSpecdevCcListByYear" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">
@@ -264,6 +266,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productNo != null">product_no = #{productNo},</if>
             <if test="assetOwner != null">asset_owner = #{assetOwner},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -42,11 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reportNo"    column="report_no"    />
         <result property="hiFlag" column="hiFlag" />
         <result property="perTestConclusion" column="per_test_conclusion" />
+        <result property="isRepeat" column="is_repeat"/>
     </resultMap>
 
     <sql id="selectTSpecdevDtVo">
         select d.id, d.plant_code, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, 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.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_DT h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
+        ,d.is_repeat
         from t_specdev_dt d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -64,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit ,d.id
+        order by d.is_repeat desc, d.plant_code, d.unit ,d.id
     </select>
 
     <select id="selectTSpecdevDtListByYear" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">
@@ -229,6 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="changeTime != null">change_time = #{changeTime},</if>
             <if test="reportNo != null">report_no = #{reportNo},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -42,11 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isEx"    column="is_ex"    />
         <result property="hiFlag" column="hiFlag" />
         <result property="perTestConclusion" column="per_test_conclusion" />
+        <result property="isRepeat" column="is_repeat"/>
     </resultMap>
 
     <sql id="selectTSpecdevDzsbVo">
         select d.id, d.plant_code, d.unit, 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.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex  ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_DZSB h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
+                ,d.is_repeat
         from t_specdev_dzsb d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -65,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.id
+        order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
     <select id="selectTSpecdevDzsbListByYear" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
         <include refid="selectTSpecdevDzsbVo"/>
@@ -221,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="engineer != null">engineer = #{engineer},</if>
             <if test="isEx != null">is_ex = #{isEx},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -48,11 +48,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="outReportNo"    column="out_report_no"    />
         <result property="engineer"    column="engineer"    />
         <result property="hiFlag" column="hiFlag" />
+        <result property="isRepeat" column="is_repeat"/>
     </resultMap>
 
     <sql id="selectTSpecdevGlVo">
         select d.id, d.plant_code, d.unit, 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.burn_mode, d.burn_kind, d.rated_power, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.check_conclusion, d.model, d.water_mode, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.out_warn_date, d.out_next_warn_date, d.out_check_conclusion, d.out_report_no, d.engineer ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_GL h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag
+        ,d.is_repeat
         from t_specdev_gl d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -91,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.id
+        order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
     <select id="selectTSpecdevGlListByYear" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">
@@ -267,6 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outCheckConclusion != null">out_check_conclusion = #{outCheckConclusion},</if>
             <if test="outReportNo != null">out_report_no = #{outReportNo},</if>
             <if test="engineer != null">engineer = #{engineer},</if>
+            <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
         </trim>
         where id = #{id}
     </update>

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

@@ -165,7 +165,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.id
+        order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
 

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

@@ -137,7 +137,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.id
+        order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
     <select id="selectTSpecdevYlrqListByYear" parameterType="TSpecdevYlrq" resultMap="TSpecdevYlrqResult">

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

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

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

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

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

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

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

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