Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

src/views/enm_energy/energyPicture.vue

@@ -2,53 +2,78 @@
     <el-container>
         <el-main style="background: #fff;">
             <div class="pictureContainer">
-                 <!-- <img src="/media/elec_flow.png" class="flowImg" > -->
+                 <img src="/media/elec_flow.png" class="flowImg" >
-                <img src="/img/energy.png" class="flowImg" />
+                <!-- <img src="/img/energy.png" class="flowImg" /> -->
-                <div class="energyNumber" style="top: 80px;">
+                <div class="energyNumber energyNumberLeft" style="top: 187px;">
-                    <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/elec.png"> {{ dataObj.烘干破碎机_电 }}
+                    <img v-if="dataObj.全厂电量_电" class="iconImg" src="img/elec.png">{{ dataObj.全厂电量_电 }}
                 </div>
-                <div class="energyNumber" style="top: 132px;">
+                <div class="energyNumber energyNumberLeft2" style="top: 91px;">
-                    <img v-if="dataObj.辅材立磨_电" class="iconImg" src="img/elec.png">{{ dataObj.辅材立磨_电 }}
+                    <img v-if="dataObj.电石渣配电室用电_电" class="iconImg" src="img/elec.png">{{ dataObj.电石渣配电室用电_电 }}
                 </div>
-                <div class="energyNumber" style="top: 178px;">
+                <!-- 窑头配电室用电_电 -->
-                    <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_循环风机_电 }}
+                <div class="energyNumber energyNumberLeft2" style="top: 188px;">
-                </div>
-                <div class="energyNumber" style="top: 222px;">
-                    <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_选粉机_电 }}
-                </div>
-                <div class="energyNumber" style="top: 270px;">
-                    <img v-if="dataObj.高温风机_电" class="iconImg" src="img/elec.png">{{ dataObj.高温风机_电 }}
-                </div>
-                <div class="energyNumber" style="top: 326px;">
-                    <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.尾排风机_电 }}
-                </div>
-                <div class="energyNumber" style="top: 379px;">
                     <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png">{{ dataObj.回转窑_电 }}
                 </div>
-                <div class="energyNumber" style="top: 430px;">
+                <div class="energyNumber energyNumberLeft2" style="top: 335px;">
+                    <img v-if="dataObj.水泥配电室用电_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥配电室用电_电 }}
+                </div>
+                <div class="energyNumber" style="top: 84px;">
+                    <img v-if="dataObj.烘干破碎机_电" class="iconImg" src="img/elec.png"> {{ dataObj.烘干破碎机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 138px;">
+                    <img v-if="dataObj.辅材立磨_电" class="iconImg" src="img/elec.png">{{ dataObj.辅材立磨_电 }}
+                </div>
+                <div class="energyNumber" style="top: 181px;">
+                    <img v-if="dataObj.生粉制备_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_循环风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 225px;">
+                    <img v-if="dataObj.生粉制备_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.生粉制备_选粉机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 275px;">
+                    <img v-if="dataObj.高温风机_电" class="iconImg" src="img/elec.png">{{ dataObj.高温风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 330px;">
+                    <img v-if="dataObj.尾排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.尾排风机_电 }}
+                </div>
+                <div class="energyNumber" style="top: 383px;">
+                    <img v-if="dataObj.回转窑_电" class="iconImg" src="img/elec.png">{{ dataObj.回转窑_电 }}
+                </div>
+                <div class="energyNumber" style="top: 433px;">
                     <img v-if="dataObj.煤立磨_电" class="iconImg" src="img/elec.png">{{ dataObj.煤立磨_电 }}
                 </div>
-                <div class="energyNumber" style="top: 487px;">
+                <div class="energyNumber" style="top: 490px;">
                     <img v-if="dataObj.煤磨排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.煤磨排风机_电 }}
                 </div>
-                <div class="energyNumber" style="top: 536px;">
+                <div class="energyNumber" style="top: 539px;">
                     <img v-if="dataObj.窑头排风机_电" class="iconImg" src="img/elec.png">{{ dataObj.窑头排风机_电 }}
                 </div>
-                <div class="energyNumber" style="top: 607px;">
+                <div class="energyNumber" style="top: 609px;">
                     <img v-if="dataObj.水泥磨_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_电 }}
                 </div>
-                <div class="energyNumber" style="top: 663px;">
+                <div class="energyNumber" style="top: 665px;">
                     <img v-if="dataObj.辊压机动_电||dataObj.辊压机定_电" class="iconImg" src="img/elec.png">{{ (Number(dataObj.辊压机动_电) + Number(dataObj.辊压机定_电)).toFixed(2) }}
                 </div>
-                <div class="energyNumber" style="top: 719px;">
+                <div class="energyNumber" style="top: 720px;">
                     <img v-if="dataObj.系统风机_电" class="iconImg" src="img/elec.png">{{ dataObj.系统风机_电 }}
                 </div>
-                <div class="energyNumber" style="top: 773px;">
+                <div class="energyNumber" style="top: 775px;">
                     <img v-if="dataObj.水泥磨_选粉机_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_选粉机_电 }}
                 </div>
-                <div class="energyNumber" style="top: 830px;">
+                <div class="energyNumber" style="top: 831px;">
                     <img v-if="dataObj.水泥磨_循环风机_电" class="iconImg" src="img/elec.png">{{ dataObj.水泥磨_循环风机_电 }}
                 </div>
+                <!-- 煤 -->
+                <div class="energyNumberLeft coalNumber" style="top: 460px;">
+                    <img v-if="dataObj.原煤累计量" class="iconImg" src="img/coal.png">{{ dataObj.原煤累计量 }}
+                </div>
+                <!-- 头煤 -->
+                <div class="energyNumberRight coalNumber" style="top: 463px;">
+                    <img v-if="dataObj.头煤_煤" class="iconImg" src="img/coal.png">{{ dataObj.头煤_煤 }}
+                </div>
+                <!-- 尾煤 -->
+                <div class="energyNumberRight coalNumber" style="top: 552px;">
+                    <img v-if="dataObj.尾煤_煤" class="iconImg" src="img/coal.png">{{ dataObj.尾煤_煤 }}
+                </div>
             </div> 
         </el-main>
     </el-container>
@@ -58,24 +83,7 @@
         data() {
             return { 
                 imgSrc:'',
-                dataObj:{
+                dataObj:{ }
-                    // elec:{}
-                    // 烘干破碎机:0,
-                    // 辅材立磨:0,
-                    // 生粉循环风机:0,//生粉制备
-                    // 生粉选粉机:0,//生粉制备
-                    // 高温风机:0,
-                    // 尾排风机:0,
-                    // 回转窑:0,
-                    // 煤立磨:0,
-                    // 煤磨排风机:0,
-                    // 窑头排风机:0,
-                    // 水泥磨:0,
-                    // 辊压机:0,
-                    // 系统风机:0,
-                    // 选粉机:0,//水泥磨
-                    // 循环风机:0,//水泥磨
-                }
             };
         },
         mounted() {
@@ -91,7 +99,7 @@
                 day: day,
                 type: 'day',
                 page:0,
-                mpoint__material__code__in:'elec'
+                mpoint__material__code__in:'elec,coal,pcoal'
             };
             this.$API.enm.mpoint.stat.req(obj).then(res => {
                 res.forEach(item => {
@@ -109,12 +117,12 @@
 <style>
     .pictureContainer{
         position: relative;
-        width: 1200px;
+        width: 900px;
         height: 900px;
     }
     .flowImg{
         display: inline-block;
-        width: 1200px;
+        width: 900px;
         height: 900px;
     }
     .iconImg{
@@ -124,10 +132,26 @@
     }
     .energyNumber{
         position: absolute;
-        right: 35px;
+        right: 10px;
-        /* color: #536dfe; */
         color: rgb(223, 213, 22);
         font-size: 15px;
         font-weight: bold;
     }
+    .coalNumber{
+        position: absolute;
+        right: 10px;
+        color: rgb(212, 35, 122);
+        font-size: 15px;
+        font-weight: bold;
+    }
+    .energyNumberLeft{
+        left: 5px;
+    }
+    .energyNumberLeft2{
+        right: 600px;
+    }
+    .energyNumberRight{
+        right: 328px;
+    }
+    
 </style>

src/views/enm_report/reportFactory.vue

@@ -77,13 +77,13 @@
                     <tr v-for="(item,index) in tableDatas" :key="index">
                         <td class="numCell">{{item[0]}}</td>
                         <td class="numCell">{{item[1]}}</td>
-                        <td class="numCell" v-if="index==6||index==7||index==8" colspan="6">{{item[2]}}</td>
+                        <td class="numCell" v-if="index==3||index==6||index==7||index==8" colspan="6">{{item[2]}}</td>
                         <td class="numCell" v-else>{{item[2]}}</td>
-                        <td class="numCell" v-if="index!==6&&index!==7&&index!==8">{{item[3]}}</td>
+                        <td class="numCell" v-if="index!==3&&index!==6&&index!==7&&index!==8">{{item[3]}}</td>
-                        <td class="numCell" v-if="index!==6&&index!==7&&index!==8">{{item[4]}}</td>
+                        <td class="numCell" v-if="index!==3&&index!==6&&index!==7&&index!==8">{{item[4]}}</td>
-                        <td class="numCell" v-if="index!==6&&index!==7&&index!==8">{{item[5]}}</td>
+                        <td class="numCell" v-if="index!==3&&index!==6&&index!==7&&index!==8">{{item[5]}}</td>
-                        <td class="numCell" v-if="index!==6&&index!==7&&index!==8">{{item[6]}}</td>
+                        <td class="numCell" v-if="index!==3&&index!==6&&index!==7&&index!==8">{{item[6]}}</td>
-                        <td class="numCell" v-if="index!==6&&index!==7&&index!==8">{{item[7]}}</td>
+                        <td class="numCell" v-if="index!==3&&index!==6&&index!==7&&index!==8">{{item[7]}}</td>
                     </tr>
                 </table>
             </div>
@@ -219,10 +219,11 @@
                 obj.year = par.year_s;
                 obj.month = par.month_s;
                 obj.day = par.day_s;
-                obj.mpoint__in = "3631858394648182784,3631858982832218112,3631858687335112704";
+                obj.mpoint__in = "3631858394648182784,3631858982832218112,3631858687335112704,3645808827951284224,3645809489200259072";
                 let that = this;
                 this.$API.enm.mpointstat.list.req(obj).then(res=>{
                     if(res.length>0){
+                        that.tableDatas[3][2] = 0;
                         res.forEach((item)=>{
                             if(item.mpoint_nickname=='绿化水'){
                                 that.tableDatas[6][2] = item.val;
@@ -230,8 +231,14 @@
                                 that.tableDatas[7][2] = item.val;
                             }else if(item.mpoint_nickname=='工业水'){
                                 that.tableDatas[8][2] = item.val;
+                            }else if(item.mpoint_nickname=='头煤_煤'){
+                                that.tableDatas[3][2] += Number(item.val);
+                            }else if(item.mpoint_nickname=='尾煤_煤'){
+                                that.tableDatas[3][2] += Number(item.val);
                             }
                         })
+                        // that.tableDatas[3][2] = coalTotl;//煤耗
+                        console.log('that.tableDatas[3][2]',that.tableDatas[3][2])
                     }
                 })
             },