2 Commits 059040167d ... e3365faedc

Author SHA1 Message Date
  maopixin e3365faedc Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin 2 years ago
  maopixin 8bd7176d44 fix: 温湿度列表 2 years ago

+ 2 - 1
src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthDetailCtrl.js

@@ -26,6 +26,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
26
 		GrainAnalysisService.getInfo(id).then(function(data) {
26
 		GrainAnalysisService.getInfo(id).then(function(data) {
27
 			console.log(data);
27
 			console.log(data);
28
 			$scope.form = data
28
 			$scope.form = data
29
+			$scope.temperature = data.tTestdata
29
 		}, function(data){
30
 		}, function(data){
30
 			console.log(data);
31
 			console.log(data);
31
 		})
32
 		})
@@ -84,7 +85,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
84
 				$scope.temperature = arr
85
 				$scope.temperature = arr
85
 				var arr2 = []
86
 				var arr2 = []
86
 				for (var i = 0; i < arr.length; i++) {
87
 				for (var i = 0; i < arr.length; i++) {
87
-					var e = data[i];
88
+					var e = arr[i];
88
 					arr2.push({
89
 					arr2.push({
89
 						ycqklx: '',
90
 						ycqklx: '',
90
 						ycqkbw: '',
91
 						ycqkbw: '',

+ 2 - 1
src/main/resources/static/app/storage/foodstuffAnalysis/controller/quarterDetailCtrl.js

@@ -26,6 +26,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
26
 		GrainAnalysisService.getInfo(id).then(function(data) {
26
 		GrainAnalysisService.getInfo(id).then(function(data) {
27
 			console.log(data);
27
 			console.log(data);
28
 			$scope.form = data
28
 			$scope.form = data
29
+			$scope.temperature = data.tTestdata
29
 		}, function(data){
30
 		}, function(data){
30
 			console.log(data);
31
 			console.log(data);
31
 		})
32
 		})
@@ -84,7 +85,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
84
 				$scope.temperature = arr
85
 				$scope.temperature = arr
85
 				var arr2 = []
86
 				var arr2 = []
86
 				for (var i = 0; i < arr.length; i++) {
87
 				for (var i = 0; i < arr.length; i++) {
87
-					var e = data[i];
88
+					var e = arr[i];
88
 					arr2.push({
89
 					arr2.push({
89
 						ycqklx: '',
90
 						ycqklx: '',
90
 						ycqkbw: '',
91
 						ycqkbw: '',