From e020b83fa0f19877991f79b0ca488ee7dfe2938f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 28 一月 2021 13:41:46 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/console.html |  142 +++++++++++++++++++++++------------------------
 1 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index e2436e9..3e3c4ee 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -78,7 +78,9 @@
 
     <!----------- 宸ュ叿鏍� ---------->
     <!-- 鍏ュ簱鍙� -->
-    <div class="cargo-put"></div>
+    <div class="cargo-put-0"></div>
+    <div class="cargo-put-1"></div>
+    <div class="cargo-put-2"></div>
     <!-- 鎵爜鍣� -->
     <div id="code-decoder-1" class="code-decoder">
         <span id="code-decoder-data-1" class="code-decoder-data">0</span>
@@ -153,39 +155,38 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-100" class="site" style="">100</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>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+                <button class="item">34</button>
+                <button class="item">36</button>
+                <button class="item">38</button>
+                <button class="item">40</button>
+                <button class="item">42</button>
+                <button class="item">44</button>
+                <button class="item">46</button>
+                <button class="item">48</button>
+                <button class="item">50</button>
+                <button class="item">52</button>
+                <button class="item">54</button>
+                <button class="item">56</button>
+                <button class="item">58</button>
+                <button class="item">60</button>
+                <button class="item">62</button>
+                <button class="item">64</button>
             </div>
             <!-- 鍫嗗灈鏈� -->
             <div class="crn">
@@ -195,39 +196,38 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-124" class="site" style="">124</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>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+                <button class="item">34</button>
+                <button class="item">36</button>
+                <button class="item">38</button>
+                <button class="item">40</button>
+                <button class="item">42</button>
+                <button class="item">44</button>
+                <button class="item">46</button>
+                <button class="item">48</button>
+                <button class="item">50</button>
+                <button class="item">52</button>
+                <button class="item">54</button>
+                <button class="item">56</button>
+                <button class="item">58</button>
+                <button class="item">60</button>
+                <button class="item">62</button>
+                <button class="item">64</button>
             </div>
             <span class="row-no">5#</span>
         </div>
@@ -237,39 +237,38 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-120" class="site" style="">120</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>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+                <button class="item">34</button>
+                <button class="item">36</button>
+                <button class="item">38</button>
+                <button class="item">40</button>
+                <button class="item">42</button>
+                <button class="item">44</button>
+                <button class="item">46</button>
+                <button class="item">48</button>
+                <button class="item">50</button>
+                <button class="item">52</button>
+                <button class="item">54</button>
+                <button class="item">56</button>
+                <button class="item">58</button>
+                <button class="item">60</button>
+                <button class="item">62</button>
+                <button class="item">64</button>
             </div>
             <!-- 鍫嗗灈鏈� -->
             <div class="crn">
@@ -279,39 +278,38 @@
             <!-- 璐ф灦 -->
             <div class="stock-group">
                 <div id="site-118" class="site" style="">118</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>
-                <div class="site site-none">&nbsp;&nbsp;&nbsp;&nbsp;</div>
+                <button class="item">34</button>
+                <button class="item">36</button>
+                <button class="item">38</button>
+                <button class="item">40</button>
+                <button class="item">42</button>
+                <button class="item">44</button>
+                <button class="item">46</button>
+                <button class="item">48</button>
+                <button class="item">50</button>
+                <button class="item">52</button>
+                <button class="item">54</button>
+                <button class="item">56</button>
+                <button class="item">58</button>
+                <button class="item">60</button>
+                <button class="item">62</button>
+                <button class="item">64</button>
             </div>
             <span class="row-no">1#</span>
         </div>
@@ -658,10 +656,8 @@
                     for (var i = 0; i < crns.length; i++){
                         var crnEl = $("#crn-"+crns[i].crnId);
                         crnEl.attr("class", "machine " + crns[i].crnStatus);
-
-                        var unit = $('.item').eq(0).width()+4;
-                        crnEl.animate({left: (crns[i].bay * unit + 50) +'px'}, 1000);
-                        // crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
+                        var unit = ($('.item').eq(0).width()+4)/2;
+                        crnEl.animate({left: (crns[i].bay * unit) +'px'}, 1000);
                     }
                 } else if (res.code === 403){
                     parent.location.href = baseUrl+"/login";

--
Gitblit v1.9.1