diff --git a/src/views/enm_energy/energyPicture.vue b/src/views/enm_energy/energyPicture.vue
index 765f9d76..2b9c0bc5 100644
--- a/src/views/enm_energy/energyPicture.vue
+++ b/src/views/enm_energy/energyPicture.vue
@@ -7,104 +7,127 @@
                 <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
+                <div class="energyNumber energyNumberLeft" style="top: 183px;">
+                    <img v-if="dataObj.全厂用电合计" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.全厂用电合计 }} 
+                    <span v-if="dataObj.全厂用电合计">kWh</span>
                 </div>
-                <div class="energyNumber energyNumberLeft2" style="top: 91px;">
-                    <!-- <img v-if="dataObj.电石渣配电室用电_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.电石渣配电室用电_电 }} kWh
+                <div class="energyNumber energyNumberLeft2" style="top: 84px;">
+                    <img v-if="dataObj.电石渣配电室用电_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.电石渣配电室用电_电 }} 
+                    <span v-if="dataObj.电石渣配电室用电_电">kWh</span>
                 </div>
                 <!-- 窑头配电室用电_电 -->
-                <div class="energyNumber energyNumberLeft2" style="top: 188px;">
-                    <!-- <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.回转窑_电 }} kWh
+                <div class="energyNumber energyNumberLeft2" style="top: 181px;">
+                    <img v-if="dataObj.回转窑_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.回转窑_电 }} 
+                    <span v-if="dataObj.回转窑_电">kWh</span>
                 </div>
-                <div class="energyNumber energyNumberLeft2" style="top: 335px;">
-                    <!-- <img v-if="dataObj.水泥配电室用电_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.水泥配电室用电_电 }} kWh
+                <div class="energyNumber energyNumberLeft2" style="top: 331px;">
+                    <img v-if="dataObj.水泥配电室用电_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.水泥配电室用电_电 }} 
+                    <span v-if="dataObj.水泥配电室用电_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 84px;">
-                    <!-- <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/elec.png">  -->
-                    {{ dataObj.烘干破碎机_电 }} kWh
+
+                <div class="energyNumber" style="top: 77px;">
+                    <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/tkx_e.png"> 
+                    {{ dataObj.烘干破碎机_电 }} 
+                    <span v-if="dataObj.烘干破碎机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 138px;">
-                    <!-- <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.原料立磨主电机 }}kWh
+                <div class="energyNumber" style="top: 131px;">
+                    <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.原料立磨主电机 }}
+                    <span v-if="dataObj.原料立磨主电机">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 181px;">
-                    <!-- <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.生粉制备_循环风机_电 }} kWh
+                <div class="energyNumber" style="top: 175px;">
+                    <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.生粉制备_循环风机_电 }} 
+                    <span v-if="dataObj.生粉制备_循环风机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 225px;">
-                    <!-- <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/elec.png"> -->
+                <div class="energyNumber" style="top: 219px;">
+                    <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/tkx_e.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
+                <div class="energyNumber" style="top: 269px;">
+                    <img v-if="dataObj.高温风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.高温风机_电 }} 
+                    <span v-if="dataObj.高温风机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 330px;">
-                    <!-- <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.尾排风机_电 }} kWh
+                <div class="energyNumber" style="top: 325px;">
+                    <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.尾排风机_电 }} 
+                    <span v-if="dataObj.尾排风机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 383px;">
-                    <!-- <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.回转窑_电 }} kWh
+                <div class="energyNumber" style="top: 379px;">
+                    <img v-if="dataObj.烧成工序用电合计" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.烧成工序用电合计 }} 
+                    <span v-if="dataObj.烧成工序用电合计">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 433px;">
-                    <!-- <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.原料立磨主电机}} kWh
+                <div class="energyNumber" style="top: 430px;">
+                    <img v-if="dataObj.原料立磨主电机" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.原料立磨主电机}} 
+                    <span v-if="dataObj.原料立磨主电机">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 490px;">
-                    <!-- <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.煤磨排风机_电 }} kWh
+                <div class="energyNumber" style="top: 488px;">
+                    <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.煤磨排风机_电 }} 
+                    <span v-if="dataObj.煤磨排风机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 539px;">
-                    <!-- <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.窑头排风机_电 }} kWh
+                <div class="energyNumber" style="top: 538px;">
+                    <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.窑头排风机_电 }} 
+                    <span v-if="dataObj.窑头排风机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 609px;">
-                    <!-- <img v-if="dataObj.水泥磨_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.水泥磨_电 }} kWh
+                <div class="energyNumber" style="top: 608px;">
+                    <img v-if="dataObj.水泥磨用电合计" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.水泥磨用电合计 }} 
+                    <span v-if="dataObj.水泥磨用电合计">kWh</span>
                 </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/tkx_e.png">
+                    {{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }} 
+                    <span v-if="dataObj.辊压机动_电||dataObj.辊压机定_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 720px;">
-                    <!-- <img v-if="dataObj.系统风机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.系统风机_电 }} kWh
+                <div class="energyNumber" style="top: 721px;">
+                    <img v-if="dataObj.系统风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.系统风机_电 }} 
+                    <span v-if="dataObj.系统风机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 775px;">
-                    <!-- <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.水泥磨_选粉机_电 }} kWh
+                <div class="energyNumber" style="top: 776px;">
+                    <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.水泥磨_选粉机_电 }} 
+                    <span v-if="dataObj.水泥磨_选粉机_电">kWh</span>
                 </div>
-                <div class="energyNumber" style="top: 831px;">
-                    <!-- <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/elec.png"> -->
-                    {{ dataObj.水泥磨_循环风机_电 }} kWh
+                <div class="energyNumber" style="top: 833px;">
+                    <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/tkx_e.png">
+                    {{ dataObj.水泥磨_循环风机_电 }} 
+                    <span v-if="dataObj.水泥磨_循环风机_电">kWh</span>
                 </div>
                 <!-- 煤 -->
-                <div class="energyNumberLeft coalNumber" style="top: 460px;">
-                    <!-- <img v-if="dataObj.原煤累计量" class="iconImg" src="img/coal.png"> -->
-                    {{ dataObj.原煤累计量 }} t
+                <div class="energyNumberLeft coalNumber" style="top: 478px;">
+                    <img v-if="dataObj.原煤累计量" class="iconImg" src="img/tkx_c.png">
+                    {{ dataObj.原煤累计量 }} 
+                    <span v-if="dataObj.水泥磨_循环风机_电">t</span>
                 </div>
                 <!-- 头煤 -->
-                <div class="energyNumberRight coalNumber" style="top: 463px;">
-                    <!-- <img v-if="dataObj.头煤_煤" class="iconImg" src="img/coal.png"> -->
-                    {{ dataObj.头煤_煤 }} t
+                <div class="energyNumberRight coalNumber" style="top: 482px;">
+                    <img v-if="dataObj.头煤_煤" class="iconImg" src="img/tkx_c.png">
+                    {{ dataObj.头煤_煤 }} 
+                    <span v-if="dataObj.头煤_煤">t</span>
                 </div>
                 <!-- 尾煤 -->
-                <div class="energyNumberRight coalNumber" style="top: 552px;">
-                    <!-- <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/coal.png"> -->
-                    {{ dataObj.尾煤_煤 }} t
+                <div class="energyNumberRight coalNumber" style="top: 566px;">
+                    <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/tkx_c.png">
+                    {{ dataObj.尾煤_煤 }} 
+                    <span v-if="dataObj.尾煤_煤">t</span>
                 </div>
 
                 <!-- 工业水 -->
                 <div class="energyNumberLeft waterNumber" style="top: 638px;">
-                    <!-- <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/coal.png"> -->
-                    {{ dataObj.工业水 }} t
+                    <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/tkx_w.png">
+                    {{ dataObj.工业水 }} 
+                    <span v-if="dataObj.工业水">t</span>
                 </div>
             </div> 
         </el-main>
@@ -165,20 +188,20 @@
     .energyNumber{
         position: absolute;
         right: 10px;
-        color: rgb(212, 35, 122);
+        color: #d4237a;
         font-size: 14px;
         font-weight: bold;
     }
     .coalNumber{
         position: absolute;
         right: 10px;
-        color: rgb(223, 213, 22);
+        color: #dfd516;
         font-size: 14px;
         font-weight: bold;
     }
     .waterNumber{
         position: absolute;
-        color: rgb(43, 43, 223);
+        color: #2b2bdf;
         font-size: 14px;
         font-weight: bold;
     }
@@ -186,10 +209,10 @@
         left: 5px;
     }
     .energyNumberLeft2{
-        right: 600px;
+        right: 611px;
     }
     .energyNumberRight{
-        right: 328px;
+        right: 333px;
     }
     .pictureHeader {
     position: absolute;