|
@@ -1365,7 +1365,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):'--';
|
|
|
}
|
|
@@ -1723,7 +1723,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,
|
|
@@ -1878,7 +1878,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:{
|
|
@@ -1957,12 +1969,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)
|