From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master

---
 src/main/webapp/views/pda/index.html |  104 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 87 insertions(+), 17 deletions(-)

diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index f015b95..fe264b2 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
@@ -13,10 +13,12 @@
             -webkit-box-sizing: border-box;
             -moz-box-sizing: border-box;
         }
+
         html {
             height: 100%;
             /*line-height: 1.5;*/
         }
+
         body {
             height: 100%;
             /*overflow: hidden;*/
@@ -30,12 +32,14 @@
             position: fixed;
             width: 100%;
             overflow: hidden;
-            box-shadow: 0 1px 2px 0 rgba(0,0,0,.1)
+            box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .1)
         }
+
         .nav li {
             float: left;
             border-right: 1px solid #f1f1f1; /*todo*/
         }
+
         .nav li a {
             font-size: 20px;
             letter-spacing: 1px;
@@ -47,48 +51,114 @@
             /*-webkit-transform:scale(1.5);*/
             /*-moz-transform:scale(1.5);*/
         }
+
         .nav li a:hover {
             color: #000;
         }
+
         .nav-unselect {
-            color: #666;
+            color: blue;
         }
+
         .nav-select {
-            background-color: #f1f1f1;  /*todo*/
-            color: #000;
+            background-color: #f1f1f1; /*todo*/
+            color: blue;
         }
 
         /* 涓讳綋 */
         #content {
-            padding-top: 32px;
+            /*padding-top: 32px;*/
             width: 100%;
             height: 100%;
         }
+
         iframe {
             border-width: 0;
+        }
+
+        td {
+            color: white;
+            background-image: linear-gradient(to top, #09203f 0%, #537895 100%);
+            /*background-color: rgba(204,204,204,.6);*/
+            border-radius: 8px;
+            text-align: center;
+            vertical-align: middle;
+            height: 80px;
+            font-size: 24px;
+        }
+        .nav-font-size {
+            font-size: 18px;
         }
     </style>
 </head>
 <body>
 
-<!-- 瀵艰埅鏍� -->
-<ul class="nav">
-    <li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
-    <li><a id="combPro" onclick="nav(this.id)" class="nav-unselect" href="#">鍏宠仈缁勬墭</a></li>
-    <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>
-    <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>
-</ul>
+<!-- 瀵艰埅鑿滃崟 -->
+<table id="navList" style="width: 100%; border-color: #e6e6e6;" border="0" cellspacing="2">
+    <tr>
+        <td>
+            <div id="comb" onclick="nav(this.id)" class="nav-font-size">绔嬪簱缁勬墭鍏ュ簱</div>
+        </td>
+        <td>
+            <div id="combPro" onclick="nav(this.id)" style="font-size: 15px">绔嬪簱浠诲姟鍗曞叆搴�</div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <div id="stockIn" onclick="nav(this.id)" class="nav-font-size">绔嬪簱閰嶄欢鍏ュ簱</div>
+        </td>
+        <td>
+            <div id="stockOut" onclick="nav(this.id)" class="nav-font-size">绔嬪簱閰嶄欢鍑哄簱</div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <div id="locNormalIn1" onclick="nav(this.id)" class="nav-font-size">骞充粨鏉愭枡鍏ュ簱</div>
+        </td>
+        <td>
+            <div id="locNormalOut1" onclick="nav(this.id)" class="nav-font-size">骞充粨鏉愭枡鍑哄簱</div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <div id="locNormalIn" onclick="nav(this.id)" class="nav-font-size">骞充粨鎴愬搧鍏ュ簱</div>
+        </td>
+        <td>
+            <div id="locNormalOut" onclick="nav(this.id)" class="nav-font-size">骞充粨鎴愬搧鍑哄簱</div>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <div id="locNormalMove" onclick="nav(this.id)" class="nav-font-size">骞充粨鎴愬搧绉诲簱</div>
+        </td>
+    </tr>
+</table>
 
 <!-- 涓讳綋鍐呭 -->
-<iframe id="content" src="comb.html"></iframe>
+<iframe id="content" src=""></iframe>
+
 
 </body>
 <script>
     // 瀵艰埅鏍�
     function nav(id) {
-        $('.nav-select').attr("class", "nav-unselect");
-        $('#'+id).attr("class", "nav-select");
-        $('#content').attr("src", id+".html");
+//        $('.nav-select').attr("class", "nav-unselect");
+//        $('#' + id).attr("class", "nav-select");
+
+        if (id === 'locNormalIn1') {
+            $('#content').attr("src", "locNormalIn.html?areaType=1");
+        } else if (id === 'locNormalOut1') {
+            $('#content').attr("src", "locNormalOut.html?areaType=1");
+        } else {
+            $('#content').attr("src", id + ".html");
+        }
+        $('#navList').css('display', 'none');
+        $('#content').css('display', 'block');
+    }
+
+    function backIndex() {
+        $('#navList').css('display', 'inline-table');
+        $('#content').css('display', 'none');
     }
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1