联锁页面非正常状态加一个颜色 ，比如故障是红色，正常是绿色

jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/mapper/xml/InterlockDetailMapper.xml

@@ -29,13 +29,15 @@
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.instrument_status, d.control_system_status,
                s.interlock_status, s.loop_health_level, d.bypass, s.interlock_apparatus_id, s.interlock_system_id,
         h1.interlock_status_name , h2.bypass_name ,
-        h3.instrument_status_name , h4.control_system_status_name
+        h3.instrument_status_name , h4.control_system_status_name,
+        h.instrument_status_normal, h.bypass_yes, h.interlock_status_ty, h.control_system_status_normal
         from interlock_detail d
             left join interlock_summary s on d.summaryid = s.id
             left join interlock_base_hy h1 on h1.interlock_status = s.interlock_status and h1.interlock_system_id = s.interlock_system_id
             left join interlock_base_hy h2 on h2.bypass = d.bypass and h2.interlock_system_id = s.interlock_system_id
             left join interlock_base_hy h3 on h3.instrument_status = d.instrument_status and h3.interlock_system_id = s.interlock_system_id
             left join interlock_base_hy h4 on h4.control_system_status = d.control_system_status and h4.interlock_system_id = s.interlock_system_id
+        left join interlock_base h on h.id = s.interlock_system_id
         <where>
             <if test="interlockSummaryVO.interlockApparatusId != null and interlockSummaryVO.interlockApparatusId != ''"> and s.interlock_apparatus_id = #{interlockSummaryVO.interlockApparatusId}</if>
             <if test="interlockSummaryVO.interlockSystemId != null and interlockSummaryVO.interlockSystemId != ''"> and s.interlock_system_id = #{interlockSummaryVO.interlockSystemId}</if>

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/vo/InterlockSummaryVO.java

@@ -44,18 +44,21 @@ public class InterlockSummaryVO {
 //    @Dict(dicCode = "instrument_status")
     private java.lang.String instrumentStatus;
     private java.lang.String instrumentStatusName;
+    private java.lang.String instrumentStatusNormal;
     /**控制系统状态*/
     @Excel(name = "控制系统状态", width = 15)
     @ApiModelProperty(value = "控制系统状态")
 //    @Dict(dicCode = "control_system_status")
     private java.lang.String controlSystemStatus;
     private java.lang.String controlSystemStatusName;
+    private java.lang.String controlSystemStatusNormal;
     /**联锁状态*/
     @Excel(name = "联锁状态", width = 15)
     @ApiModelProperty(value = "联锁状态")
 //    @Dict(dicCode = "interlock_status")
     private java.lang.String interlockStatus;
     private java.lang.String interlockStatusName;
+    private java.lang.String interlockStatusTy;
     /**回路健康级别*/
     @Excel(name = "回路健康级别", width = 15)
     @ApiModelProperty(value = "回路健康级别")
@@ -65,6 +68,7 @@ public class InterlockSummaryVO {
     @ApiModelProperty(value = "旁路状态")
     private java.lang.String bypass;
     private java.lang.String bypassName;
+    private java.lang.String bypassYes;
 
 
     /**装置id*/