From 85e19cb5f3985a8c756bfd6913d8eb7c0abf23b0 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期二, 30 八月 2022 14:19:33 +0800 Subject: [PATCH] # --- src/main/webapp/views/console.html | 715 ++++++++-------------------------------------------------- 1 files changed, 105 insertions(+), 610 deletions(-) diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index 6f30afb..788e404 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -26,13 +26,6 @@ </div> <!--绗�2鍒�--> <div class="site-row site-row-2"> - <!-- 鍙拌溅杞ㄩ亾 --> - <div id="car-track-1" class="car-track"> - <div></div> - </div> - <!-- 鍙拌溅瀹炰緥 --> - <div id="site-1000" class="site car" style="top: 584px">1000</div> - <div id="site-2000" class="site car" style="top: 0">2000</div> </div> <!-- 绗�3鍒� --> <div class="site-row site-row-3"> @@ -67,9 +60,9 @@ <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 --> <div class="main-part"> - <!-- 绗竴缁� --> - <div class="lane" style="margin-bottom: 280px"> + <div class="lane"> <!-- 璐ф灦 --> + <!-- 1鍙峰爢鍨涙満 --> <div class="stock-group"> <button class="item">1</button> <button class="item">2</button> @@ -96,8 +89,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">32#</span> + <span class="row-no">1#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -125,13 +117,39 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">31#</span> + <span class="row-no">2#</span> </div> - <!-- 3鍙峰爢鍨涙満 --> + <div class="stock-group"> + <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> + <span class="row-no">3#</span> + </div> <div class="crn"> <hr class="pathway"> - <div id="crn-3" class="machine"></div> + <div id="crn-1" class="machine"></div> </div> <!-- 璐ф灦 --> <div class="stock-group"> @@ -160,8 +178,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">30#</span> + <span class="row-no">4#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -189,8 +206,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">29#</span> + <span class="row-no">5#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -218,8 +234,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">28#</span> + <span class="row-no">6#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -247,39 +262,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">27#</span> - </div> - <span class="row-no"></span> - <!-- 璐ф灦 --> - <div class="stock-group"> - <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> - <span class="row-no">26#</span> + <span class="row-no">7#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -307,8 +290,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">25#</span> + <span class="row-no">8#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -336,8 +318,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">24#</span> + <span class="row-no">9#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -365,8 +346,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">23#</span> + <span class="row-no">10#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -394,125 +374,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">22#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">21#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">20#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">19#</span> - </div> - <!-- 璐ф灦 --> - <div class="stock-group"> - <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> - <span class="row-no">18#</span> + <span class="row-no">11#</span> </div> <!-- 鍫嗗灈鏈� --> <div class="crn"> @@ -545,152 +407,6 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">17#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">16#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">15#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">14#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">13#</span> - </div> - <div class="stock-group"> - <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> <span class="row-no">12#</span> </div> <div class="stock-group"> @@ -719,8 +435,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">11#</span> + <span class="row-no">13#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -748,66 +463,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">10#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">9#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">8#</span> + <span class="row-no">14#</span> </div> <span class="row-no"></span> <!-- 璐ф灦 --> @@ -837,8 +493,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">7#</span> + <span class="row-no">15#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -866,8 +521,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">6#</span> + <span class="row-no">16#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -895,8 +549,7 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">5#</span> + <span class="row-no">17#</span> </div> <div class="stock-group"> <button class="item">1</button> @@ -924,71 +577,12 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">4#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">3#</span> - </div> - <div class="stock-group"> - <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> - <span class="row-no">2#</span> + <span class="row-no">18#</span> </div> <!-- 鍫嗗灈鏈� --> <div class="crn"> <hr class="pathway"> - <div id="crn-1" class="machine"></div> + <div id="crn-3" class="machine"></div> </div> <div class="stock-group"> <button class="item">1</button> @@ -1016,8 +610,63 @@ <button class="item">23</button> <button class="item">24</button> <button class="item">25</button> - <button class="item">26</button> - <span class="row-no">1#</span> + <span class="row-no">19#</span> + </div> + <div class="stock-group"> + <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> + <span class="row-no">20#</span> + </div> + <div class="stock-group"> + <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> + <span class="row-no">21#</span> </div> </div> </div> @@ -1382,61 +1031,6 @@ $('#barcode3').append(str3) } } - - // 灏忚溅鍋忕Щ鍔ㄧ敾 - function carAnimate(id, target) { - if (id === 1000) { - let targetTop = 130; - switch (target) { - case 110: - targetTop += 0; - break; - case 109: - targetTop += 60; - break; - case 108: - targetTop += 100; - break; - case 107: - targetTop += 180; - break; - case 106: - targetTop += 220; - break; - default: - return; - } - $("#site-" + id).animate({top: targetTop+'px'}, 1000); - } else if (id === 2000) { - let targetTop = 130; - switch (target) { - case 226: - targetTop += 0; - break; - case 225: - targetTop += 60; - break; - case 224: - targetTop += 100; - break; - case 223: - targetTop += 180; - break; - case 222: - targetTop += 220; - break; - case 214: - targetTop += 280; - break; - case 220: - targetTop += 320; - break; - default: - return; - } - $("#site-" + id).animate({top: targetTop+'px'}, 1000); - } - } </script> <script type="text/javascript"> // 寮圭獥绔欑偣淇℃伅 @@ -1731,104 +1325,5 @@ break } } - - // 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 --------------------------------------------------------- - - // 杈撻�佽澶囩偣鍑讳簨浠� - // $('.site').on('click', function () { - // var id = this.id.split("-")[1]; - // if (id === undefined) { - // return; - // } - // layer.open({ - // title: id + " 绔欑偣淇℃伅璇︽儏", - // closeBtn: 0, - // skin: 'layui-layer-lan', - // offset: '180px', - // type: 1, - // shadeClose: true, - // content: $('#siteWindow'), - // area: ['35rem', '18rem'], - // btn: ['纭畾', '鍏抽棴'], - // success: function(layero, index){ - // http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) { - // for (var val in res.data) { - // var find = $("#siteWindow").find(":input[name='" + val + "']"); - // if (find[0].type==='text') { - // find.val(res.data[val]); - // } else if (find[0].type === 'checkbox') { - // find.attr("checked", res.data[val] === 'Y'); - // } - // } - // }) - // }, - // end: function () { - // $(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected'); - // } - // }); - // }); - - // 鍫嗗灈鏈虹偣鍑讳簨浠� - // $('.machine').on('click', function () { - // var id = this.id.split("-")[1]; - // layer.open({ - // title: id+"鍙峰爢鍨涙満", - // skin: 'layui-layer-lan', - // closeBtn: 0, - // type: 1, - // offset: '150px', - // shadeClose: true, - // content: $("#crnWindow"), - // area: ['40rem', '20rem'], - // btn: ['纭畾', '鍏抽棴'], - // success: function(layero, index){ - // http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (res) { - // for (var val in res.data) { - // var find = $("#crnWindow").find(":input[name='" + val + "']"); - // if (find[0].type==='text') { - // find.val(res.data[val]); - // } else if (find[0].type === 'checkbox') { - // find.attr("checked", res.data[val] === 'Y'); - // } - // } - // }) - // }, - // end: function () { - // $(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected'); - // } - // }); - // }); - - - // 灏忚溅鍋忕Щ鍔ㄧ敾 - function carAnimate(id, target) { - var targetTop = 122; - if (id === 8) { - switch (target) { - case 1: - targetTop += 160; - break; - case 2: - targetTop += 140; - break; - case 3: - targetTop += 80; - break; - case 4: - targetTop += 40; - break; - case 7: - targetTop += 0; - break; - default: - return; - } - } else { - return; - } - $("#site-" + id).animate({top: targetTop+'px'}, 1000); - } - - </script> -- Gitblit v1.9.1