add

yanshi/www/js/controllers.js

@@ -82,42 +82,6 @@ starter.controller('showCtrl',["$scope",'$ionicHistory','$state','$timeout','$st
     	}).success(function(newItem){
     		$scope.excels = newItem
     	})
-<<<<<<< HEAD
-		$scope.change = function(selectedName){
-			$ionicLoading.show({
-	            template: '加载中...',
-	        });
-	    	$http({
-				method:'get',
-				url:config.server+'/data/'+selectedName
-			}).success(function(req){	
-				$timeout(function() {
-			        $ionicLoading.hide();
-			        //tn曲线图参数
-					$scope.item1= req.speed;
-					$scope.data2 = [req.torque,req.v,req.p,req.a,req.efficiency];
-					//五轴图参数
-					$scope.item2 = req.nj;
-					$scope.data3 = [req.glys,req.ssgl,req.xl,req.zs,req.dl];
-				});
-			}).error(function(){
-				$timeout(function(){
-					$ionicLoading.hide();
-					var alertPopup = $ionicPopup.alert({
-		            title: '连接超时',
-		            buttons: [
-				       {
-				         text: '<b>确定</b>',
-				         type: 'button-calm',
-				       },
-				     ]
-			        });
-				})
-			})
-		}
-=======
-		
->>>>>>> ede8857903a17ac912d5c1ef522cf634ae4c137b
     	name = $stateParams.item;
     	$scope.name = name;
     	$ionicLoading.show({