cq

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

@@ -297,6 +297,74 @@ public class TDashboarddata extends BaseEntity
     @Excel(name = "蒸汽平衡表LS出量其他")
     private String steamLsoutother;
 
+    /** 石脑油储罐T1621 */
+    @Excel(name = "石脑油储罐T1621")
+    private String napOne;
+
+    /** 石脑油储罐T1622 */
+    @Excel(name = "石脑油储罐T1622")
+    private String napTwo;
+
+    /** 石脑油储罐T1623 */
+    @Excel(name = "石脑油储罐T1623")
+    private String napThree;
+
+    /** 乙烯储罐STT1061 */
+    @Excel(name = "乙烯储罐STT1061")
+    private String ehtOne;
+
+    /** 乙烯储罐STT1062 */
+    @Excel(name = "乙烯储罐STT1062")
+    private String ehtTwo;
+
+    /** 乙烯储罐STT1063 */
+    @Excel(name = "乙烯储罐STT1063")
+    private String ehtThree;
+
+    /** 乙烯储罐STT1064 */
+    @Excel(name = "乙烯储罐STT1064")
+    private String ehtFour;
+
+    /** 乙烯储罐STT1065 */
+    @Excel(name = "乙烯储罐STT1065")
+    private String ehtFive;
+
+    /** 丙烯储罐STT1011 */
+    @Excel(name = "丙烯储罐STT1011")
+    private String acrOne;
+
+    /** 丙烯储罐STT1012 */
+    @Excel(name = "丙烯储罐STT1012")
+    private String acrTwo;
+
+    /** 丙烯储罐STT1013 */
+    @Excel(name = "丙烯储罐STT1013")
+    private String acrThree;
+
+    /** 丙烯储罐STT1014 */
+    @Excel(name = "丙烯储罐STT1014")
+    private String acrFour;
+
+    /** 丙烯储罐STT1040 */
+    @Excel(name = "丙烯储罐STT1040")
+    private String acrZero;
+
+    /** 芳烃储罐STT1520 */
+    @Excel(name = "芳烃储罐STT1520")
+    private String proTwo;
+
+    /** 芳烃储罐STT1510 */
+    @Excel(name = "芳烃储罐STT1510")
+    private String proOne;
+
+    /** 芳烃储罐STT1360 */
+    @Excel(name = "芳烃储罐STT1360")
+    private String proThree;
+
+    /** 芳烃储罐STT1410 */
+    @Excel(name = "芳烃储罐STT1410")
+    private String proFour;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -669,6 +737,57 @@ public class TDashboarddata extends BaseEntity
     public void setSteamLsoutother(String steamLsoutother) { this.steamLsoutother = steamLsoutother; }
 
     public String getSteamLsoutother() { return steamLsoutother; }
+    public void setNapOne(String napOne) { this.napOne = napOne; }
+
+    public String getNapOne() { return napOne; }
+    public void setNapTwo(String napTwo) { this.napTwo = napTwo; }
+
+    public String getNapTwo() { return napTwo; }
+    public void setNapThree(String napThree) { this.napThree = napThree; }
+
+    public String getNapThree() { return napThree; }
+    public void setEhtOne(String ehtOne) { this.ehtOne = ehtOne; }
+
+    public String getEhtOne() { return ehtOne; }
+    public void setEhtTwo(String ehtTwo) { this.ehtTwo = ehtTwo; }
+
+    public String getEhtTwo() { return ehtTwo; }
+    public void setEhtThree(String ehtThree) { this.ehtThree = ehtThree; }
+
+    public String getEhtThree() { return ehtThree; }
+    public void setEhtFour(String ehtFour) { this.ehtFour = ehtFour; }
+
+    public String getEhtFour() { return ehtFour; }
+    public void setEhtFive(String ehtFive) { this.ehtFive = ehtFive; }
+
+    public String getEhtFive() { return ehtFive; }
+    public void setAcrOne(String acrOne) { this.acrOne = acrOne; }
+
+    public String getAcrOne() { return acrOne; }
+    public void setAcrTwo(String acrTwo) { this.acrTwo = acrTwo; }
+
+    public String getAcrTwo() { return acrTwo; }
+    public void setAcrThree(String acrThree) { this.acrThree = acrThree; }
+
+    public String getAcrThree() { return acrThree; }
+    public void setAcrFour(String acrFour) { this.acrFour = acrFour; }
+
+    public String getAcrFour() { return acrFour; }
+    public void setAcrZero(String acrZero) { this.acrZero = acrZero; }
+
+    public String getAcrZero() { return acrZero; }
+    public void setProTwo(String proTwo) { this.proTwo = proTwo; }
+
+    public String getProTwo() { return proTwo; }
+    public void setProOne(String proOne) { this.proOne = proOne; }
+
+    public String getProOne() { return proOne; }
+    public void setProThree(String proThree) { this.proThree = proThree; }
+
+    public String getProThree() { return proThree; }
+    public void setProFour(String proFour) { this.proFour = proFour; }
+
+    public String getProFour() { return proFour; }
 
     @Override
     public String toString() {
@@ -743,6 +862,23 @@ public class TDashboarddata extends BaseEntity
             .append("steamLsoutesan", getSteamLsoutesan())
             .append("steamLsoutesi", getSteamLsoutesi())
             .append("steamLsoutother", getSteamLsoutother())
+            .append("napOne", getNapOne())
+            .append("napTwo", getNapTwo())
+            .append("napThree", getNapThree())
+            .append("ehtOne", getEhtOne())
+            .append("ehtTwo", getEhtTwo())
+            .append("ehtThree", getEhtThree())
+            .append("ehtFour", getEhtFour())
+            .append("ehtFive", getEhtFive())
+            .append("acrOne", getAcrOne())
+            .append("acrTwo", getAcrTwo())
+            .append("acrThree", getAcrThree())
+            .append("acrFour", getAcrFour())
+            .append("acrZero", getAcrZero())
+            .append("proTwo", getProTwo())
+            .append("proOne", getProOne())
+            .append("proThree", getProThree())
+            .append("proFour", getProFour())
             .toString();
     }
 }

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

@@ -75,10 +75,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="steamLsoutesan"    column="steam_lsoutesan"    />
         <result property="steamLsoutesi"    column="steam_lsoutesi"    />
         <result property="steamLsoutother"    column="steam_lsoutother"    />
+        <result property="napOne"    column="nap_one"    />
+        <result property="napTwo"    column="nap_two"    />
+        <result property="napThree"    column="nap_three"    />
+        <result property="ehtOne"    column="eht_one"    />
+        <result property="ehtTwo"    column="eht_two"    />
+        <result property="ehtThree"    column="eht_three"    />
+        <result property="ehtFour"    column="eht_four"    />
+        <result property="ehtFive"    column="eht_five"    />
+        <result property="acrOne"    column="acr_one"    />
+        <result property="acrTwo"    column="acr_two"    />
+        <result property="acrThree"    column="acr_three"    />
+        <result property="acrFour"    column="acr_four"    />
+        <result property="acrZero"    column="acr_zero"    />
+        <result property="proTwo"    column="pro_two"    />
+        <result property="proOne"    column="pro_one"    />
+        <result property="proThree"    column="pro_three"    />
+        <result property="proFour"    column="pro_four"    />
     </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 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_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
     </sql>
 
     <select id="selectTDashboarddataList" parameterType="TDashboarddata" resultMap="TDashboarddataResult">
@@ -199,6 +216,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="steamLsoutesan != null">steam_lsoutesan,</if>
             <if test="steamLsoutesi != null">steam_lsoutesi,</if>
             <if test="steamLsoutother != null">steam_lsoutother,</if>
+            <if test="napOne != null">nap_one,</if>
+            <if test="napTwo != null">nap_two,</if>
+            <if test="napThree != null">nap_three,</if>
+            <if test="ehtOne != null">eht_one,</if>
+            <if test="ehtTwo != null">eht_two,</if>
+            <if test="ehtThree != null">eht_three,</if>
+            <if test="ehtFour != null">eht_four,</if>
+            <if test="ehtFive != null">eht_five,</if>
+            <if test="acrOne != null">acr_one,</if>
+            <if test="acrTwo != null">acr_two,</if>
+            <if test="acrThree != null">acr_three,</if>
+            <if test="acrFour != null">acr_four,</if>
+            <if test="acrZero != null">acr_zero,</if>
+            <if test="proTwo != null">pro_two,</if>
+            <if test="proOne != null">pro_one,</if>
+            <if test="proThree != null">pro_three,</if>
+            <if test="proFour != null">pro_four,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -271,6 +305,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="steamLsoutesan != null">#{steamLsoutesan},</if>
             <if test="steamLsoutesi != null">#{steamLsoutesi},</if>
             <if test="steamLsoutother != null">#{steamLsoutother},</if>
+            <if test="napOne != null">#{napOne},</if>
+            <if test="napTwo != null">#{napTwo},</if>
+            <if test="napThree != null">#{napThree},</if>
+            <if test="ehtOne != null">#{ehtOne},</if>
+            <if test="ehtTwo != null">#{ehtTwo},</if>
+            <if test="ehtThree != null">#{ehtThree},</if>
+            <if test="ehtFour != null">#{ehtFour},</if>
+            <if test="ehtFive != null">#{ehtFive},</if>
+            <if test="acrOne != null">#{acrOne},</if>
+            <if test="acrTwo != null">#{acrTwo},</if>
+            <if test="acrThree != null">#{acrThree},</if>
+            <if test="acrFour != null">#{acrFour},</if>
+            <if test="acrZero != null">#{acrZero},</if>
+            <if test="proTwo != null">#{proTwo},</if>
+            <if test="proOne != null">#{proOne},</if>
+            <if test="proThree != null">#{proThree},</if>
+            <if test="proFour != null">#{proFour},</if>
          </trim>
     </insert>
 
@@ -346,6 +397,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="steamLsoutesan != null">steam_lsoutesan = #{steamLsoutesan},</if>
             <if test="steamLsoutesi != null">steam_lsoutesi = #{steamLsoutesi},</if>
             <if test="steamLsoutother != null">steam_lsoutother = #{steamLsoutother},</if>
+            <if test="napOne != null">nap_one = #{napOne},</if>
+            <if test="napTwo != null">nap_two = #{napTwo},</if>
+            <if test="napThree != null">nap_three = #{napThree},</if>
+            <if test="ehtOne != null">eht_one = #{ehtOne},</if>
+            <if test="ehtTwo != null">eht_two = #{ehtTwo},</if>
+            <if test="ehtThree != null">eht_three = #{ehtThree},</if>
+            <if test="ehtFour != null">eht_four = #{ehtFour},</if>
+            <if test="ehtFive != null">eht_five = #{ehtFive},</if>
+            <if test="acrOne != null">acr_one = #{acrOne},</if>
+            <if test="acrTwo != null">acr_two = #{acrTwo},</if>
+            <if test="acrThree != null">acr_three = #{acrThree},</if>
+            <if test="acrFour != null">acr_four = #{acrFour},</if>
+            <if test="acrZero != null">acr_zero = #{acrZero},</if>
+            <if test="proTwo != null">pro_two = #{proTwo},</if>
+            <if test="proOne != null">pro_one = #{proOne},</if>
+            <if test="proThree != null">pro_three = #{proThree},</if>
+            <if test="proFour != null">pro_four = #{proFour},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/front/acrylicTank.vue

@@ -14,47 +14,91 @@
       </div>
       <div style="text-align: center;padding-bottom: 2px;display: flex;justify-content: space-between;margin-top: 10px;">
         <div style="position: relative;">
-          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem">
-          <span class="modelTop pos1">we1234</span>
-          <div class="ModelFont">55%</div>
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
+          <span class="modelTop pos1">STT1011</span>
+          <div class="ModelFont">{{ dashboarddata.acrOne }}%</div>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.1rem">
-          <span class="modelTop pos2">we1234</span>
-          <div class="ModelFont">55%</div>
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrTwo) && (dashboarddata.acrTwo)<100">
+          <span class="modelTop pos2">STT1012</span>
+          <div class="ModelFont">{{ dashboarddata.acrTwo }}%</div>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem">
-          <span class="modelTop pos3">we1234</span>
-          <div class="ModelFont">55%</div>
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
+          <span class="modelTop pos3">STT1013</span>
+          <div class="ModelFont">{{ dashboarddata.acrThree }}%</div>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.1rem">
-          <span class="modelTop pos4">we1234</span>
-          <div class="ModelFont">55%</div>
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
+          <span class="modelTop pos4">STT1014</span>
+          <div class="ModelFont">{{ dashboarddata.acrFour }}%</div>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px;margin-top: 0.7rem;">
-          <span class="modelTop pos5">we1234</span>
-          <div class="ModelFont">55%</div>
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="0<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<20">
+          <img src="@/assets/image/Spherical1.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="20<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<40">
+          <img src="@/assets/image/Spherical2.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="40<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<60">
+          <img src="@/assets/image/Spherical3.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="60<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<80">
+          <img src="@/assets/image/spherical.png" style="height: 100px;width: 80px; margin-top: 0.7rem" v-if="80<=(dashboarddata.acrOne) && (dashboarddata.acrOne)<100">
+          <span class="modelTop pos5">STT1040</span>
+          <div class="ModelFont">{{ dashboarddata.acrZero }}%</div>
         </div>
       </div>
-      <!--<div style="text-align: center">
-        <img src="@/assets/image/Spherical2.png" style="height: 1rem">
-        <img src="@/assets/image/Spherical3.png" style="height: 1rem; margin-left: 0.2rem">
-        <img src="@/assets/image/Spherical1.png" style="height: 1rem; margin-left: 0.2rem">
-      </div>-->
     </div>
   </div>
 </template>
 
 <script>
-import cnlylChart from "../dashboard/CnlylChart";
+  import { selectLast } from "@/api/aspen/dashboarddata";
 
 export default {
-  components: {
-    cnlylChart
+  data () {
+    return {
+      dashboarddata: {
+        acrOne: null,
+        acrTwo: null,
+        acrThree: null,
+        acrFour: null,
+        acrZero: null,
+      },
+      // 查询参数
+      queryParams: {},
+    }
+  },
+  created() {
+    this.getList();
+    // 每隔30秒请求一次数据
+    window.setInterval(() => {undefined
+      setTimeout(() => {undefined
+        ///调取接口获取数据
+        this.getList();
+      }, 0)
+    }, 10000)
   },
+  methods: {
+    /** 查询dashboard抓取数据列表 */
+    getList()
+    {
+      selectLast(this.queryParams).then(response => {
+        this.dashboarddata = response.data;
+      });
+    }
+  }
 }
 </script>
 

ui/src/views/front/ethyleneTank.vue

@@ -14,30 +14,50 @@
       </div>
       <div style="text-align: center; display: flex;justify-content: space-between;margin-top: 10px;">
         <div style="position: relative;">
-            <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
-            <span class="modelTop pos">we1234</span>
-            <span class="ModelFont">55%</span>
+            <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="0<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<20">
+            <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="20<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<40">
+            <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="40<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<60">
+            <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="60<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<80">
+            <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="80<=(dashboarddata.ehtOne) && (dashboarddata.ehtOne)<100">
+            <span class="modelTop pos">STT1061</span>
+            <span class="ModelFont">{{ dashboarddata.ehtOne }}%</span>
         </div>
         <div style="position: relative;">
-            <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
-            <span class="modelTop pos">we1234</span>
-            <span class="ModelFont">55%</span>
+          <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="0<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<20">
+          <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="20<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<40">
+          <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="40<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<60">
+          <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="60<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<80">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="80<=(dashboarddata.ehtTwo) && (dashboarddata.ehtTwo)<100">
+            <span class="modelTop pos">STT1062</span>
+            <span class="ModelFont">{{ dashboarddata.ehtTwo }}%</span>
         </div>
 
         <div style="position: relative;">
-          <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
-          <span class="modelTop pos">we1234</span>
-          <span class="ModelFont">55%</span>
+          <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="0<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<20">
+          <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="20<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<40">
+          <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="40<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<60">
+          <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="60<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<80">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="80<=(dashboarddata.ehtThree) && (dashboarddata.ehtThree)<100">
+          <span class="modelTop pos">STT1063</span>
+          <span class="ModelFont">{{ dashboarddata.ehtThree }}%</span>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
-          <span class="modelTop pos">we1234</span>
-          <span class="ModelFont">55%</span>
+          <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="0<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<20">
+          <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="20<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<40">
+          <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="40<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<60">
+          <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="60<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<80">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="80<=(dashboarddata.ehtFour) && (dashboarddata.ehtFour)<100">
+          <span class="modelTop pos">STT1064</span>
+          <span class="ModelFont">{{ dashboarddata.ehtFour }}%</span>
         </div>
         <div style="position: relative;">
-          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;">
-          <span class="modelTop pos">we1234</span>
-          <span class="ModelFont">55%</span>
+          <img src="@/assets/image/cylindrical1.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="0<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<20">
+          <img src="@/assets/image/cylindrical2.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="20<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<40">
+          <img src="@/assets/image/cylindrical3.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="40<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<60">
+          <img src="@/assets/image/cylindrical4.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="60<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<80">
+          <img src="@/assets/image/cylindrical5.png" style="width:40px;height: 170px;margin-left: 0.1rem;" v-if="80<=(dashboarddata.ehtFive) && (dashboarddata.ehtFive)<100">
+          <span class="modelTop pos">STT1065</span>
+          <span class="ModelFont">{{ dashboarddata.ehtFive }}%</span>
         </div>
       </div>
     </div>
@@ -45,12 +65,42 @@
 </template>
 
 <script>
-import cnlylChart from "../dashboard/CnlylChart";
+import { selectLast } from "@/api/aspen/dashboarddata";
 
 export default {
-  components: {
-    cnlylChart
+  data () {
+    return {
+      dashboarddata: {
+        ehtOne: null,
+        ehtTwo: null,
+        ehtThree: null,
+        ehtFour: null,
+        ehtFive: null
+      },
+      // 查询参数
+      queryParams: {
+      },
+    }
+  },
+  created() {
+    this.getList();
+    // 每隔30秒请求一次数据
+    window.setInterval(() => {undefined
+      setTimeout(() => {undefined
+        ///调取接口获取数据
+        this.getList();
+      }, 0)
+    }, 10000)
   },
+  methods: {
+    /** 查询dashboard抓取数据列表 */
+    getList()
+    {
+      selectLast(this.queryParams).then(response => {
+        this.dashboarddata = response.data;
+      });
+    }
+  }
 }
 </script>
 
@@ -85,17 +135,17 @@ export default {
       // right: 0.5rem;
       // font-size: 12px;
           position: absolute;
-          bottom: -8px;
+          bottom: -13px;
           left: 20px;
     }
 
     .modelTop{
       position: absolute;
-      width: 12px; 
-      display: block; 
+      width: 12px;
+      display: block;
        word-break: break-all;
       top: 25%;
-      
+
       &.pos{
         right: 8%;
       }

ui/src/views/front/napTank.vue

@@ -13,11 +13,11 @@
         </div>
       </div>
       <div style="text-align: center; margin-top: 0.3rem;position: relative;">
-        <span class="span-num1">we1234</span>
+        <span class="span-num1">T1621</span>
         <nap />
-        <span class="span-num2">we1234</span>
+        <span class="span-num2">T1622</span>
         <nap />
-        <span class="span-num3">we1234</span>
+        <span class="span-num3">T1623</span>
         <nap />
       </div>
     </div>

ui/src/views/front/productTank.vue

@@ -15,18 +15,18 @@
       <div style="float: left; margin-left: 0.1rem;position: relative">
         <img src="@/assets/image/warehouse1.png" style="height: 124px;margin-top: 0.3rem">
         <div class="ModelFont" style="margin-left: 0.2rem">65%</div>
-        <span class="modelTop pos1">we1234</span>
+        <span class="modelTop pos1">STT1520</span>
       </div>
       <div style="float: left; margin-left: 0.2rem;position: relative">
         <div style="text-align: center">
           <img src="@/assets/image/warehouse1.png" style="height:80px">
-          <span class="modelTop pos2">we1234</span>
+          <span class="modelTop pos2">STT1510</span>
         </div>
         <div style="text-align: center;">
           <img src="@/assets/image/warehouse3.png" style="height: 80px">
-          <span class="modelTop pos3">we1234</span>
+          <span class="modelTop pos3">STT1360</span>
           <img src="@/assets/image/warehouse2.png" style="height:80px; margin-left: 0.2rem">
-          <span class="modelTop pos4">we1234</span>
+          <span class="modelTop pos4">STT1410</span>
         </div>
       </div>
     </div>

ui/src/views/front/steamBalance.vue

@@ -195,44 +195,42 @@
 
         <div class="jiantou15">
           <img src="@/assets/steamImg/jiantou10.png" style="width:41px;height:62px">
-          <p class="num">3 AEU</p>
-          <p class="num2">20 PGU</p>
+          <p class="num">{{ dashboarddata.steamMsoutaeu }}</p>
         </div>
 
         <div class="jiantou16">
           <img src="@/assets/steamImg/jiantou11.png" style="width:77px;height:40px">
-          <p class="num">1</p>
+          <p class="num">{{ dashboarddata.steamMsoutflare }}</p>
         </div>
 
         <div class="jiantou17">
           <img src="@/assets/steamImg/jiantou12.png" style="width:22px;height:69px">
-          <p class="num">1</p>
+          <p class="num">{{ dashboarddata.steamMsoutsctu }}</p>
         </div>
 
         <div class="jiantou18">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:49px">
-          <p class="num">37 AEU</p>
-          <p class="num2">3 PGU</p>
+          <p class="num">{{ dashboarddata.steamMsouteer }}</p>
         </div>
 
         <div class="jiantou19">
           <img src="@/assets/steamImg/jiantou14.png" style="width:8px;height:210px">
-          <p class="num">0</p>
+          <p class="num">{{ dashboarddata.steamLsinpher }}</p>
         </div>
 
         <div class="jiantou20">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:49px">
-          <p class="num">6</p>
+          <p class="num">{{ dashboarddata.steamMsoutfur }}</p>
         </div>
 
         <div class="jiantou21">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:49px">
-          <p class="num">1221</p>
+          <p class="num">{{ dashboarddata.steamMsoutva }}</p>
         </div>
 
         <div class="jiantou22">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:49px">
-          <p class="num">19</p>
+          <p class="num">{{ dashboarddata.steamMsouttracing }}</p>
         </div>
 
         <div class="jiantou23">
@@ -242,12 +240,12 @@
 
         <div class="jiantou24">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:49px">
-          <p class="num">50</p>
+          <p class="num">{{ dashboarddata.steamLsoutvjiu }}</p>
         </div>
 
         <div class="jiantou25">
           <img src="@/assets/steamImg/jiantou3.png" style="width:8px;height:49px">
-          <p class="num">4</p>
+          <p class="num">{{ dashboarddata.steamLsouttracing }}</p>
         </div>
 
         <div class="jiantou26">
@@ -317,17 +315,17 @@
           <img src="@/assets/steamImg/jiantoulan3.png" style="width:80px;height:347px">
           <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">33</p>
+          <p class="num2">{{ dashboarddata.steamHsinsub }}</p>
         </div>
         <div class="jiantoulan pos-6">
           <img src="@/assets/steamImg/jiantoulan4.png" style="width:31px;height:150px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan6">
-          <p class="num2">33</p>
+          <p class="num2">{{ dashboarddata.steamLsinpjiu }}</p>
         </div>
         <div class="jiantoulan pos-7">
           <img src="@/assets/steamImg/jiantoulan5.png" style="width:45px;height:251px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan7">
-          <p class="num2">1</p>
+          <p class="num2">{{ dashboarddata.steamLsinaeu }}</p>
         </div>
          <div class="jiantoulan pos-8">
           <img src="@/assets/steamImg/jiantoulan6.png" style="width:34px;height:89px">
@@ -346,7 +344,7 @@
         <div class="jiantoulan pos-11">
           <img src="@/assets/steamImg/jiantoulan2.png" style="width:31px;height:60px">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan11">
-          <p class="num2">0.37</p>
+          <p class="num2">{{ dashboarddata.steamLsineer }}</p>
         </div>
         <div class="jiantoulan pos-12">
           <img src="@/assets/steamImg/jiantoulan2.png" style="width:31px;height:50px">
@@ -372,10 +370,10 @@
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan15-2">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan15-3">
           <img src="@/assets/steamImg/arror1.png" style="width:32px;height:31px" class="aniMovelan15-4">
-           <p class="num2">6</p>
-           <p class="num3">4.3</p>
-           <p class="num4">0/0</p>
-           <p class="num5">1.5</p>
+           <p class="num2">{{ dashboarddata.steamLsoutesan }}</p>
+           <p class="num3">{{ dashboarddata.steamLsoutewuliu }}</p>
+           <p class="num4">{{ dashboarddata.steamLsoutesi }}</p>
+           <p class="num5">{{ dashboarddata.steamLsoutother }}</p>
 
            <div class="pos15-word-box wordpos-1">
               E363
@@ -728,7 +726,7 @@
         left: 240px;
         .num2{
           top: 103px;
-          left: 22px;
+          right: 32px;
           color: #3659ab;
           position: absolute;
         }
@@ -1638,17 +1636,10 @@
     .num{
       color: #3694b0;
       position: absolute;
-      left: 10px;
-      top: 0;
+      left: 5px;
+      top: 10px;
       width: 100%;
     }
-    .num2{
-      color: #3694b0;
-      position: absolute;
-      left: 10px;
-      top: 20px;
-      width: 110%;
-    }
   }
 
   .jiantou16{
@@ -1670,7 +1661,7 @@
     .num{
       color: #3694b0;
       position: absolute;
-      left: 80px;
+      left: 35px;
       top: 15px;
     }
   }
@@ -1683,13 +1674,6 @@
       color: #3694b0;
       position: absolute;
       left: -20px;
-      top: 4px;
-      width: 100px;
-    }
-    .num2{
-      color: #3694b0;
-      position: absolute;
-      left: -22px;
       top: 20px;
       width: 100px;
     }