From 802943f7e62f583f9415e2893c25347bf3179c3d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 八月 2020 14:14:36 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html               |  269 ++++-------------------------------------------------
 src/main/webapp/static/css/console.css           |   29 -----
 src/main/java/com/zy/core/thread/DevpThread.java |    2 
 3 files changed, 24 insertions(+), 276 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/DevpThread.java b/src/main/java/com/zy/core/thread/DevpThread.java
index f7e1035..fd11333 100644
--- a/src/main/java/com/zy/core/thread/DevpThread.java
+++ b/src/main/java/com/zy/core/thread/DevpThread.java
@@ -56,7 +56,7 @@
                     default:
                         break;
                 }
-                Thread.sleep(500);
+                Thread.sleep(400);
             } catch (Exception e) {
                 e.printStackTrace();
             }
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index c78bc28..e2c90aa 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -118,34 +118,9 @@
 }
 /* 杈撻�佺嚎绗竴鍒� */
 .site-row-1 {
-    left: 100px;
-}
-.site-row-1 .site {
-    width: 100px;
-}
-/* 杈撻�佺嚎绗簩鍒� */
-.site-row-2 {
     left: 200px;
 }
-.site-row-2 .site {
-    width: 100px;
-}
-/* 杈撻�佺嚎绗笁鍒� */
-.site-row-3 {
-    left: 300px;
-    width: 100px;
-}
-.site-row-3 .site {
-    float: left;
-    width: 100px;
-}
-/* 杈撻�佺嚎绗洓鍒� */
-.site-row-4 {
-    left: 400px;
-    width: 100px;
-}
-.site-row-4 .site {
-    float: right;
+.site-row-1 .site {
     width: 100px;
 }
 
@@ -191,7 +166,7 @@
 /* ------------------ 璐ф灦鎬绘垚 ------------------ */
 .main-part {
     position: absolute;
-    top: 250px;
+    top: 100px;
     left: 300px;
 }
 .main-part .lane {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7a7e438..2124b17 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -86,197 +86,23 @@
 
 
     <!-- 宸﹁緭閫佺嚎 -->
-    <!-- 绗竴鍒楋紙瀹藉害 100px锛�-->
+    <!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
     <div class="site-row site-row-1">
-        <div id="site-1" class="site" style="width: 80px; height: 50px;line-height: 50px">1[9999]</div>
-        <div id="site-2" class="site" >2</div>
-        <div id="site-3" class="site" style="width: 80px; height: 30px;line-height: 30px">3</div>
-        <div id="site-4" class="site" style="width: 80px; height: 60px;line-height: 60px">4</div>
-        <div id="site-5" class="site" style="width: 80px; height: 50px;line-height: 50px">5</div>
-        <div id="site-6" class="site" >6</div>
-        <div id="site-7" class="site" style="width: 80px; height: 68px;line-height: 68px">7</div>
-        <div id="site-8" class="site" style="width: 80px; height: 42px;line-height: 40px">8</div>
-        <div id="site-9" class="site" >9</div>
-    </div>
-    <!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
-    <div class="site-row site-row-2">
-        <div id="site-32" class="site" style="width: 80px; height: 50px;line-height: 50px">32</div>
-        <div id="site-31" class="site" >31</div>
-        <div id="site-30" class="site" style="width: 80px; height: 30px;line-height: 30px;">30</div>
-        <div id="site-23" class="site" >23</div>
-        <div id="site-22" class="site" style="width: 80px; height: 50px;line-height: 50px">22</div>
-        <div id="site-20" class="site" >20</div>
-        <div id="site-19" class="site" style="width: 80px;">19</div>
-        <div id="site-17" class="site" >17</div>
-        <div id="site-16" class="site" style="width: 80px; height: 35px;line-height: 35px">16</div>
-        <div id="site-15" class="site" style="width: 80px; height: 35px;line-height: 35px">15</div>
-        <div id="site-13" class="site" >13</div>
-        <div id="site-12" class="site" style="width: 80px;">12</div>
-        <div id="site-10" class="site" >10</div>
-    </div>
-    <!-- 绗笁鍒楋紙瀹藉害 100px锛�-->
-    <div class="site-row site-row-3">
-        <div class="site-none" style="width: 80px; height: 50px;line-height: 50px"></div>
-        <div id="site-29" class="site" style="width: 50px;">29</div>
-        <div id="site-28" class="site" style="width: 50px;">28</div>
-        <div class="site-none" style="width: 80px; height: 50px;line-height: 30px"></div>
-        <div id="site-24" class="site" >24</div>
-    </div>
-    <!-- 绗洓鍒楋紙瀹藉害 100px锛�-->
-    <div class="site-row site-row-4">
-        <div class="site-none" style="width: 80px; height: 50px;line-height: 50px"></div>
-        <div id="site-27" class="site" >27</div>
-        <div id="site-26" class="site" style="width: 80px; height: 30px;line-height: 30px">26</div>
-        <div id="site-25" class="site" >25</div>
+        <div id="site-7" class="site" style="height: 40px;line-height: 40px">7</div>
+        <div id="site-4" class="site" style="height: 40px;line-height: 40px">4</div>
+        <div id="site-3" class="site" style="height: 40px;line-height: 40px;">3</div>
+        <div id="site-2" class="site" style="height: 40px;line-height: 40px">2</div>
+        <div id="site-1" class="site" style="height: 40px;line-height: 40px">1</div>
     </div>
 
     <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
     <div class="main-part">
-        <!--绗簩鎺�-->
-        <div class="lane">
-            <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>
-                <button class="item">4</button>
-                <button class="item">5</button>
-                <button class="item">6</button>
-                <button class="item">7</button>
-                <button class="item">8</button>
-                <button class="item">9</button>
-                <button class="item">10</button>
-                <button class="item">11</button>
-                <button class="item">12</button>
-                <button class="item">13</button>
-                <button class="item">14</button>
-                <button class="item">15</button>
-                <button class="item">16</button>
-                <button class="item">17</button>
-                <button class="item">18</button>
-                <button class="item">19</button>
-                <button class="item">20</button>
-                <button class="item">21</button>
-                <button class="item">22</button>
-                <button class="item">23</button>
-                <button class="item">24</button>
-                <button class="item">25</button>
-                <button class="item">26</button>
-                <button class="item">27</button>
-                <button class="item">28</button>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            </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>
-                <button class="item">4</button>
-                <button class="item">5</button>
-                <button class="item">6</button>
-                <button class="item">7</button>
-                <button class="item">8</button>
-                <button class="item">9</button>
-                <button class="item">10</button>
-                <button class="item">11</button>
-                <button class="item">12</button>
-                <button class="item">13</button>
-                <button class="item">14</button>
-                <button class="item">15</button>
-                <button class="item">16</button>
-                <button class="item">17</button>
-                <button class="item">18</button>
-                <button class="item">19</button>
-                <button class="item">20</button>
-                <button class="item">21</button>
-                <button class="item">22</button>
-                <button class="item">23</button>
-                <button class="item">24</button>
-                <button class="item">25</button>
-                <button class="item">26</button>
-                <button class="item">27</button>
-                <button class="item">28</button>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            </div>
-            <!-- 鍫嗗灈鏈� -->
-            <div class="crn">
-                <hr class="pathway">
-                <div id="crn-2" class="machine"></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>
-                <button class="item">4</button>
-                <button class="item">5</button>
-                <button class="item">6</button>
-                <button class="item">7</button>
-                <button class="item">8</button>
-                <button class="item">9</button>
-                <button class="item">10</button>
-                <button class="item">11</button>
-                <button class="item">12</button>
-                <button class="item">13</button>
-                <button class="item">14</button>
-                <button class="item">15</button>
-                <button class="item">16</button>
-                <button class="item">17</button>
-                <button class="item">18</button>
-                <button class="item">19</button>
-                <button class="item">20</button>
-                <button class="item">21</button>
-                <button class="item">22</button>
-                <button class="item">23</button>
-                <button class="item">24</button>
-                <button class="item">25</button>
-                <button class="item">26</button>
-                <button class="item">27</button>
-                <button class="item">28</button>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            </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>
-                <button class="item">4</button>
-                <button class="item">5</button>
-                <button class="item">6</button>
-                <button class="item">7</button>
-                <button class="item">8</button>
-                <button class="item">9</button>
-                <button class="item">10</button>
-                <button class="item">11</button>
-                <button class="item">12</button>
-                <button class="item">13</button>
-                <button class="item">14</button>
-                <button class="item">15</button>
-                <button class="item">16</button>
-                <button class="item">17</button>
-                <button class="item">18</button>
-                <button class="item">19</button>
-                <button class="item">20</button>
-                <button class="item">21</button>
-                <button class="item">22</button>
-                <button class="item">23</button>
-                <button class="item">24</button>
-                <button class="item">25</button>
-                <button class="item">26</button>
-                <button class="item">27</button>
-                <button class="item">28</button>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            </div>
-        </div>
-
         <!--绗竴鎺�-->
         <div class="lane">
+            <span class="row-no">1#</span>
             <!-- 璐ф灦 -->
             <div class="stock-group">
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+                <div id="site-6" class="site" style="">6</div>
                 <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
@@ -305,38 +131,12 @@
                 <button class="item">26</button>
                 <button class="item">27</button>
                 <button class="item">28</button>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            </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>
-                <button class="item">4</button>
-                <button class="item">5</button>
-                <button class="item">6</button>
-                <button class="item">7</button>
-                <button class="item">8</button>
-                <button class="item">9</button>
-                <button class="item">10</button>
-                <button class="item">11</button>
-                <button class="item">12</button>
-                <button class="item">13</button>
-                <button class="item">14</button>
-                <button class="item">15</button>
-                <button class="item">16</button>
-                <button class="item">17</button>
-                <button class="item">18</button>
-                <button class="item">19</button>
-                <button class="item">20</button>
-                <button class="item">21</button>
-                <button class="item">22</button>
-                <button class="item">23</button>
-                <button class="item">24</button>
-                <button class="item">25</button>
-                <button class="item">26</button>
-                <button class="item">27</button>
-                <button class="item">28</button>
+                <button class="item">29</button>
+                <button class="item">30</button>
+                <button class="item">31</button>
+                <button class="item">32</button>
+                <button class="item">33</button>
+                <button class="item">34</button>
                 <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             </div>
             <!-- 鍫嗗灈鏈� -->
@@ -346,7 +146,7 @@
             </div>
             <!-- 璐ф灦 -->
             <div class="stock-group">
-                <div id="site-11" class="site">11</div>
+                <div id="site-5" class="site" style="">5</div>
                 <button class="item">1</button>
                 <button class="item">2</button>
                 <button class="item">3</button>
@@ -375,41 +175,14 @@
                 <button class="item">26</button>
                 <button class="item">27</button>
                 <button class="item">28</button>
+                <button class="item">29</button>
+                <button class="item">30</button>
+                <button class="item">31</button>
+                <button class="item">32</button>
+                <button class="item">33</button>
+                <button class="item">34</button>
                 <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
             </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>
-                <button class="item">4</button>
-                <button class="item">5</button>
-                <button class="item">6</button>
-                <button class="item">7</button>
-                <button class="item">8</button>
-                <button class="item">9</button>
-                <button class="item">10</button>
-                <button class="item">11</button>
-                <button class="item">12</button>
-                <button class="item">13</button>
-                <button class="item">14</button>
-                <button class="item">15</button>
-                <button class="item">16</button>
-                <button class="item">17</button>
-                <button class="item">18</button>
-                <button class="item">19</button>
-                <button class="item">20</button>
-                <button class="item">21</button>
-                <button class="item">22</button>
-                <button class="item">23</button>
-                <button class="item">24</button>
-                <button class="item">25</button>
-                <button class="item">26</button>
-                <button class="item">27</button>
-                <button class="item">28</button>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
-            </div>
-            <span class="row-no">1#</span>
         </div>
     </div>
 </main>

--
Gitblit v1.9.1