浏览代码

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-pdf-pages

anxiaoxia 3 年之前
父节点
当前提交
4ca5940c22
共有 2 个文件被更改,包括 33 次插入12 次删除
  1. 17 3
      src/views/ReportForm/weekReport/envSurvey.vue
  2. 16 9
      src/views/ReportForm/weekReport/reportDetail.vue

+ 17 - 3
src/views/ReportForm/weekReport/envSurvey.vue

@@ -99,12 +99,14 @@
                     <div class="useradjust_list">
                         <div>
                             <span class="list_title">当月累计电耗</span><br>
-                            <span class="list_content">{{typeof(surveyTable.monthEnergy)=='number'?surveyTable.monthEnergy/10000:'--'}}<span>万kWh</span></span><br>
+                             <span class="list_content">{{dealData(surveyTable.monthEnergy)}}<span>万kWh</span></span><br>
+                            <!-- <span class="list_content">{{typeof(surveyTable.monthEnergy)=='number'?surveyTable.monthEnergy/10000:'--'}}<span>万kWh</span></span><br> -->
                             <span class="list_sum">环比:<rateSpan :value="surveyTable.monthEnergyChainRatio" /></span>
                         </div>
                         <div>
                             <span class="list_title">年累计电耗</span><br>
-                            <span class="list_content">{{typeof(surveyTable.yearEnergy)=='number'?surveyTable.yearEnergy/10000:'--'}}<span>万kWh</span></span><br>
+                            <span class="list_content">{{dealData(surveyTable.yearEnergy)}}<span>万kWh</span></span><br>
+                            <!-- <span class="list_content">{{typeof(surveyTable.yearEnergy)=='number'?surveyTable.yearEnergy/10000:'--'}}<span>万kWh</span></span><br> -->
                             <span class="list_sum">环比:<rateSpan :value="surveyTable.yearEnergyChainRatio" /></span>
                     </div>
                     </div>
@@ -223,7 +225,19 @@ export default {
     },
     watch:{
 
-    }
+    },
+    methods: {
+        dealData(val){
+            // 保留两位小数
+            if (typeof(val)=='number') {
+                val = (val/10000).toFixed(2);
+            }else{
+                val = '--'
+            }
+             return val;
+            
+        }
+    },
 }
 </script>
 

+ 16 - 9
src/views/ReportForm/weekReport/reportDetail.vue

@@ -1366,7 +1366,7 @@ export default {
                             let ctype= ctypeMap[item.type];
                             //4 5 6 7 8
                             if(ctype==4){
-                                this.surveyTable[ctype].weekAvg =(typeof item.avgDate =="number")?(item.avgDate*this.multipleInit).toFixed(this.surveyTable[ctype].init):'--';
+                                this.surveyTable[ctype].weekAvg =(typeof item.avgDate =="number")?(item.avgDate*this.multipleInit(item.startDate,'week')).toFixed(this.surveyTable[ctype].init):'--';
                             }else{
                                 this.surveyTable[ctype].weekAvg =(typeof item.avgDate =="number")?item.avgDate.toFixed(this.surveyTable[ctype].init):'--';
                             }
@@ -1724,7 +1724,7 @@ export default {
                 let dataList = this.generateDate(startTime,14);
                 let copeArr=dataList.map(index=>{
                     let items = arr.filter(v=> index ===v.date).length&&arr.filter(v=> index===v.date)[0];
-                    items.avgPm2d5&&(items.avgPm2d5 =items.avgPm2d5*this.multipleInit);
+                    items.avgPm2d5&&(items.avgPm2d5 =items.avgPm2d5*this.multipleInit(items.date,'day'));
                     let itemsModel={
                         avgTemp: -9999,
                         coldLastTime:-9999,
@@ -1879,7 +1879,19 @@ export default {
                 }
                 this.emailVisible=false;
             })
-        }
+        },
+        multipleInit(valDate,dateFlag){
+            // 根据项目 和 日期判断数值 
+            // 博瑞尚格 且 week 小于 5月3日 ; day 小于 5月8日的   乘1000
+             valDate =  Number(valDate);
+            if(this.projectId==="Pj1101080259"){
+                if ((dateFlag==='week' && valDate < 20210503) || (dateFlag==='day' && valDate < 20210508)) {
+                    return 1000;
+                }
+                
+            }
+            return 1
+        },
 
     },
     watch:{
@@ -1958,12 +1970,7 @@ export default {
                 return item.id==this.envType
             })
         },
-        multipleInit(){
-            if(this.projectId==="Pj1101080259"){
-                return 1000;
-            }
-            return 1
-        },
+
         envTypelistnow(){
             if(this.projectId!=="Pj1101080259"){
                 return this.envTypelist.slice(0,6)