|
@@ -67,7 +67,7 @@ Page({
|
|
|
pointerTop:0,
|
|
|
funcid:"",
|
|
|
spaceId:"",
|
|
|
- projectId:"",
|
|
|
+ projectId:"", // 项目id
|
|
|
tragetChart:[],
|
|
|
seasonType:''
|
|
|
},
|
|
@@ -87,6 +87,7 @@ Page({
|
|
|
throw "网络错误";
|
|
|
}
|
|
|
let {avg,propertyData,dayTarget}=res;
|
|
|
+ console.log(res,'返回数据集值');
|
|
|
this.initChartdate(propertyData,dayTarget);
|
|
|
let levelList=[];
|
|
|
|
|
@@ -170,10 +171,17 @@ Page({
|
|
|
}
|
|
|
}
|
|
|
let funid = this.data.funcid;
|
|
|
+ // 由项目 projectId 判断改为 租户 tenantId 做判断
|
|
|
+ /*
|
|
|
let specialProject=$.store.get("specialProject");
|
|
|
- let falgPro = (funid==="PM2d5"&&specialProject.includes(this.data.projectId));
|
|
|
+ // let falgPro = (funid==="PM2d5"&&specialProject.includes(this.data.projectId));
|
|
|
+ let tenantId = $.store.get("tenantId");
|
|
|
+ let falgPro = (funid==="PM2d5"&&specialProject.includes(tenantId));
|
|
|
+ */
|
|
|
(baseArr.length>1)&&baseArr.forEach(item=>{
|
|
|
- item[1] = item[1]=="-9999"?null:falgPro?parseInt(item[1]*1000):initNum[funid](item[1]);
|
|
|
+ //PM2d5 不用乘 1000
|
|
|
+ // item[1] = item[1]=="-9999"?null:falgPro?parseInt(item[1]*1000):initNum[funid](item[1]);
|
|
|
+ item[1] = item[1]=="-9999"?null:initNum[funid](item[1]);
|
|
|
});
|
|
|
if(baseArr.length===dayTarget.length){
|
|
|
|