From 5988f8fc27f462c0252198ffbcb8a4980ff4d09e Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期五, 29 五月 2020 13:58:26 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |   71 ++++++++++++++++++++++-------------
 1 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 094f543..29e9ab5 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -10,32 +10,28 @@
     <link rel="stylesheet" type="text/css" href="../static/css/common.css">
     <link rel="stylesheet" type="text/css" href="../static/css/console.css">
     <style>
-        /* 澶撮儴 */
-        header {
-            height: 20%;
-            border: 1px solid red;
-        }
-        /* 涓讳綋 */
-        main {
-            height: 80%;
-            position: relative;
-        }
-
         .main-part {
             position: absolute;
             top: 100px;
             left: 400px;
             /*transform: translate(-50%, 0);*/
         }
-        /* 鍫嗗灈鏈鸿建閬� */
-        .pathway {
-            border: 1px solid #000;
-            position: absolute;
-            background-color:#eee!important;
-            color: #000000 !important;
-            width: 100%;
-            margin-top: 10px;
-            z-index: -1;
+
+        /* 绔欑偣 */
+        .site {
+            cursor: pointer;
+            width: 50px;
+            text-align: center;
+            background-color: #21ff3a;
+            font-size: 13px;
+            float: left;
+        }
+        .site:hover {
+            opacity: 0.7;
+        }
+        /* 鏃犳晥绔欑偣 */
+        .site-none {
+            background-color: transparent;
         }
 
 
@@ -46,15 +42,27 @@
     <span>鎻忚堪淇℃伅</span>
 </header>
 <main>
-    <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱鐐� + 鍑哄簱鐐� -->
+
+    <!-- 宸﹁緭閫佺嚎 -->
+    <div class="line-left">
+        <!-- 绗竴鍒� -->
+        <div class="row-1">
+
+        </div>
+        <!-- 绗簩鍒� -->
+        <div class="row-2">
+
+        </div>
+    </div>
+
+
+    <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
     <div class="main-part">
-
-        <!--杈撻�佺嚎-->
-
         <!--绗竴鎺�-->
-        <span>1#</span>
+        <span class="row-no">1#</span>
         <!-- 璐ф灦 -->
         <div class="stock-group">
+            <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -81,6 +89,7 @@
             <button class="item">24</button>
         </div>
         <div class="stock-group">
+            <div id="site-21" class="site">21</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -109,10 +118,11 @@
         <!-- 鍫嗗灈鏈� -->
         <div class="crn">
             <hr class="pathway">
-            <div class="machine"></div>
+            <div class="machine" style="margin-left: 30px"></div>
         </div>
         <!-- 璐ф灦 -->
         <div class="stock-group">
+            <div id="site-18" class="site">18</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -139,6 +149,7 @@
             <button class="item">24</button>
         </div>
         <div class="stock-group">
+            <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -167,9 +178,10 @@
         <br>
 
         <!--绗簩鎺�-->
-        <span>2#</span>
+        <span class="row-no">2#</span>
         <!-- 璐ф灦 -->
         <div class="stock-group">
+            <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -196,6 +208,7 @@
             <button class="item">24</button>
         </div>
         <div class="stock-group">
+            <div id="site-14" class="site">14</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -228,6 +241,7 @@
         </div>
         <!-- 璐ф灦 -->
         <div class="stock-group">
+            <div id="site-11" class="site">11</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -254,6 +268,7 @@
             <button class="item">24</button>
         </div>
         <div class="stock-group">
+            <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             <button class="item">1</button>
             <button class="item">2</button>
             <button class="item">3</button>
@@ -280,6 +295,8 @@
             <button class="item">24</button>
         </div>
     </div>
+
+    <!-- 鍙宠緭閫佺嚎 -->
 </main>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1