ga

yanshi/www/index.html

@@ -28,5 +28,5 @@
 	<script src="js/controllers.js"></script>
 
 	<script src="https://a.alipayobjects.com/g/datavis/g2/2.2.3/g2.js"></script>
-	<script src="js/g2.js"></script>
+
 

yanshi/www/js/controllers.js

@@ -106,44 +106,47 @@ starter.controller('showCtrl',["$scope",'$ionicHistory','$state','$timeout','$st
 				$scope.item2 = req.nj;
 				$scope.data3 = [req.glys,req.ssgl,req.xl,req.zs,req.dl];
 				//效率云图
-				$scope.x = req.n_zs;
-				$scope.y = req.n_zj;
-				$scope.z = req.n_xl;
-				console.log(req)
-			});
-		}).error(function(){
-			$timeout(function(){
-				$ionicLoading.hide();
-				var alertPopup = $ionicPopup.alert({
-	            title: '连接超时',
-	            buttons: [
-			       {
-			         text: '<b>确定</b>',
-			         type: 'button-calm',
-			       },
-			     ]
-		        });
-			})
-		})	
-		
-		var Stat = G2.Stat;
-	    var vvvdata = [];
-	    for(var i = 0; i <= 20; i ++) {
-	        for(var j = 0; j <= 20; j ++) {
-	          var x = i*25.6;
-	          var y = j*19.2;
-	          var z = 700-(x+0.5*y)+Math.random()*(400); 
-	          vvvdata.push({
-	            l: x,
-	            g: y,
-	            Altitude: z
-	          });
-	        }
-	    }
+				$scope.a = req.n_zs;
+				$scope.b = req.n_nj;
+				$scope.c = req.n_xl;
+				
+				
+				var Stat = G2.Stat;
+	    		var vvvdata = [];
+//	    for(var i = 0; i <= 20; i ++) {
+//	        for(var j = 0; j <= 20; j ++) {
+//	          var x = i*25.6;
+//	          var y = j*19.2;
+//	          var z = 700-(x+0.5*y)+Math.random()*(400); 
+//	          console.log(x);
+//	          console.log(y);
+//	          console.log(z);
+//	          
+//	        }
+//	    }
+				var data1 = $scope.a;
+				var data2 = $scope.b;
+				var data3 = $scope.c;
+				
+				for(var i=0;i<=212;i++){
+					var x = data1[i];
+					var y = data2[i];
+					var z = data3[i];
+					vvvdata.push({
+			            l:x,
+			            g: y,
+			            Altitude:z
+			        });
+					    console.log(x+'x')
+						console.log(y+'y')
+						console.log(z+'z')
+				}
+				
+	    
       var chart = new G2.Chart({
         id: 'c1',
         forceFit: true,
-        height: 700
+        height: 1000
       });
       //为了将数据与图片上的位置完全吻合，我们需要将横轴和纵轴的范围设定为数据对应范围，并将范围优化处理关闭
       var defs = {
@@ -156,7 +159,7 @@ starter.controller('showCtrl',["$scope",'$ionicHistory','$state','$timeout','$st
         'g': {
           type: 'linear',
           min: 0,
-          max: 384,
+          max: 2,
           nice: false
         },
         'Altitude': {
@@ -168,6 +171,24 @@ starter.controller('showCtrl',["$scope",'$ionicHistory','$state','$timeout','$st
       chart.contour().position(Stat.smooth.loess.triangular('l*g*Altitude',0.01)).color('Altitude','hue').size(3);
       chart.render();
 		document.getElementById('newchats').style.display='none';
+				
+			});
+		}).error(function(){
+			$timeout(function(){
+				$ionicLoading.hide();
+				var alertPopup = $ionicPopup.alert({
+	            title: '连接超时',
+	            buttons: [
+			       {
+			         text: '<b>确定</b>',
+			         type: 'button-calm',
+			       },
+			     ]
+		        });
+			})
+		})	
+		
+		
     });
 
     $scope.change = function(selectedName){