From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/views/pda/index.html |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index a2cfd52..5d6dfa5 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -77,39 +77,67 @@
         }
 
         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>
 
 <!-- 瀵艰埅鑿滃崟 -->
-<table id="navList" style="width: 100%; border-color: #e6e6e6" border="1" cellspacing="1">
+<table id="navList" style="width: 100%; border-color: #e6e6e6;" border="0" cellspacing="2">
     <tr>
         <td>
-            <a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a>
+            <div id="combAgv" onclick="nav(this.id)" class="nav-font-size">灏忚溅缁勬墭鍏ュ簱</div>
         </td>
         <td>
-            <a id="combPro" onclick="nav(this.id)" class="nav-unselect" href="#">鍏宠仈缁勬墭</a>
+            <div id="combProAgv" onclick="nav(this.id)" class="nav-font-size">灏忚溅鍏宠仈缁勬墭</div>
         </td>
     </tr>
     <tr>
         <td>
-            <a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a>
+            <div id="comb" onclick="nav(this.id)" class="nav-font-size">绔嬪簱缁勬墭鍏ュ簱</div>
         </td>
         <td>
-            <a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a>
+            <div id="combPro" onclick="nav(this.id)" style="font-size: 15px">绔嬪簱浠诲姟鍗曞叆搴�</div>
         </td>
     </tr>
     <tr>
         <td>
-            <a id="locNormalIn" onclick="nav(this.id)" class="nav-unselect" href="#">骞充粨鍏ュ簱</a>
+            <div id="stockIn" onclick="nav(this.id)" class="nav-font-size">绔嬪簱閰嶄欢鍏ュ簱</div>
         </td>
         <td>
-            <a id="locNormalOut" onclick="nav(this.id)" class="nav-unselect" href="#">骞充粨鍑哄簱</a>
+            <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>
@@ -122,9 +150,16 @@
 <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');
     }

--
Gitblit v1.9.1