shi'sen'yuan 3 жил өмнө
parent
commit
abed0848f4

+ 215 - 0
master/src/main/java/com/ruoyi/project/aspen/domain/TDashboarddata.java

@@ -193,6 +193,10 @@ public class TDashboarddata extends BaseEntity
     @Excel(name = "蒸汽平衡表HS出量K650")
     private String steamHsoutkliu;
 
+    /** 蒸汽平衡表HS出量K600 */
+    @Excel(name = "蒸汽平衡表HS出量K600")
+    private String steamHsoutklz;
+
     /** 蒸汽平衡表HS出量K600凝液 */
     @Excel(name = "蒸汽平衡表HS出量K600凝液")
     private String steamHsoutsc;
@@ -365,6 +369,110 @@ public class TDashboarddata extends BaseEntity
     @Excel(name = "芳烃储罐STT1410")
     private String proFour;
 
+    /** BCC总需求SS-BCC */
+    @Excel(name = "BCC总需求SS-BCC")
+    private String ssBcc;
+
+    /** BCC总需求SS-SUB */
+    @Excel(name = "BCC总需求SS-SUB")
+    private String ssSub;
+
+    /** BCC总需求SS-EU */
+    @Excel(name = "BCC总需求SS-EU")
+    private String ssEu;
+
+    /** BCC总需求SS-PGU */
+    @Excel(name = "BCC总需求SS-PGU")
+    private String ssPgu;
+
+    /** BCC总需求HHP-BCC */
+    @Excel(name = "BCC总需求HHP-BCC")
+    private String hhpBcc;
+
+    /** BCC总需求HHP-SUB */
+    @Excel(name = "BCC总需求HHP-SUB")
+    private String hhpSub;
+
+    /** BCC总需求HS-BCC */
+    @Excel(name = "BCC总需求HS-BCC")
+    private String hsBcc;
+
+    /** BCC总需求HS-SUB */
+    @Excel(name = "BCC总需求HS-SUB")
+    private String hsSub;
+
+    /** BCC总需求HS-EU */
+    @Excel(name = "BCC总需求HS-EU")
+    private String hsEu;
+
+    /** BCC总需求HS-PGU */
+    @Excel(name = "BCC总需求HS-PGU")
+    private String hsPgu;
+
+    /** BCC总需求MS-BCC */
+    @Excel(name = "BCC总需求MS-BCC")
+    private String msBcc;
+
+    /** BCC总需求MS-EU */
+    @Excel(name = "BCC总需求MS-EU")
+    private String msEu;
+
+    /** BCC总需求MS-PGU */
+    @Excel(name = "BCC总需求MS-PGU")
+    private String msPgu;
+
+    /** BCC总需求LS-BCC */
+    @Excel(name = "BCC总需求LS-BCC")
+    private String lsBcc;
+
+    /** BCC总需求LS-EU */
+    @Excel(name = "BCC总需求LS-EU")
+    private String lsEu;
+
+    /** BCC总需求LS-PGU */
+    @Excel(name = "BCC总需求LS-PGU")
+    private String lsPgu;
+
+    /** BCC总需求TOTAL-BCC */
+    @Excel(name = "BCC总需求TOTAL-BCC")
+    private String totalBcc;
+
+    /** BCC总需求TOTAL-EU */
+    @Excel(name = "BCC总需求TOTAL-EU")
+    private String totalEu;
+
+    /** BCC总需求总消耗-BCC */
+    @Excel(name = "BCC总需求总消耗-BCC")
+    private String zongBcc;
+
+    /** BCC总需求总消耗-EU */
+    @Excel(name = "BCC总需求总消耗-EU")
+    private String zongEu;
+
+    /** BCC总需求总消耗-PGU */
+    @Excel(name = "BCC总需求总消耗-PGU")
+    private String zongPgu;
+
+    /** 前日产量乙烯C2H4 */
+    @Excel(name = "前日产量乙烯C2H4")
+    private String outputYixi;
+
+    /** 前日产量丙烯C3H6 */
+    @Excel(name = "前日产量丙烯C3H6")
+    private String outputBx;
+
+    /** 年产量 */
+    @Excel(name = "年产量")
+    private String outputAnnual;
+
+    /** 瞬时能耗 */
+    @Excel(name = "瞬时能耗")
+    private String instantaneous;
+
+    /** 累计能耗 */
+    @Excel(name = "累计能耗")
+    private String cumulative;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -659,6 +767,9 @@ public class TDashboarddata extends BaseEntity
     public void setSteamHsoutkliu(String steamHsoutkliu) { this.steamHsoutkliu = steamHsoutkliu; }
 
     public String getSteamHsoutkliu() { return steamHsoutkliu; }
+    public void setSteamHsoutklz(String steamHsoutklz) { this.steamHsoutklz = steamHsoutklz; }
+
+    public String getSteamHsoutklz() { return steamHsoutklz; }
     public void setSteamHsoutsc(String steamHsoutsc) { this.steamHsoutsc = steamHsoutsc; }
 
     public String getSteamHsoutsc() { return steamHsoutsc; }
@@ -788,6 +899,84 @@ public class TDashboarddata extends BaseEntity
     public void setProFour(String proFour) { this.proFour = proFour; }
 
     public String getProFour() { return proFour; }
+    public void setSsBcc(String ssBcc) { this.ssBcc = ssBcc; }
+
+    public String getSsBcc() { return ssBcc; }
+    public void setSsSub(String ssSub) { this.ssSub = ssSub; }
+
+    public String getSsSub() { return ssSub; }
+    public void setSsEu(String ssEu) { this.ssEu = ssEu; }
+
+    public String getSsEu() { return ssEu; }
+    public void setSsPgu(String ssPgu) { this.ssPgu = ssPgu; }
+
+    public String getSsPgu() { return ssPgu; }
+    public void setHhpBcc(String hhpBcc) { this.hhpBcc = hhpBcc; }
+
+    public String getHhpBcc() { return hhpBcc; }
+    public void setHhpSub(String hhpSub) { this.hhpSub = hhpSub; }
+
+    public String getHhpSub() { return hhpSub; }
+    public void setHsBcc(String hsBcc) { this.hsBcc = hsBcc; }
+
+    public String getHsBcc() { return hsBcc; }
+    public void setHsSub(String hsSub) { this.hsSub = hsSub; }
+
+    public String getHsSub() { return hsSub; }
+    public void setHsEu(String hsEu) { this.hsEu = hsEu; }
+
+    public String getHsEu() { return hsEu; }
+    public void setHsPgu(String hsPgu) { this.hsPgu = hsPgu; }
+
+    public String getHsPgu() { return hsPgu; }
+    public void setMsBcc(String msBcc) { this.msBcc = msBcc; }
+
+    public String getMsBcc() { return msBcc; }
+    public void setMsEu(String msEu) { this.msEu = msEu; }
+
+    public String getMsEu() { return msEu; }
+    public void setMsPgu(String msPgu) { this.msPgu = msPgu; }
+
+    public String getMsPgu() { return msPgu; }
+    public void setLsBcc(String lsBcc) { this.lsBcc = lsBcc; }
+
+    public String getLsBcc() { return lsBcc; }
+    public void setLsEu(String lsEu) { this.lsEu = lsEu; }
+
+    public String getLsEu() { return lsEu; }
+    public void setLsPgu(String lsPgu) { this.lsPgu = lsPgu; }
+
+    public String getLsPgu() { return lsPgu; }
+    public void setTotalBcc(String totalBcc) { this.totalBcc = totalBcc; }
+
+    public String getTotalBcc() { return totalBcc; }
+    public void setTotalEu(String totalEu) { this.totalEu = totalEu; }
+
+    public String getTotalEu() { return totalEu; }
+    public void setZongBcc(String zongBcc) { this.zongBcc = zongBcc; }
+
+    public String getZongBcc() { return zongBcc; }
+    public void setZongEu(String zongEu) { this.zongEu = zongEu; }
+
+    public String getZongEu() { return zongEu; }
+    public void setZongPgu(String zongPgu) { this.zongPgu = zongPgu; }
+
+    public String getZongPgu() { return zongPgu; }
+    public void setOutputYixi(String outputYixi) { this.outputYixi = outputYixi; }
+
+    public String getOutputYixi() { return outputYixi; }
+    public void setOutputBx(String outputBx) { this.outputBx = outputBx; }
+
+    public String getOutputBx() { return outputBx; }
+    public void setOutputAnnual(String outputAnnual) { this.outputAnnual = outputAnnual; }
+
+    public String getOutputAnnual() { return outputAnnual; }
+    public void setInstantaneous(String instantaneous) { this.instantaneous = instantaneous; }
+
+    public String getInstantaneous() { return instantaneous; }
+    public void setCumulative(String cumulative) { this.cumulative = cumulative; }
+
+    public String getCumulative() { return cumulative; }
 
     @Override
     public String toString() {
@@ -879,6 +1068,32 @@ public class TDashboarddata extends BaseEntity
             .append("proOne", getProOne())
             .append("proThree", getProThree())
             .append("proFour", getProFour())
+            .append("ssBcc", getSsBcc())
+            .append("ssSub", getSsSub())
+            .append("ssEu", getSsEu())
+            .append("ssPgu", getSsPgu())
+            .append("hhpBcc", getHhpBcc())
+            .append("hhpSub", getHhpSub())
+            .append("hsBcc", getHsBcc())
+            .append("hsSub", getHsSub())
+            .append("hsEu", getHsEu())
+            .append("hsPgu", getHsPgu())
+            .append("msBcc", getMsBcc())
+            .append("msEu", getMsEu())
+            .append("msPgu", getMsPgu())
+            .append("lsBcc", getLsBcc())
+            .append("lsEu", getLsEu())
+            .append("lsPgu", getLsPgu())
+            .append("totalBcc", getTotalBcc())
+            .append("totalEu", getTotalEu())
+            .append("zongBcc", getZongBcc())
+            .append("zongEu", getZongEu())
+            .append("zongPgu", getZongPgu())
+            .append("outputYixi", getOutputYixi())
+            .append("outputBx", getOutputBx())
+            .append("outputAnnual", getOutputAnnual())
+            .append("instantaneous", getInstantaneous())
+            .append("cumulative", getCumulative())
             .toString();
     }
 }

+ 109 - 1
master/src/main/resources/mybatis/aspen/TDashboarddataMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="steamHsoutpher"    column="steam_hsoutpher"    />
         <result property="steamHsouthwu"    column="steam_hsouthwu"    />
         <result property="steamHsoutkliu"    column="steam_hsoutkliu"    />
+        <result property="steamHsoutklz"    column="steam_hsoutklz"    />
         <result property="steamHsoutsc"    column="steam_hsoutsc"    />
         <result property="steamHhpsub"    column="steam_hhpsub"    />
         <result property="steamMsinaeu"    column="steam_msinaeu"    />
@@ -92,10 +93,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="proOne"    column="pro_one"    />
         <result property="proThree"    column="pro_three"    />
         <result property="proFour"    column="pro_four"    />
+        <result property="ssBcc"    column="ss_bcc"    />
+        <result property="ssSub"    column="ss_sub"    />
+        <result property="ssEu"    column="ss_eu"    />
+        <result property="ssPgu"    column="ss_pgu"    />
+        <result property="hhpBcc"    column="hhp_bcc"    />
+        <result property="hhpSub"    column="hhp_sub"    />
+        <result property="hsBcc"    column="hs_bcc"    />
+        <result property="hsSub"    column="hs_sub"    />
+        <result property="hsEu"    column="hs_eu"    />
+        <result property="hsPgu"    column="hs_pgu"    />
+        <result property="msBcc"    column="ms_bcc"    />
+        <result property="msEu"    column="ms_eu"    />
+        <result property="msPgu"    column="ms_pgu"    />
+        <result property="lsBcc"    column="ls_bcc"    />
+        <result property="lsEu"    column="ls_eu"    />
+        <result property="lsPgu"    column="ls_pgu"    />
+        <result property="totalBcc"    column="total_bcc"    />
+        <result property="totalEu"    column="total_eu"    />
+        <result property="zongBcc"    column="zong_bcc"    />
+        <result property="zongEu"    column="zong_eu"    />
+        <result property="zongPgu"    column="zong_pgu"    />
+        <result property="outputYixi"    column="output_yixi"    />
+        <result property="outputBx"    column="output_bx"    />
+        <result property="outputAnnual"    column="output_annual"    />
+        <result property="instantaneous"    column="instantaneous"    />
+        <result property="cumulative"    column="cumulative"    />
     </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_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 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 from t_dashboarddata
     </sql>
 
     <select id="selectTDashboarddataList" parameterType="TDashboarddata" resultMap="TDashboarddataResult">
@@ -190,6 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="steamHsoutpher != null">steam_hsoutpher,</if>
             <if test="steamHsouthwu != null">steam_hsouthwu,</if>
             <if test="steamHsoutkliu != null">steam_hsoutkliu,</if>
+            <if test="steamHsoutklz != null">steam_hsoutklz,</if>
             <if test="steamHsoutsc != null">steam_hsoutsc,</if>
             <if test="steamHhpsub != null">steam_hhpsub,</if>
             <if test="steamMsinaeu != null">steam_msinaeu,</if>
@@ -233,6 +261,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="proOne != null">pro_one,</if>
             <if test="proThree != null">pro_three,</if>
             <if test="proFour != null">pro_four,</if>
+            <if test="ssBcc != null">ss_bcc,</if>
+            <if test="ssSub != null">ss_sub,</if>
+            <if test="ssEu != null">ss_eu,</if>
+            <if test="ssPgu != null">ss_pgu,</if>
+            <if test="hhpBcc != null">hhp_bcc,</if>
+            <if test="hhpSub != null">hhp_sub,</if>
+            <if test="hsBcc != null">hs_bcc,</if>
+            <if test="hsSub != null">hs_sub,</if>
+            <if test="hsEu != null">hs_eu,</if>
+            <if test="hsPgu != null">hs_pgu,</if>
+            <if test="msBcc != null">ms_bcc,</if>
+            <if test="msEu != null">ms_eu,</if>
+            <if test="msPgu != null">ms_pgu,</if>
+            <if test="lsBcc != null">ls_bcc,</if>
+            <if test="lsEu != null">ls_eu,</if>
+            <if test="lsPgu != null">ls_pgu,</if>
+            <if test="totalBcc != null">total_bcc,</if>
+            <if test="totalEu != null">total_eu,</if>
+            <if test="zongBcc != null">zong_bcc,</if>
+            <if test="zongEu != null">zong_eu,</if>
+            <if test="zongPgu != null">zong_pgu,</if>
+            <if test="outputYixi != null">output_yixi,</if>
+            <if test="outputBx != null">output_bx,</if>
+            <if test="outputAnnual != null">output_annual,</if>
+            <if test="instantaneous != null">instantaneous,</if>
+            <if test="cumulative != null">cumulative,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -279,6 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="steamHsoutpher != null">#{steamHsoutpher},</if>
             <if test="steamHsouthwu != null">#{steamHsouthwu},</if>
             <if test="steamHsoutkliu != null">#{steamHsoutkliu},</if>
+            <if test="steamHsoutklz != null">#{steamHsoutklz},</if>
             <if test="steamHsoutsc != null">#{steamHsoutsc},</if>
             <if test="steamHhpsub != null">#{steamHhpsub},</if>
             <if test="steamMsinaeu != null">#{steamMsinaeu},</if>
@@ -322,6 +377,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="proOne != null">#{proOne},</if>
             <if test="proThree != null">#{proThree},</if>
             <if test="proFour != null">#{proFour},</if>
+            <if test="ssBcc != null">#{ssBcc},</if>
+            <if test="ssSub != null">#{ssSub},</if>
+            <if test="ssEu != null">#{ssEu},</if>
+            <if test="ssPgu != null">#{ssPgu},</if>
+            <if test="hhpBcc != null">#{hhpBcc},</if>
+            <if test="hhpSub != null">#{hhpSub},</if>
+            <if test="hsBcc != null">#{hsBcc},</if>
+            <if test="hsSub != null">#{hsSub},</if>
+            <if test="hsEu != null">#{hsEu},</if>
+            <if test="hsPgu != null">#{hsPgu},</if>
+            <if test="msBcc != null">#{msBcc},</if>
+            <if test="msEu != null">#{msEu},</if>
+            <if test="msPgu != null">#{msPgu},</if>
+            <if test="lsBcc != null">#{lsBcc},</if>
+            <if test="lsEu != null">#{lsEu},</if>
+            <if test="lsPgu != null">#{lsPgu},</if>
+            <if test="totalBcc != null">#{totalBcc},</if>
+            <if test="totalEu != null">#{totalEu},</if>
+            <if test="zongBcc != null">#{zongBcc},</if>
+            <if test="zongEu != null">#{zongEu},</if>
+            <if test="zongPgu != null">#{zongPgu},</if>
+            <if test="outputYixi != null">#{outputYixi},</if>
+            <if test="outputBx != null">#{outputBx},</if>
+            <if test="outputAnnual != null">#{outputAnnual},</if>
+            <if test="instantaneous != null">#{instantaneous},</if>
+            <if test="cumulative != null">#{cumulative},</if>
          </trim>
     </insert>
 
@@ -371,6 +452,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="steamHsoutpher != null">steam_hsoutpher = #{steamHsoutpher},</if>
             <if test="steamHsouthwu != null">steam_hsouthwu = #{steamHsouthwu},</if>
             <if test="steamHsoutkliu != null">steam_hsoutkliu = #{steamHsoutkliu},</if>
+            <if test="steamHsoutklz != null">steam_hsoutklz = #{steamHsoutklz},</if>
             <if test="steamHsoutsc != null">steam_hsoutsc = #{steamHsoutsc},</if>
             <if test="steamHhpsub != null">steam_hhpsub = #{steamHhpsub},</if>
             <if test="steamMsinaeu != null">steam_msinaeu = #{steamMsinaeu},</if>
@@ -414,6 +496,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="proOne != null">pro_one = #{proOne},</if>
             <if test="proThree != null">pro_three = #{proThree},</if>
             <if test="proFour != null">pro_four = #{proFour},</if>
+            <if test="ssBcc != null">ss_bcc = #{ssBcc},</if>
+            <if test="ssSub != null">ss_sub = #{ssSub},</if>
+            <if test="ssEu != null">ss_eu = #{ssEu},</if>
+            <if test="ssPgu != null">ss_pgu = #{ssPgu},</if>
+            <if test="hhpBcc != null">hhp_bcc = #{hhpBcc},</if>
+            <if test="hhpSub != null">hhp_sub = #{hhpSub},</if>
+            <if test="hsBcc != null">hs_bcc = #{hsBcc},</if>
+            <if test="hsSub != null">hs_sub = #{hsSub},</if>
+            <if test="hsEu != null">hs_eu = #{hsEu},</if>
+            <if test="hsPgu != null">hs_pgu = #{hsPgu},</if>
+            <if test="msBcc != null">ms_bcc = #{msBcc},</if>
+            <if test="msEu != null">ms_eu = #{msEu},</if>
+            <if test="msPgu != null">ms_pgu = #{msPgu},</if>
+            <if test="lsBcc != null">ls_bcc = #{lsBcc},</if>
+            <if test="lsEu != null">ls_eu = #{lsEu},</if>
+            <if test="lsPgu != null">ls_pgu = #{lsPgu},</if>
+            <if test="totalBcc != null">total_bcc = #{totalBcc},</if>
+            <if test="totalEu != null">total_eu = #{totalEu},</if>
+            <if test="zongBcc != null">zong_bcc = #{zongBcc},</if>
+            <if test="zongEu != null">zong_eu = #{zongEu},</if>
+            <if test="zongPgu != null">zong_pgu = #{zongPgu},</if>
+            <if test="outputYixi != null">output_yixi = #{outputYixi},</if>
+            <if test="outputBx != null">output_bx = #{outputBx},</if>
+            <if test="outputAnnual != null">output_annual = #{outputAnnual},</if>
+            <if test="instantaneous != null">instantaneous = #{instantaneous},</if>
+            <if test="cumulative != null">cumulative = #{cumulative},</if>
         </trim>
         where id = #{id}
     </update>

+ 6 - 8
ui/src/views/front/annualOutput.vue

@@ -8,7 +8,7 @@
             <div class="m-7xz2"></div>
             <div class="m-7xz3 xzleft"></div>
             <div class="m-7zt1">{{ $t('年产量') }}</div>
-            <div class="m-7zt2" id="sx1">60%</div>
+            <div class="m-7zt2" id="sx1">{{ dashboarddata.outputAnnual }}%</div>
           </div>
         </div>
       </div>
@@ -18,28 +18,28 @@
         <div style="margin-bottom:20px">
           <div style="margin-left: 0.35rem; margin-bottom: -0.2rem; font-weight:bold">C2H4</div>
           <dv-border-box-10 style="width:110px; height:0.7rem;">
-            <div class="annual">2264 t</div>
+            <div class="annual">{{ dashboarddata.outputYixi }} t</div>
           </dv-border-box-10>
         </div>
 
         <div style="margin-bottom:20px">
           <div style="margin-left: 0.35rem; margin-bottom: -0.2rem; font-weight:bold">C3H6</div>
           <dv-border-box-10 :reverse="true" style="width:110px; height:0.7rem">
-            <div class="annual">1149 t</div>
+            <div class="annual">{{ dashboarddata.outputBx }} t</div>
           </dv-border-box-10>
         </div>
 
         <div style="margin-bottom:20px">
           <div style="margin-left: 0.35rem; margin-bottom: -0.2rem;  font-weight:bold">瞬时能耗</div>
           <dv-border-box-10 :reverse="true" style="width:110px; height:0.7rem">
-            <div class="annual">1149</div>
+            <div class="annual">{{ dashboarddata.instantaneous }}</div>
           </dv-border-box-10>
         </div>
 
         <div style="margin-bottom:20px">
           <div style="margin-left: 0.35rem; margin-bottom: -0.2rem; font-weight:bold">累计能耗</div>
           <dv-border-box-10 :reverse="true" style="width:110px; height:0.7rem">
-            <div class="annual">1149</div>
+            <div class="annual">{{ dashboarddata.cumulative }}</div>
           </dv-border-box-10>
         </div>
         <!--<div class="annual">650 t</div>
@@ -51,9 +51,7 @@
 
 <script>
 export default {
-  components: {
-
-  },
+  props: ['dashboarddata']
 }
 </script>
 

+ 8 - 7
ui/src/views/front/bottomRight.vue

@@ -22,18 +22,19 @@
 <script>
 
 export default {
+  props: ['dashboarddata'],
   data() {
     return {
       config: {
         header: ["", "BCC", "SUB", "EU", "PGU/AEU"],
         data: [
-          ["SS(HS)自产", "509", "132", "376", "1"],
-          ["HHP", "46", "46", "", ""],
-          ["HS", "-36", "161", "85", "41"],
-          ["MS", "-44", "", "-69", "25"],
-          ["LS", "-16", "", "-11", "-5"],
-          ["TOTAL", "-49", "", "5", ""],
-          ["总消耗", "459", "", "381", "62"]
+          ["SS(HS)自产", this.dashboarddata.ssBcc, this.dashboarddata.ssSub, this.dashboarddata.ssEu, this.dashboarddata.ssPgu],
+          ["HHP", this.dashboarddata.hhpBcc, this.dashboarddata.hhpSub, "", ""],
+          ["HS", this.dashboarddata.hsBcc, this.dashboarddata.hsSub, this.dashboarddata.hsEu, this.dashboarddata.hsPgu],
+          ["MS", this.dashboarddata.msBcc, "", this.dashboarddata.msEu, this.dashboarddata.msPgu],
+          ["LS", this.dashboarddata.lsBcc, "", this.dashboarddata.lsEu, this.dashboarddata.lsPgu],
+          ["TOTAL", this.dashboarddata.totalBcc, "", this.dashboarddata.totalEu, ""],
+          ["总消耗", this.dashboarddata.zongBcc, "", this.dashboarddata.zongEu, this.dashboarddata.zongPgu]
         ],
         rowNum: 6, //表格行数
         headerHeight: 35,

+ 6 - 6
ui/src/views/front/steamBalance.vue

@@ -176,12 +176,12 @@
 
         <div class="jiantou11">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:39px">
-          <p class="num">99</p>
+          <p class="num">{{ dashboarddata.steamHsoutklz }}</p>
         </div>
 
         <div class="jiantou12">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:39px">
-          <p class="num">99</p>
+          <p class="num">{{ dashboarddata.steamHsoutkliu }}</p>
         </div>
 
         <div class="jiantou13">
@@ -316,7 +316,7 @@
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan5">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan5-2">
           <p class="num2">{{ dashboarddata.steamHsinsub }}</p>
-          <p class="num3">55</p>
+          <p class="num3">{{ dashboarddata.steamLsinsub }}</p>
         </div>
         <div class="jiantoulan pos-6">
           <img src="@/assets/steamImg/jiantoulan4.png" style="width:31px;height:150px">
@@ -341,7 +341,7 @@
         <div class="jiantoulan pos-10">
           <img src="@/assets/steamImg/jiantoulan7.png" style="width:30px;height:46px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan10">
-          <p class="num2">0.37</p>
+          <p class="num2">{{ dashboarddata.steamLsoutsctu }}</p>
         </div>
         <div class="jiantoulan pos-11">
           <img src="@/assets/steamImg/jiantoulan2.png" style="width:31px;height:60px">
@@ -362,8 +362,8 @@
           <img src="@/assets/steamImg/jiantoulan10.png" style="width:201px;height:64px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan14-1">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan14-2">
-          <p class="num2">87</p>
-          <p class="num3">28</p>
+          <p class="num2">{{ dashboarddata.steamHsoutsc }}</p>
+          <p class="num3">{{ dashboarddata.steamHsoutkliu }}</p>
           <p class="name">SC</p>
         </div>
         <div class="jiantoulan pos-15">

+ 109 - 1
ui/src/views/monitor/elec/index.vue

@@ -194,7 +194,115 @@
         dateWeek: null,
         weekday: [this.$t('周日'),this.$t('周一'),this.$t('周二'),this.$t('周三'),this.$t('周四'),this.$t('周五'),this.$t('周六')],
         timer:null,
-        dashboarddata: null
+        dashboarddata: {
+          energyYixi: null,
+          energyBingxi: null,
+          energyQingqi: null,
+          energyJiawan: null,
+          energyCsi: null,
+          energyBenzene: null,
+          energyToluene: null,
+          energyXylene: null,
+          energyTanliu: null,
+          energyWashoil: null,
+          energyTanwu: null,
+          energyIma: null,
+          energyCjiu: null,
+          energyRpg: null,
+          energyfeedNap: null,
+          energyfeedYiwan: null,
+          energyfeedTanwu: null,
+          energyfeedTanliu: null,
+          energyfeedLpg: null,
+          energyOffgas: null,
+          energyLpg: null,
+          steamSsinfur: null,
+          steamSsoutlet: null,
+          steamSsoutaeu: null,
+          steamSsoutesi: null,
+          steamSsoutksan: null,
+          steamSsoutsc: null,
+          steamHsinsub: null,
+          steamHsinlet: null,
+          steamHsinksan: null,
+          steamHsoutpjiu: null,
+          steamHsoutaeu: null,
+          steamHsoutlet: null,
+          steamHsoutesan: null,
+          steamHsoutphyi: null,
+          steamHsoutpher: null,
+          steamHsouthwu: null,
+          steamHsoutkliu: null,
+          steamHsoutsc: null,
+          steamHhpsub: null,
+          steamMsinaeu: null,
+          steamMsinlet: null,
+          steamMsinphyi: null,
+          steamMsinkliu: null,
+          steamMsoutflare: null,
+          steamMsoutaeu: null,
+          steamMsoutsctu: null,
+          steamMsouteer: null,
+          steamMsoutfur: null,
+          steamMsoutva: null,
+          steamMsouttracing: null,
+          steamLsinsub: null,
+          steamLsinpjiu: null,
+          steamLsinaeu: null,
+          steamLsineer: null,
+          steamLsinpher: null,
+          steamLsoutsctu: null,
+          steamLsoutvjiu: null,
+          steamLsoutewuliu: null,
+          steamLsoutewusan: null,
+          steamLsouttracing: null,
+          steamLsoutesan: null,
+          steamLsoutesi: null,
+          steamLsoutother: null,
+          napOne: null,
+          napTwo: null,
+          napThree: null,
+          ehtOne: null,
+          ehtTwo: null,
+          ehtThree: null,
+          ehtFour: null,
+          ehtFive: null,
+          acrOne: null,
+          acrTwo: null,
+          acrThree: null,
+          acrFour: null,
+          acrZero: null,
+          proTwo: null,
+          proOne: null,
+          proThree: null,
+          proFour: null,
+          ssBcc: null,
+          ssSub: null,
+          ssEu: null,
+          ssPgu: null,
+          hhpBcc: null,
+          hhpSub: null,
+          hsBcc: null,
+          hsSub: null,
+          hsEu: null,
+          hsPgu: null,
+          msBcc: null,
+          msEu: null,
+          msPgu: null,
+          lsBcc: null,
+          lsEu: null,
+          lsPgu: null,
+          totalBcc: null,
+          totalEu: null,
+          zongBcc: null,
+          zongEu: null,
+          zongPgu: null,
+          outputYixi: null,
+          outputBx: null,
+          outputAnnual: null,
+          instantaneous: null,
+          cumulative: null
+        }
       };
     },
     components: {