Inicio Explorar Ayuda
Registro Iniciar sesión
Chengfei_LiTiKu
/
eam-offline-app
5
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

增加使用安卓js获取服务器地址

liuyanpeng hace 5 meses
padre
de02edb6db
commit
e994f720e8
Se han modificado 9 ficheros con 96 adiciones y 28 borrados
Unificar vista Mostrar estadísticas de diff
  1. 10 0
      static-eam-app/app.html
  2. 19 0
      static-eam-app/js/UrlApi.js
  3. 2 2
      static-eam-app/js/common.js
  4. 2 1
      static-eam-app/pages/check/AssetInventoryCheck.html
  5. 3 1
      static-eam-app/pages/check/AssetInventorySelect.html
  6. 32 12
      static-eam-app/pages/check/DataSync.html
  7. 8 0
      static-eam-app/pages/check/DataSync.js
  8. 11 10
      static-eam-app/pages/check/Menu.html
  9. 9 2
      static-eam-app/pages/check/Menu.js

+ 10 - 0
static-eam-app/index.html → static-eam-app/app.html
Ver fichero 

@@ -31,6 +31,7 @@
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
 
 
+    <script type="text/javascript" src="./js/UrlApi.js"></script>
 
     <script
 
     <script
 
       src="./js/loading.js"
 
       src="./js/loading.js"
 
       type="text/javascript"
 
       type="text/javascript"
 
@@ -70,6 +71,7 @@
 
     <script src="./js/uuid.js" type="text/javascript" charset="utf-8"></script>
 
     <script src="./js/uuid.js" type="text/javascript" charset="utf-8"></script>
 
     <script type="text/javascript" src="./js/RfidMiddlewareApi.js"></script>
 
     <script type="text/javascript" src="./js/RfidMiddlewareApi.js"></script>
 
     <script type="text/javascript" src="./js/ZXingScannerApi.js"></script>
 
     <script type="text/javascript" src="./js/ZXingScannerApi.js"></script>
 
+    <script type="text/javascript" src="./js/UrlApi.js"></script>
 
     <script
 
     <script
 
       src="./js/vue-tap.js"
 
       src="./js/vue-tap.js"
 
       type="text/javascript"
 
       type="text/javascript"
 
@@ -90,6 +92,14 @@
 
         },
 
         },
 
         mounted: function () {
 
         mounted: function () {
 
           var _self = this;
 
           var _self = this;
 
+          if(!plugin.urlApi.getApiUrl()){
 
+            const ip = Common.getRootPath();
 
+            localStorage.setItem("ipServer", ip);
 
+            console.log(ip)
 
+          } else {
 
+            localStorage.setItem("ipServer", plugin.urlApi.getApiUrl());
 
+          }
 
+          _self.offlineInventory()
 
         },
 
         },
 
       });
 
       });
 
     </script>
 
     </script>

+ 19 - 0
static-eam-app/js/UrlApi.js
Ver fichero 

@@ -0,0 +1,19 @@
 
+if(typeof(plugin) == 'undefined'){
 
+  var plugin = {};
 
+}
 
+
 
+plugin.urlApi = {};
 
+
 
+
 
+/**
 
+ * 获取API的地址
 
+ * @param
 
+ */
 
+plugin.urlApi.getApiUrl = function (){
 
+  console.log('获取API的URL');
 
+  if(typeof(URL_API) == 'undefined'){
 
+    console.log('设备不支持获取URL_API功能。');
 
+  }else{
 
+    return URL_API.getApiUrl();
 
+  }
 
+};

+ 2 - 2
static-eam-app/js/common.js
Ver fichero 

@@ -275,7 +275,7 @@ Common.getRootPath = function () {
 
  * 获取IP地址
 
  * 获取IP地址
 
  */
 
  */
 
 Common.getIp = function () {
 
 Common.getIp = function () {
 
-	return this.getRootPath();
 
+	return localStorage.getItem("ipServer");
 
 }
 
 }
 
 
 
 // 文件服务器
 
 // 文件服务器
 
@@ -289,7 +289,7 @@ Common.getFileServerUrl = function (api) {
 
 	 */
 
 	 */
 
 	Common.getApi = function (api) {
 
 	Common.getApi = function (api) {
 
 		// return 'http://192.168.1.107:10026' + api;
 
 		// return 'http://192.168.1.107:10026' + api;
 
-		return Common.getRootPath() + api;
 
+		return localStorage.getItem("ipServer") + api;
 
 	}
 
 	}
 
 
 
 Common.getUrlApi = function (api) {
 
 Common.getUrlApi = function (api) {

+ 2 - 1
static-eam-app/pages/check/AssetInventoryCheck.html
Ver fichero 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+<!doctype html>
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
@@ -377,6 +377,7 @@
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
 
 
+    <script type="text/javascript" src="../../js/UrlApi.js"></script>
 
     <script
 
     <script
 
       src="../../js/jquery-2.2.0.min.js"
 
       src="../../js/jquery-2.2.0.min.js"
 
       type="text/javascript"
 
       type="text/javascript"

+ 3 - 1
static-eam-app/pages/check/AssetInventorySelect.html
Ver fichero 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+<!doctype html>
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
@@ -13,6 +13,8 @@
 
     <link rel="stylesheet" href="../../js/vant@2.12/index.css" />
 
     <link rel="stylesheet" href="../../js/vant@2.12/index.css" />
 
     <script src="../../js/vant@2.12/vue.js"></script>
 
     <script src="../../js/vant@2.12/vue.js"></script>
 
     <script src="../../js/vant@2.12/vant.js"></script>
 
     <script src="../../js/vant@2.12/vant.js"></script>
 
+    <script type="text/javascript" src="../../js/UrlApi.js"></script>
 
+
 
 
 
     <style>
 
     <style>
 
       /* 防止Vue模板闪烁 */
 
       /* 防止Vue模板闪烁 */

+ 32 - 12
static-eam-app/pages/check/DataSync.html
Ver fichero 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+<!doctype html>
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
@@ -524,9 +524,9 @@
 
                 <div>暂无上传任务</div>
 
                 <div>暂无上传任务</div>
 
               </div>
 
               </div>
 
               <div v-else>
 
               <div v-else>
 
-                <div 
-                  v-for="task in uploadTasks" 
-                  :key="task.id" 
+                <div
 
+                  v-for="task in uploadTasks"
 
+                  :key="task.id"
 
                   class="status-item"
 
                   class="status-item"
 
                   :class="{ 'error': task.status === 'error' }"
 
                   :class="{ 'error': task.status === 'error' }"
 
                 >
 
                 >
 
@@ -548,9 +548,14 @@
 
                       color="#1890ff"
 
                       color="#1890ff"
 
                       size="20px"
 
                       size="20px"
 
                     />
 
                     />
 
-                    <van-icon v-else name="clock-o" color="#c8c9cc" size="20px" />
 
-                </div>
 
-                <span class="status-item-name">{{ task.taskName }}</span>
 
+                    <van-icon
 
+                      v-else
 
+                      name="clock-o"
 
+                      color="#c8c9cc"
 
+                      size="20px"
 
+                    />
 
+                  </div>
 
+                  <span class="status-item-name">{{ task.taskName }}</span>
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
             </van-collapse-item>
 
             </van-collapse-item>
 
@@ -591,9 +596,14 @@
 
                       color="#1890ff"
 
                       color="#1890ff"
 
                       size="20px"
 
                       size="20px"
 
                     />
 
                     />
 
-                    <van-icon v-else name="clock-o" color="#c8c9cc" size="20px" />
 
-                </div>
 
-                <span class="status-item-name">{{ task.taskName }}</span>
 
+                    <van-icon
 
+                      v-else
 
+                      name="clock-o"
 
+                      color="#c8c9cc"
 
+                      size="20px"
 
+                    />
 
+                  </div>
 
+                  <span class="status-item-name">{{ task.taskName }}</span>
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
             </van-collapse-item>
 
             </van-collapse-item>
 
@@ -602,7 +612,11 @@
 
       </div>
 
       </div>
 
 
 
       <!-- 登录弹窗 -->
 
       <!-- 登录弹窗 -->
 
-      <div class="login-overlay" :class="{ show: loginShow }" @click="loginShow = false">
 
+      <div
 
+        class="login-overlay"
 
+        :class="{ show: loginShow }"
 
+        @click="loginShow = false"
 
+      >
 
         <div class="login-wrapper" @click.stop>
 
         <div class="login-wrapper" @click.stop>
 
           <div class="login-container">
 
           <div class="login-container">
 
             <div class="login-header">
 
             <div class="login-header">
 
@@ -644,7 +658,12 @@
 
                 <button type="submit" class="login-btn login-btn-primary">
 
                 <button type="submit" class="login-btn login-btn-primary">
 
                   登录
 
                   登录
 
                 </button>
 
                 </button>
 
-                <button type="button" class="login-btn login-btn-default" @click="onCancelLogin" style="margin-top: 10px;">
 
+                <button
 
+                  type="button"
 
+                  class="login-btn login-btn-default"
 
+                  @click="onCancelLogin"
 
+                  style="margin-top: 10px"
 
+                >
 
                   取消
 
                   取消
 
                 </button>
 
                 </button>
 
               </div>
 
               </div>
 
@@ -654,6 +673,7 @@
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
 
 
+    <script type="text/javascript" src="../../js/UrlApi.js"></script>
 
     <script
 
     <script
 
       src="../../js/jquery-2.2.0.min.js"
 
       src="../../js/jquery-2.2.0.min.js"
 
       type="text/javascript"
 
       type="text/javascript"

+ 8 - 0
static-eam-app/pages/check/DataSync.js
Ver fichero 

@@ -871,8 +871,16 @@ var app = new Vue({
 
 
 
 	mounted: function () {
 
 	mounted: function () {
 
 		var _self = this;
 
 		var _self = this;
 
+		if(!plugin.urlApi.getApiUrl()){
 
+            const ip = Common.getRootPath();
 
+            // const ip = 'http://b374733e.natappfree.cc'
 
+            localStorage.setItem("ipServer", ip);
 
+          } else {
 
+            localStorage.setItem("ipServer", plugin.urlApi.getApiUrl());
 
+          }
 
 		_self.initData();
 
 		_self.initData();
 
 		console.log('DataSync页面加载完成');
 
 		console.log('DataSync页面加载完成');
 
+
 
 		
 		
 		// 隐藏页面加载指示器
 
 		// 隐藏页面加载指示器
 
 		setTimeout(function() {
 
 		setTimeout(function() {

+ 11 - 10
static-eam-app/pages/check/Menu.html
Ver fichero 

@@ -1,4 +1,4 @@
 
-<!DOCTYPE html>
 
+<!doctype html>
 
 <html>
 
 <html>
 
   <head>
 
   <head>
 
     <meta charset="utf-8" />
 
     <meta charset="utf-8" />
 
@@ -11,16 +11,16 @@
 
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
 
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
 
 
 
     <link rel="stylesheet" href="../../js/vant@2.12/index.css" />
 
     <link rel="stylesheet" href="../../js/vant@2.12/index.css" />
 
-    
+
 
     <!-- 预加载共享资源 -->
 
     <!-- 预加载共享资源 -->
 
-    <link rel="preload" href="../../js/vant@2.12/vue.js" as="script">
 
-    <link rel="preload" href="../../js/vant@2.12/vant.js" as="script">
 
-    <link rel="preload" href="../../js/jquery-2.2.0.min.js" as="script">
 
-    <link rel="preload" href="../../js/promise.min.js" as="script">
 
-    <link rel="preload" href="../../js/common.js" as="script">
 
-    <link rel="preload" href="../../js/IndexDbFactory.js" as="script">
 
-    <link rel="preload" href="../../js/RfidMiddlewareApi.js" as="script">
 
-    
+    <link rel="preload" href="../../js/vant@2.12/vue.js" as="script" />
 
+    <link rel="preload" href="../../js/vant@2.12/vant.js" as="script" />
 
+    <link rel="preload" href="../../js/jquery-2.2.0.min.js" as="script" />
 
+    <link rel="preload" href="../../js/promise.min.js" as="script" />
 
+    <link rel="preload" href="../../js/common.js" as="script" />
 
+    <link rel="preload" href="../../js/IndexDbFactory.js" as="script" />
 
+    <link rel="preload" href="../../js/RfidMiddlewareApi.js" as="script" />
 
+
 
     <script src="../../js/vant@2.12/vue.js"></script>
 
     <script src="../../js/vant@2.12/vue.js"></script>
 
     <script src="../../js/vant@2.12/vant.js"></script>
 
     <script src="../../js/vant@2.12/vant.js"></script>
 
 
 
@@ -255,6 +255,7 @@
 
       </div>
 
       </div>
 
     </div>
 
     </div>
 
 
 
+    <script type="text/javascript" src="../../js/UrlApi.js"></script>
 
     <script
 
     <script
 
       src="../../js/jquery-2.2.0.min.js"
 
       src="../../js/jquery-2.2.0.min.js"
 
       type="text/javascript"
 
       type="text/javascript"

+ 9 - 2
static-eam-app/pages/check/Menu.js
Ver fichero 

@@ -20,7 +20,7 @@ var app = new Vue({
 
 		 */
 
 		 */
 
 		goToSync: function () {
 
 		goToSync: function () {
 
 			var _self = this;
 
 			var _self = this;
 
-			
+
 
 			// 显示加载提示
 
 			// 显示加载提示
 
 			vant.Toast.loading({
 
 			vant.Toast.loading({
 
 				message: '加载中...',
 
 				message: '加载中...',
 
@@ -39,7 +39,7 @@ var app = new Vue({
 
 		 */
 
 		 */
 
 		goToInventory: function () {
 
 		goToInventory: function () {
 
 			var _self = this;
 
 			var _self = this;
 
-			
+
 
 			// 显示加载提示
 
 			// 显示加载提示
 
 			vant.Toast.loading({
 
 			vant.Toast.loading({
 
 				message: '加载中...',
 
 				message: '加载中...',
 
@@ -68,6 +68,13 @@ var app = new Vue({
 
 
 
 	mounted: function () {
 
 	mounted: function () {
 
 		var _self = this;
 
 		var _self = this;
 
+		if (!plugin.urlApi.getApiUrl()) {
 
+			const ip = Common.getRootPath();
 
+			localStorage.setItem("ipServer", ip);
 
+			console.log(ip)
 
+		} else {
 
+			localStorage.setItem("ipServer", plugin.urlApi.getApiUrl());
 
+		}
 
 		_self.init();
 
 		_self.init();
 
 		console.log('Menu页面加载完成');
 
 		console.log('Menu页面加载完成');
 
 	}
 
 	}