add

yanshi/config.xml

@@ -1,47 +1,49 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <widget id="com.ionicframework.myapp576034" version="0.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>myApp</name>
-    <description>
+  <name>移动数据应用系统</name>
+  <description>
         An Ionic Framework and Cordova project.
     </description>
-    <author email="you@example.com" href="http://example.com/">
+  <author email="you@example.com" href="http://example.com/">
       Your Name Here
     </author>
-    <content src="index.html" />
-    <access origin="*" />
-    <preference name="webviewbounce" value="false" />
-    <preference name="UIWebViewBounce" value="false" />
-    <preference name="DisallowOverscroll" value="true" />
-    <preference name="SplashScreenDelay" value="2000" />
-    <preference name="FadeSplashScreenDuration" value="2000" />
-    <preference name="android-minSdkVersion" value="16" />
-    <preference name="BackupWebStorage" value="none" />
-    <preference name="SplashScreen" value="screen" />
-    <feature name="StatusBar">
-        <param name="ios-package" onload="true" value="CDVStatusBar" />
-    </feature>
-    <platform name="android">
-        <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
-        <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
-        <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png" />
-        <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png" />
-        <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png" />
-        <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
-        <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
-        <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
-        <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
-        <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
-        <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
-        <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
-        <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
-        <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
-        <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
-        <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
-        <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
-        <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
-    </platform>
-    <plugin name="cordova-plugin-device" spec="~1.1.4" />
-    <chcp>
-        <config-file url="http://w24.9026.com/chcp.json"/>
-    </chcp>
-</widget>
+  <content src="index.html"/>
+  <access origin="*"/>
+  <allow-navigation href="*"/>
+  <allow-intent href="*"/>
+  <preference name="webviewbounce" value="false"/>
+  <preference name="UIWebViewBounce" value="false"/>
+  <preference name="DisallowOverscroll" value="true"/>
+  <preference name="SplashScreenDelay" value="2000"/>
+  <preference name="FadeSplashScreenDuration" value="2000"/>
+  <preference name="android-minSdkVersion" value="16"/>
+  <preference name="BackupWebStorage" value="none"/>
+  <preference name="SplashScreen" value="screen"/>
+  <feature name="StatusBar">
+    <param name="ios-package" onload="true" value="CDVStatusBar"/>
+  </feature>
+  <platform name="android">
+    <icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png"/>
+    <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png"/>
+    <icon density="hdpi" src="resources/android/icon/drawable-hdpi-icon.png"/>
+    <icon density="xhdpi" src="resources/android/icon/drawable-xhdpi-icon.png"/>
+    <icon density="xxhdpi" src="resources/android/icon/drawable-xxhdpi-icon.png"/>
+    <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png"/>
+    <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png"/>
+    <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png"/>
+    <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png"/>
+    <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png"/>
+    <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png"/>
+    <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png"/>
+    <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png"/>
+    <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png"/>
+    <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png"/>
+    <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png"/>
+    <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png"/>
+    <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png"/>
+  </platform>
+  <plugin name="cordova-plugin-device" spec="~1.1.4"/>
+  <chcp>
+    <config-file url="http://w24.9026.com/chcp.json"/>
+  </chcp>
+</widget>

yanshi/www/css/style.css

@@ -8,9 +8,9 @@
       }
       
       ul{
-      	width: 80%;
+      	width: 90%;
       	margin: 0 auto ;
-      	font-size: 22px;
+      	font-size: 10px;
       }
        ul:nth-child(3){
       	height: 120px;
@@ -29,8 +29,8 @@
  	text-align: center;
  	border: 1px solid black;
  	float: left;
- 	height: 30px;
- 	line-height: 30px;
+ 	height: 16px;
+ 	line-height: 16px;
  }
   li:nth-child(4n-3){
   	font-weight: bold;
@@ -47,15 +47,15 @@
   	width: 10%;
   } 
   .line{
-  	width: 80%;
-  	line-height: 30px;
-  	font-size: 22px;
+  	width: 90%;
+  	line-height: 23px;
+  	font-size: 18px;
   	text-align: center;
-  	height: 30px;
+  	height: 23px;
   	background: pink;
   	border: 1px solid black;
   	margin: 0 auto;
     float: left;
-    margin-left: 108px;
+    margin-left: 5%;
   }
 

yanshi/www/index.html

@@ -8,25 +8,22 @@
 		<link href="lib/ionic-material/dist/ionic.material.min.css" rel="stylesheet" />
 	    <link href="lib/ionic/css/ionic.css" rel="stylesheet">
 	    <link href="css/style.css" rel="stylesheet">
-	
-		<script src="https://a.alipayobjects.com/g/datavis/g2/2.2.3/g2.js"></script>
+		
+		 <!-- ionic/angularjs js -->
+		<script src="lib/ionic/js/ionic.bundle.js"></script>
+		<script src="js/echarts.min.js"></script>
+		<!-- cordova script (this will be a 404 during development) -->
+		<script src="cordova.js"></script>
+		<!-- your app's js -->
+		<script src="js/config.js"></script>
+		<script src="js/app.js"></script>
+		<script src="js/controllers.js"></script>
 
-	 
 	</head>		
 		<body ng-app="starter">
 		    <ion-nav-view></ion-nav-view>
 		</body>
 </html>
-	<!-- ionic/angularjs js -->
-	<script src="lib/ionic/js/ionic.bundle.js"></script>
-	<script src="js/echarts.min.js"></script>
-	<!-- cordova script (this will be a 404 during development) -->
-	<script src="cordova.js"></script>
-	<!-- your app's js -->
-	<script src="js/config.js"></script>
-	<script src="js/app.js"></script>
-	<script src="js/controllers.js"></script>
-
-	<script src="https://a.alipayobjects.com/g/datavis/g2/2.2.3/g2.js"></script>
+	
 
 

yanshi/www/js/controllers.js

@@ -16,8 +16,8 @@ starter.controller('loginCtrl',["$scope",'$state','$ionicLoading','$timeout','$i
 	         },1500);	
 		}else{
 			var alertPopup = $ionicPopup.alert({
-            title: '账号密码不正确',
-            template: '唯一账号密码:admin！！！',
+            title: '错误！',
+            template: '账号或密码输入错误！',
             buttons: [
 		       {
 		         text: '<b>确定</b>',
@@ -236,7 +236,7 @@ starter.controller('showCtrl',["$scope",'$ionicHistory','$state','$timeout','$st
 	{"title":"主页","url":"line.html"},
 	{"title":"TN曲线","url":"tn.html"},
 	{"title":"五轴图","url":"zhou.html"},
-	{"title":"效率云图","url":"strom.html"}];
+	{"title":"耐久测试","url":"strom.html"}];
 	
 	$scope.currentTab = 'line.html';
 	$scope.go = function(result){
@@ -280,7 +280,7 @@ starter.directive('main', function() {
             data2: "="  
         },  
         restrict: 'E',  
-        template: '<div style="height:700px;"></div>',  
+        template: '<div style="height:300px;"></div>',  
         replace: true,  
         link: function($scope, element, attrs, controller) { 
         	var colors = ['#a62ca6', '#8e0515', '#45baf3','#ff2420','#1a9a1a'];
@@ -292,15 +292,15 @@ starter.directive('main', function() {
                     trigger: 'axis'  
                 },  
                 grid:{
-
-                	left:'23%'
+                	left:'43%',
+                	right:'1%'
                 },
-             
                    	//图例  
                 legend: {  
+                	top:15,
                     data: $scope.legend1,
                     textStyle:{
-                    	fontSize:22
+                    	fontSize:12
                     }
                 }, 
                 // 横轴坐标轴  
@@ -310,7 +310,7 @@ starter.directive('main', function() {
 //			            boundaryGap:false,
 			            axisLabel:{
 		            		textStyle:{
-		            		fontSize:20
+		            		fontSize:12
 		            	},
 		            		formatter: '{value} rpm'
 		            },
@@ -326,7 +326,7 @@ starter.directive('main', function() {
 		            min: 0,
 		            max: 4,
 		            position: 'left',
-		            offset:205,
+		            offset:135,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[0],
@@ -334,9 +334,8 @@ starter.directive('main', function() {
 		                }
 		            },
 		            axisLabel:{
-		            	margin:20,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            }
 		        },
@@ -346,7 +345,7 @@ starter.directive('main', function() {
 		            min: 193,
 		            max: 202,
 		            position: 'left',
-		            offset: 150,
+		            offset: 100,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[1],
@@ -354,9 +353,8 @@ starter.directive('main', function() {
 		                }
 		            },
 		             axisLabel:{
-		             	margin:15,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
@@ -366,7 +364,7 @@ starter.directive('main', function() {
 		            min: 0,
 		            max: 1300,
 		            position: 'left',
-		            offset:90,
+		            offset:57,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[2],
@@ -375,7 +373,7 @@ starter.directive('main', function() {
 		            },
 		             axisLabel:{
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
@@ -385,7 +383,7 @@ starter.directive('main', function() {
 		            min: 1,
 		            max: 6,
 		            position: 'left',
-		            offset:45,
+		            offset:35,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[3],
@@ -393,9 +391,8 @@ starter.directive('main', function() {
 		                }
 		            },
 		       		  axisLabel:{
-		       		  	margin:20,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
@@ -413,9 +410,8 @@ starter.directive('main', function() {
 		                }
 		            },
 		              axisLabel:{
-		              	margin:15,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        }
@@ -450,7 +446,7 @@ starter.directive('line', function() {
             data3: "="  
         },  
         restrict: 'E',  
-        template: '<div style="height:700px;"></div>',  
+        template: '<div style="height:300px;"></div>',  
         replace: true,  
         link: function($scope, element, attrs, controller) { 
         	var colors = ['#a62ca6', '#8e0515', '#45baf3','#ff2420','#1a9a1a'];
@@ -462,14 +458,15 @@ starter.directive('line', function() {
                     trigger: 'axis'  
                 },  
                 grid:{
-
-                	left:'26%'
+                	left:'50%',
+                	right:'1%'
                 },
                    	//图例  
                 legend: {  
+                	top:15,
                     data: $scope.legend2,
                     textStyle:{
-                    	fontSize:22
+                    	fontSize:12
                     }
                 }, 
 //              toolbox: {
@@ -486,7 +483,7 @@ starter.directive('line', function() {
 //			            boundaryGap:false,
 			            axisLabel:{
 		            		textStyle:{
-		            		fontSize:20
+		            		fontSize:12
 		            	},
 		            	formatter: '{value} N*m'
 		            },
@@ -502,7 +499,7 @@ starter.directive('line', function() {
 		            min: 0.27,
 		            max: 0.7,
 		            position: 'left',
-		            offset:225,
+		            offset:150,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[0],
@@ -510,9 +507,8 @@ starter.directive('line', function() {
 		                }
 		            },
 		            axisLabel:{
-		            	margin:20,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            }
 		        },
@@ -522,17 +518,16 @@ starter.directive('line', function() {
 		            min: 130,
 		            max: 630,
 		            position: 'left',
-		            offset: 170,
+		            offset: 110,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[1],
 		                    width:2
 		                }
 		            },
-		             axisLabel:{
-		             	margin:15,
+		             axisLabel:{ 
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
@@ -542,7 +537,7 @@ starter.directive('line', function() {
 		            min: 64,
 		            max: 77,
 		            position: 'left',
-		            offset:125,
+		            offset:80,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[2],
@@ -551,7 +546,7 @@ starter.directive('line', function() {
 		            },
 		             axisLabel:{
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
@@ -561,7 +556,7 @@ starter.directive('line', function() {
 		            min: 2600,
 		            max: 2940,
 		            position: 'left',
-		            offset:50,
+		            offset:30,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[3],
@@ -569,9 +564,8 @@ starter.directive('line', function() {
 		                }
 		            },
 		       		  axisLabel:{
-		       		  	margin:20,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
@@ -589,9 +583,8 @@ starter.directive('line', function() {
 		                }
 		            },
 		              axisLabel:{
-		              	margin:15,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        }
@@ -628,7 +621,7 @@ starter.directive('strom', function() {
             data4: "="  
         },  
         restrict: 'E',  
-        template: '<div style="height:700px;"></div>',  
+        template: '<div style="height:300px;"></div>',  
         replace: true,  
         link: function($scope, element, attrs, controller) { 
         	var colors = ['#a62ca6', '#8e0515', '#45baf3','#ff2420','#1a9a1a'];
@@ -640,15 +633,15 @@ starter.directive('strom', function() {
                     trigger: 'axis'  
                 },  
                 grid:{
-
-                	left:'23%'
+                	left:'43%',
+                	right:'1%'
                 },
-             
                    	//图例  
                 legend: {  
+                	top:15,
                     data: $scope.legend3,
                     textStyle:{
-                    	fontSize:22
+                    	fontSize:12
                     }
                 }, 
                 // 横轴坐标轴  
@@ -658,7 +651,7 @@ starter.directive('strom', function() {
 //			            boundaryGap:false,
 			            axisLabel:{
 		            		textStyle:{
-		            		fontSize:20
+		            		fontSize:12
 		            	},
 		            		formatter: '{value} rpm'
 		            },
@@ -671,10 +664,8 @@ starter.directive('strom', function() {
 		        {
 		            type: 'value',
 //		            name: '扭\n矩\n(N*m)',
-		            min: 0,
-		            max: 4,
 		            position: 'left',
-		            offset:205,
+		            offset:125,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[0],
@@ -682,19 +673,16 @@ starter.directive('strom', function() {
 		                }
 		            },
 		            axisLabel:{
-		            	margin:20,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            }
 		        },
 		        {
 		            type: 'value',
 //		            name: '电\n压\n(V)',
-		            min: 193,
-		            max: 202,
 		            position: 'left',
-		            offset: 150,
+		            offset: 90,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[1],
@@ -702,19 +690,16 @@ starter.directive('strom', function() {
 		                }
 		            },
 		             axisLabel:{
-		             	margin:15,
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
 		        {
 		            type: 'value',
 //		            name: '输\n入\n功\n率\n(W)',
-		            min: 0,
-		            max: 1300,
 		            position: 'left',
-		            offset:90,
+		            offset:50,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[2],
@@ -723,35 +708,30 @@ starter.directive('strom', function() {
 		            },
 		             axisLabel:{
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
 		        {
 		            type: 'value',
 //		            name: '电\n流\n(A)',
-		            min: 1,
-		            max: 6,
 		            position: 'left',
-		            offset:45,
+		            offset:30,
 		            axisLine: {
 		                lineStyle: {
 		                    color: colors[3],
 		                    width:2
 		                }
 		            },
-		       		  axisLabel:{
-		       		  	margin:20,
+		       		  axisLabel:{ 
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        },
 		        {
 		            type: 'value',
 //		            name: '效\n率\n(%)',
-		            min: 10,
-		            max: 80,
 		            position: 'left',
 		            offset:0,
 		            axisLine: {
@@ -760,10 +740,9 @@ starter.directive('strom', function() {
 		                    width:2
 		                }
 		            },
-		              axisLabel:{
-		              	margin:15,
+		              axisLabel:{ 
 		            	textStyle:{
-		            		fontSize:18
+		            		fontSize:12
 		            	}
 		            },
 		        }

yanshi/www/templates/show.html

@@ -13,13 +13,12 @@
 		  	ng-click="onClickTab(tab)">{{tab.title}}
 		  </a>
 		</div>
-	</ion-content>
 	<script id="line.html" type="text/ng-template">
 		
 <!-- 		<select style="display: block; width: 25%;height: 44px;font-size: 24px;" ng-change="change(selectedName)" 
 		ng-model="selectedName" ng-init="selectedName = name" ng-options="x for x in excels">
 		</select> -->
-		<h1 style="text-align: center;font-weight: bold;font-size: 4rem">电机自动化测试报告</h1>
+		<h1 style="text-align: center;font-weight: bold;font-size: 1rem;margin-top:3px ">电机自动化测试报告</h1>
 		<div>
 		<ul>
 			<li>PA设备</li>
@@ -41,23 +40,23 @@
 		</ul></div>
 
 		<div class="line">驱动器设备</div>
-		<div><ul style="margin-bottom: 100px">
+		<div><ul>
 			<li ng-repeat="tab1 in table1 track by $index">{{tab1}}</li>
 			<li></li>
 			<li></li>
 		</ul></div>
 		<div class="line">电机设备</div>
-		<div><ul style="margin-bottom: 100px">
+		<div><ul>
 			<li ng-repeat="tab2 in table2 track by $index">{{tab2}}</li>
 		</ul></div>
 		<div class="line">驱动器设备</div>
-		<div><ul style="margin-bottom: 100px">
+		<div><ul>
 			<li ng-repeat="tab3 in table3 track by $index">{{tab3}}</li>
 			<li></li>
 			<li></li>
 		</ul></div>
 		<div class="line">电机设备</div>
-		<ul style="margin-bottom: 100px">
+		<ul>
 			<li ng-repeat="tab4 in table4 track by $index">{{tab4}}</li>
 		</ul>
 		
@@ -81,6 +80,7 @@
 		<div id="c1"></div>
 	</div> -->
 		
+	</ion-content>
 </ion-view>