Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-miniprogram

app.js

@@ -15,7 +15,7 @@ App({
         } else {
           this.globalData.CustomBar = StatusBar + 50
         }
-        console.log(capsule,"hah",this.globalData.StatusBar,"18")
+        // console.log(capsule,"hah",this.globalData.StatusBar,"18")
       }
     })
   },
@@ -47,7 +47,7 @@ App({
   },
   globalData: {
     autoRefreshTime:5000,
-    specialProject:["Pj1101080259"],
+    specialProject:["VOTn11010802592ab7d57ca79b47ee95a0b9eb1cd6a902"],
     StatusBar: null,
     Custom: null,
     CustomBar: null,

pages/adjust/index.js

@@ -897,6 +897,8 @@ Page({
     // wx.showLoading();
     let res = await getSpacedetail(data);
     // wx.hideLoading();
+    // res.content[0].pm25= 0.034
+
     let {content} = res;
     if(content){
       (content[0].humidity||content[0].humidity==0)&&(content[0].humiditylevel = this.checkLevel(content[0].humidity,"humidity"));

pages/adjust/index.wxml

@@ -57,7 +57,7 @@
                     <view class="icon_name flex_row">
                     <image src="{{value.imgSrc}}" /> {{value.name}}
                     </view>
-                    <view class="parame_num"><text>{{filter.initItemNum(spaceDetail.projectId,spaceDetail[key],value.name)}}</text>{{value.unit}}</view>
+                    <view class="parame_num"><text>{{filter.initItemNum(spaceDetail.tenantId,spaceDetail[key],value.name)}}</text>{{value.unit}}</view>
                     <view class="parame_tag tag{{key}}bg{{spaceDetail[key+'level'].level}}" wx:if="{{(spaceDetail[key]||spaceDetail[key]==0)}}">
                         <text>{{spaceDetail[key+'level'].levelTxt}}</text>
                     </view>

pages/detail/index.js

@@ -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){
       

pages/index/index.js

@@ -231,7 +231,7 @@ Page({
           } else {
             await that.getTenant(res);
             // 第一次进入获取数据
-            console.log($.storage.get('wxqcode'),"$.storage.get('wxqcode')")
+            // console.log($.storage.get('wxqcode'),"$.storage.get('wxqcode')")
             !$.storage.get('wxqcode')&&that.getData();
             !$.storage.get('wxqcode')&&that.autoRefresh(this.getData);
             if($.storage.get('wxqcode')&&$.storage.get('logined')){

pages/index/index.wxml

@@ -67,11 +67,11 @@
                     </view>
                     <view class="space_paramelist flex_row">
                         <block wx:for="{{envNamelist}}" wx:for-index="key" wx:for-item="value">
-                            <view class="parame_item flex_column one-line-text" bindtap="toDetail" data-param="{{key}}" data-spaceid="{{item.id}}" data-projectid="{{item.projectId}}" data-funcid="{{value.funcid}}" data-localname="{{value.localName}}" data-name="{{value.name}}" :key="index">
+                            <view class="parame_item flex_column one-line-text" bindtap="toDetail" data-param="{{key}}" data-spaceid="{{item.id}}" data-tenantId="{{item.tenantId}}" data-funcid="{{value.funcid}}" data-localname="{{value.localName}}" data-name="{{value.name}}" :key="index">
                                 <view class="icon_name flex_row">
                                     <image src="{{value.imgSrc}}" /> {{value.name}}
                                 </view>
-                                <view class="parame_num"><text>{{filter.initItemNum(item.projectId,item[key],value.name)}}</text>{{value.unit}}</view>
+                                <view class="parame_num"><text>{{filter.initItemNum(item.tenantId,item[key],value.name)}}</text>{{value.unit}}</view>
                                 <view class="parame_tag tag{{key}}bg{{item[key+'level'].level}}" wx:if="{{(item[key]||item[key]==0)}}">
                                     <text>{{item[key+'level'].levelTxt}}</text>
                                 </view>

utils/filter.wxs

@@ -10,7 +10,10 @@ var mathFormat = function (num) {
   return formatnum
 }
 var initItemNum = function(project,value,name) {
-  var specialProject=["Pj1101080259"];
+//   var specialProject=["Pj1101080259"];
+/* 
+console.log(project,'project222');
+  var specialProject=["VOTn11010802592ab7d57ca79b47ee95a0b9eb1cd6a902"];
   var falg=false;
   for(var i=0;i<specialProject.length;i++){
     if(specialProject[i]===project){
@@ -21,6 +24,11 @@ var initItemNum = function(project,value,name) {
   if(falg&&name==="PM2.5"&&value){
     value = parseInt(value*1000);
   }
+  */
+ // PM2d5 不用乘 1000
+  if(name==="PM2.5"&&value){
+    value = parseInt(value);
+  }
   if(name==="CO₂"&&value){
     value = parseInt(value);
   }