From 368d1061435d7b66dd5a6b2a32dba2a0b357403c Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Tue, 17 Dec 2024 17:07:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=83=BD=E6=BA=90=E6=B5=81=E5=90=91?=
 =?UTF-8?q?=E5=9B=BE=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=B8=9A=E6=B0=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_energy/energyPicture.vue | 93 ++++++++++++++++++--------
 1 file changed, 64 insertions(+), 29 deletions(-)

diff --git a/src/views/enm_energy/energyPicture.vue b/src/views/enm_energy/energyPicture.vue
index 94b07a14..fc67cd0b 100644
--- a/src/views/enm_energy/energyPicture.vue
+++ b/src/views/enm_energy/energyPicture.vue
@@ -2,80 +2,109 @@
     <el-container>
         <el-main style="background: #fff;">
             <div class="pictureContainer">
-                 <img src="/media/elec_flow.png" class="flowImg" >
-                <!-- <img src="/img/energy.png" class="flowImg" /> -->
+                 <!-- <img src="/media/elec_flow.png" class="flowImg" > -->
+                <img src="/img/energy.png" class="flowImg" />
                 <div class="pictureHeader" style="top: 35px;">
                     本日数据  时间段 00:00--24:00
                 </div>
                 <div class="energyNumber energyNumberLeft" style="top: 187px;">
-                    <img v-if="dataObj.全厂电量_电" class="iconImg" src="img/elec.png">{{ dataObj.全厂电量_电 }} kWh
+                    <!-- <img v-if="dataObj.全厂电量_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.全厂电量_电 }} kWh
                 </div>
                 <div class="energyNumber energyNumberLeft2" style="top: 91px;">
-                    <img v-if="dataObj.电石渣配电室用电_电" class="iconImg" src="img/elec.png">{{ dataObj.电石渣配电室用电_电 }} kWh
+                    <!-- <img v-if="dataObj.电石渣配电室用电_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.电石渣配电室用电_电 }} kWh
                 </div>
                 <!-- 窑头配电室用电_电 -->
                 <div class="energyNumber energyNumberLeft2" style="top: 188px;">
-                    <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png">{{ dataObj.回转窑_电 }} kWh
+                    <!-- <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.回转窑_电 }} kWh
                 </div>
                 <div class="energyNumber energyNumberLeft2" style="top: 335px;">
-                    <img v-if="dataObj.水泥配电室用电_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥配电室用电_电 }} kWh
+                    <!-- <img v-if="dataObj.水泥配电室用电_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.水泥配电室用电_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 84px;">
-                    <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/elec.png"> {{ dataObj.烘干破碎机_电 }} kWh
+                    <!-- <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/elec.png">  -->
+                    {{ dataObj.烘干破碎机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 138px;">
-                    <img v-if="dataObj.辅材立磨_电" class="iconImg" src="img/elec.png">{{ dataObj.辅材立磨_电 }}
+                    <!-- <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.原料立磨主电机 }}kWh
                 </div>
                 <div class="energyNumber" style="top: 181px;">
-                    <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_循环风机_电 }} kWh
+                    <!-- <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.生粉制备_循环风机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 225px;">
-                    <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_选粉机_电 }} kWh
+                    <!-- <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.生粉制备_选粉机_电 }} 
+                    <span v-if="dataObj.生粉制备_选粉机_电">kWh</span>
                 </div>
                 <div class="energyNumber" style="top: 275px;">
-                    <img v-if="dataObj.高温风机_电" class="iconImg" src="img/elec.png">{{ dataObj.高温风机_电 }} kWh
+                    <!-- <img v-if="dataObj.高温风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.高温风机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 330px;">
-                    <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.尾排风机_电 }} kWh
+                    <!-- <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.尾排风机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 383px;">
-                    <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png">{{ dataObj.回转窑_电 }} kWh
+                    <!-- <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.回转窑_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 433px;">
-                    <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/elec.png">{{ dataObj.原料立磨主电机}} kWh
+                    <!-- <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.原料立磨主电机}} kWh
                 </div>
                 <div class="energyNumber" style="top: 490px;">
-                    <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.煤磨排风机_电 }} kWh
+                    <!-- <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.煤磨排风机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 539px;">
-                    <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.窑头排风机_电 }} kWh
+                    <!-- <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.窑头排风机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 609px;">
-                    <img v-if="dataObj.水泥磨_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_电 }} kWh
+                    <!-- <img v-if="dataObj.水泥磨_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.水泥磨_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 665px;">
-                    <img v-if="dataObj.辊压机动_电||dataObj.辊压机定_电" class="iconImg" src="img/elec.png">{{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }} kWh
+                    <!-- <img v-if="dataObj.辊压机动_电||dataObj.辊压机定_电" class="iconImg" src="img/elec.png"> -->
+                    {{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }} kWh
                 </div>
                 <div class="energyNumber" style="top: 720px;">
-                    <img v-if="dataObj.系统风机_电" class="iconImg" src="img/elec.png">{{ dataObj.系统风机_电 }} kWh
+                    <!-- <img v-if="dataObj.系统风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.系统风机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 775px;">
-                    <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_选粉机_电 }} kWh
+                    <!-- <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.水泥磨_选粉机_电 }} kWh
                 </div>
                 <div class="energyNumber" style="top: 831px;">
-                    <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_循环风机_电 }} kWh
+                    <!-- <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/elec.png"> -->
+                    {{ dataObj.水泥磨_循环风机_电 }} kWh
                 </div>
                 <!-- 煤 -->
                 <div class="energyNumberLeft coalNumber" style="top: 460px;">
-                    <img v-if="dataObj.原煤累计量" class="iconImg" src="img/coal.png">{{ dataObj.原煤累计量 }} t
+                    <!-- <img v-if="dataObj.原煤累计量" class="iconImg" src="img/coal.png"> -->
+                    {{ dataObj.原煤累计量 }} t
                 </div>
                 <!-- 头煤 -->
                 <div class="energyNumberRight coalNumber" style="top: 463px;">
-                    <img v-if="dataObj.头煤_煤" class="iconImg" src="img/coal.png">{{ dataObj.头煤_煤 }} t
+                    <!-- <img v-if="dataObj.头煤_煤" class="iconImg" src="img/coal.png"> -->
+                    {{ dataObj.头煤_煤 }} t
                 </div>
                 <!-- 尾煤 -->
                 <div class="energyNumberRight coalNumber" style="top: 552px;">
-                    <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/coal.png">{{ dataObj.尾煤_煤 }} t
+                    <!-- <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/coal.png"> -->
+                    {{ dataObj.尾煤_煤 }} t
+                </div>
+
+                <!-- 工业水 -->
+                <div class="energyNumberLeft waterNumber" style="top: 638px;">
+                    <!-- <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/coal.png"> -->
+                    {{ dataObj.工业水 }} t
                 </div>
             </div> 
         </el-main>
@@ -102,7 +131,7 @@
                 day: day,
                 type: 'day',
                 page:0,
-                mpoint__material__code__in:'elec,coal,pcoal'
+                mpoint__material__code__in:'elec,coal,pcoal,water'
             };
             this.$API.enm.mpoint.stat.req(obj).then(res => {
                 res.forEach(item => {
@@ -136,15 +165,21 @@
     .energyNumber{
         position: absolute;
         right: 10px;
-        color: rgb(20, 244, 23);
-        font-size: 15px;
+        color: rgb(212, 35, 122);
+        font-size: 14px;
         font-weight: bold;
     }
     .coalNumber{
         position: absolute;
         right: 10px;
-        color: rgb(212, 35, 122);
-        font-size: 15px;
+        color: rgb(223, 213, 22);
+        font-size: 14px;
+        font-weight: bold;
+    }
+    .waterNumber{
+        position: absolute;
+        color: rgb(43, 43, 223);
+        font-size: 14px;
         font-weight: bold;
     }
     .energyNumberLeft{