首页三温图修改

src/main/resources/static/app/additionalHome/controller/qualityCtrl.js

@@ -204,7 +204,7 @@ angular.module('app.additionalHome').controller('qualityCtrl', function ($rootSc
     }
     
     $scope.initThree = function(){
-    	grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$scope.houseId,"13").then(function(data){
+    	grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$rootScope.storehouseObj[parseInt($scope.houseId)].storehouseCode,"13").then(function(data){
         	//初始化echarts 图表
             var option = {
                 tooltip : {

src/main/resources/static/app/additionalHome/controller/storageCtrl.js

@@ -223,7 +223,7 @@ angular.module('app.additionalHome').controller('storageCtrl', function ($rootSc
     }
     
     $scope.initThree = function(){
-    	grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$scope.houseId,"13").then(function(data){
+    	grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$rootScope.storehouseObj[parseInt($scope.houseId)].storehouseCode,"13").then(function(data){
         	//初始化echarts 图表
             var option = {
                 tooltip : {

src/main/resources/static/app/home/controller/quxtCtrl.js

@@ -47,7 +47,7 @@ angular.module('app.system').controller("quxtCtrl",
 
 
         $scope.newInit = function () {
-            grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$scope.houseId,"13").then(function(data){
+            grainTempService.getThreeConditionHomePage($rootScope.orgInfo.orgId,$rootScope.storehouseObj[parseInt($scope.houseId)].storehouseCode,"13").then(function(data){
                 //初始化echarts 图表
                 var option = {
                     tooltip : {
@@ -163,18 +163,28 @@ angular.module('app.system').controller("quxtCtrl",
                     for (var i=data.length-1;i>=0;i--){
                         if(data[i].lswd != 250) {
                             lswd.push(data[i].lswd);
+                        }else{
+                            lswd.push(null);
                         }
                         if(data[i].cwwd != 250) {
                             cwwd.push(data[i].cwwd);
+                        }else{
+                            cwwd.push(null);
                         }
                         if(data[i].cnwd != 250) {
                             cnwd.push(data[i].cnwd);
+                        }else{
+                            cnwd.push(null);
                         }
                         if(data[i].cnsd != 250) {
                             cnsd.push(data[i].cnsd);
+                        }else{
+                            cnsd.push(null);
                         }
                         if(data[i].cwsd != 250) {
                             cwsd.push(data[i].cwsd);
+                        }else{
+                            cwsd.push(null);
                         }
                         timeList.push(data[i].days);
                     }