LIU 3.22

master/src/main/java/com/ruoyi/project/aspen/domain/TDashboarddata.java

@@ -185,8 +185,8 @@ public class TDashboarddata extends BaseEntity
     @Excel(name = "蒸汽平衡表HS出量PH2")
     private String steamHsoutpher;
 
-    /** 蒸汽平衡表HS出量H520/C23 */
-    @Excel(name = "蒸汽平衡表HS出量H520/C23")
+    /** 蒸汽平衡表HS出量H520 */
+    @Excel(name = "蒸汽平衡表HS出量H520")
     private String steamHsouthwu;
 
     /** 蒸汽平衡表HS出量K650 */
@@ -473,6 +473,18 @@ public class TDashboarddata extends BaseEntity
     @Excel(name = "累计能耗")
     private String cumulative;
 
+    /** 蒸汽平衡表HS出量C230 */
+    @Excel(name = "蒸汽平衡表HS出量C230")
+    private String steamHsouthc230;
+
+    public String getSteamHsouthc230() {
+        return steamHsouthc230;
+    }
+
+    public void setSteamHsouthc230(String steamHsouthc230) {
+        this.steamHsouthc230 = steamHsouthc230;
+    }
+
     public void setId(Long id)
     {
         this.id = id;
@@ -1093,7 +1105,7 @@ public class TDashboarddata extends BaseEntity
             .append("outputBx", getOutputBx())
             .append("outputAnnual", getOutputAnnual())
             .append("instantaneous", getInstantaneous())
-            .append("cumulative", getCumulative())
+                .append("steamhsouthc230",getSteamHsouthc230())
             .toString();
     }
 }

master/src/main/resources/mybatis/aspen/TDashboarddataMapper.xml

@@ -119,10 +119,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="outputAnnual"    column="output_annual"    />
         <result property="instantaneous"    column="instantaneous"    />
         <result property="cumulative"    column="cumulative"    />
+        <result property="steamHsouthc230"    column="steam_hsouthc230"    />
     </resultMap>
 
     <sql id="selectTDashboarddataVo">
-        select id, del_flag, creater_code, createdate, updater_code, updatedate, energy_yixi, energy_bingxi, energy_qingqi, energy_jiawan, energy_csi, energy_benzene, energy_toluene, energy_xylene, energy_tanliu, energy_washoil, energy_tanwu, energy_ima, energy_cjiu, energy_rpg, energyfeed_nap, energyfeed_yiwan, energyfeed_tanwu, energyfeed_tanliu, energyfeed_lpg, energy_offgas, energy_lpg, steam_ssinfur, steam_ssoutlet, steam_ssoutaeu, steam_ssoutesi, steam_ssoutksan, steam_ssoutsc, steam_hsinsub, steam_hsinlet, steam_hsinksan, steam_hsoutpjiu, steam_hsoutaeu, steam_hsoutlet, steam_hsoutesan, steam_hsoutphyi, steam_hsoutpher, steam_hsouthwu, steam_hsoutkliu, steam_hsoutklz, steam_hsoutsc, steam_hhpsub, steam_msinaeu, steam_msinlet, steam_msinphyi, steam_msinkliu, steam_msoutflare, steam_msoutaeu, steam_msoutsctu, steam_msouteer, steam_msoutfur, steam_msoutva, steam_msouttracing, steam_lsinsub, steam_lsinpjiu, steam_lsinaeu, steam_lsineer, steam_lsinpher, steam_lsoutsctu, steam_lsoutvjiu, steam_lsoutewuliu, steam_lsoutewusan, steam_lsouttracing, steam_lsoutesan, steam_lsoutesi, steam_lsoutother, nap_one, nap_two, nap_three, eht_one, eht_two, eht_three, eht_four, eht_five, acr_one, acr_two, acr_three, acr_four, acr_zero, pro_two, pro_one, pro_three, pro_four, ss_bcc, ss_sub, ss_eu, ss_pgu, hhp_bcc, hhp_sub, hs_bcc, hs_sub, hs_eu, hs_pgu, ms_bcc, ms_eu, ms_pgu, ls_bcc, ls_eu, ls_pgu, total_bcc, total_eu, zong_bcc, zong_eu, zong_pgu, output_yixi, output_bx, output_annual, instantaneous, cumulative from t_dashboarddata
+        select id, del_flag, creater_code, createdate, updater_code, updatedate, energy_yixi, energy_bingxi, energy_qingqi, energy_jiawan, energy_csi, energy_benzene, energy_toluene, energy_xylene, energy_tanliu, energy_washoil, energy_tanwu, energy_ima, energy_cjiu, energy_rpg, energyfeed_nap, energyfeed_yiwan, energyfeed_tanwu, energyfeed_tanliu, energyfeed_lpg, energy_offgas, energy_lpg, steam_ssinfur, steam_ssoutlet, steam_ssoutaeu, steam_ssoutesi, steam_ssoutksan, steam_ssoutsc, steam_hsinsub, steam_hsinlet, steam_hsinksan, steam_hsoutpjiu, steam_hsoutaeu, steam_hsoutlet, steam_hsoutesan, steam_hsoutphyi, steam_hsoutpher, steam_hsouthwu, steam_hsoutkliu, steam_hsoutklz, steam_hsoutsc, steam_hhpsub, steam_msinaeu, steam_msinlet, steam_msinphyi, steam_msinkliu, steam_msoutflare, steam_msoutaeu, steam_msoutsctu, steam_msouteer, steam_msoutfur, steam_msoutva, steam_msouttracing, steam_lsinsub, steam_lsinpjiu, steam_lsinaeu, steam_lsineer, steam_lsinpher, steam_lsoutsctu, steam_lsoutvjiu, steam_lsoutewuliu, steam_lsoutewusan, steam_lsouttracing, steam_lsoutesan, steam_lsoutesi, steam_lsoutother, nap_one, nap_two, nap_three, eht_one, eht_two, eht_three, eht_four, eht_five, acr_one, acr_two, acr_three, acr_four, acr_zero, pro_two, pro_one, pro_three, pro_four, ss_bcc, ss_sub, ss_eu, ss_pgu, hhp_bcc, hhp_sub, hs_bcc, hs_sub, hs_eu, hs_pgu, ms_bcc, ms_eu, ms_pgu, ls_bcc, ls_eu, ls_pgu, total_bcc, total_eu, zong_bcc, zong_eu, zong_pgu, output_yixi, output_bx, output_annual, instantaneous, cumulative, steamHsouthc230 from t_dashboarddata
     </sql>
 
     <select id="selectTDashboarddataList" parameterType="TDashboarddata" resultMap="TDashboarddataResult">
@@ -287,6 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outputAnnual != null">output_annual,</if>
             <if test="instantaneous != null">instantaneous,</if>
             <if test="cumulative != null">cumulative,</if>
+            <if test="steamHsouthc230 != null">steam_hsouthc230,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -403,6 +405,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outputAnnual != null">#{outputAnnual},</if>
             <if test="instantaneous != null">#{instantaneous},</if>
             <if test="cumulative != null">#{cumulative},</if>
+            <if test="steamHsouthc230 != null">#{steamHsouthc230},</if>
          </trim>
     </insert>
 
@@ -522,6 +525,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outputAnnual != null">output_annual = #{outputAnnual},</if>
             <if test="instantaneous != null">instantaneous = #{instantaneous},</if>
             <if test="cumulative != null">cumulative = #{cumulative},</if>
+            <if test="steamHsouthc230 != null">steam_hsouthc230 = #{steamHsouthc230},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/front/steamBalance.vue

@@ -161,7 +161,7 @@
 
         <div class="jiantou8">
           <img src="@/assets/steamImg/jiantou5.png" style="width:8px;height:34px">
-           <p class="num">{{ dashboarddata.steamHsouthwu }}</p>
+           <p class="num">{{ dashboarddata.steamHsouthwu }}/{{dashboarddata.steamHsouthc230}}</p>
         </div>
 
         <div class="jiantou9">