From a0c9f738fdebae1f0bcb51d397978f24332a86ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 一月 2021 16:58:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 252 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 181 insertions(+), 71 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 5ff2bb3..22d9212 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -78,75 +78,197 @@
<!----------- 宸ュ叿鏍� ---------->
<!-- 鍏ュ簱鍙� -->
- <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>
</div>
+ <!-- 鎵爜鍣� -->
+ <div id="code-decoder-2" class="code-decoder">
+ <span id="code-decoder-data-2" class="code-decoder-data">0</span>
+ </div>
<!----------- 宸﹁緭閫佺嚎 ---------->
-
- <!-- 鍙拌溅杞ㄩ亾 -->
- <div id="car-track-1" class="car-track">
- <div></div>
+ <!-- 绗�0鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-0">
+ <div id="site-110" class="site" style="height: 20px;line-height: 20px;">110</div>
+ <div id="site-109" class="site" style="height: 20px;line-height: 20px;">109</div>
+ <div id="site-108" class="site" style="height: 22px;line-height: 22px;width: 160px">108</div>
+ <div id="site-112" class="site" style="height: 22px;line-height: 22px;width: 160px">112</div>
+ <div id="site-113" class="site" style="height: 20px;line-height: 20px">113</div>
+ <div id="site-114" class="site" style="height: 20px;line-height: 20px">114</div>
</div>
- <!-- 鍙拌溅瀹炰緥 -->
- <div id="site-8" class="site car">8</div>
-
- <!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
+ <!-- 绗�1鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-1">
- <div id="site-7" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">7</div>
- <div id="site-4" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">4</div>
- <div id="site-3" class="site" style="height: 20px;line-height: 20px;margin-bottom: 40px">3</div>
- <div id="site-2" class="site" style="height: 20px;line-height: 20px;margin-bottom: 0px">2</div>
- <div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
+ <div id="site-103" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">103</div>
+ <div id="site-127" class="site" style="height: 20px;line-height: 20px;margin-bottom: 84px">127</div>
+ <div id="site-128" class="site" style="height: 20px;line-height: 20px">128</div>
+ </div>
+
+ <!-- 绗�2鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-2">
+ <div id="site-126" class="site" style="height: 20px;line-height: 20px;width: 80px">126</div>
+ <div id="site-102" class="site" style="height: 20px;line-height: 20px">102</div>
+ <div id="site-104" class="site" style="height: 20px;line-height: 20px;width: 80px">104</div>
+ <div id="site-105" class="site" style="height: 20px;line-height: 20px">105</div>
+ <div id="site-106" class="site" style="height: 22px;line-height: 22px;width: 80px">106</div>
+ <div id="site-107" class="site" style="height: 22px;line-height: 22px;width: 90px">107</div>
+ <div id="site-111" class="site" style="height: 20px;line-height: 20px">111</div>
+ <div id="site-115" class="site" style="height: 20px;line-height: 20px;width: 80px">115</div>
+ <div id="site-116" class="site" style="height: 20px;line-height: 20px">116</div>
+ </div>
+
+ <!-- 绗�3鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-3">
+ <div id="site-101" class="site" style="height: 20px;line-height: 20px">101</div>
+ <div id="site-125" class="site" style="height: 20px;line-height: 20px;width: 80px">125</div>
+ <div id="site-123" class="site" style="height: 20px;line-height: 20px">123</div>
+ <div id="site-122" class="site" style="height: 44px;line-height: 44px;width: 80px">122</div>
+ <div id="site-121" class="site" style="height: 20px;line-height: 20px">121</div>
+ <div id="site-119" class="site" style="height: 20px;line-height: 20px;width: 80px">119</div>
+ <div id="site-117" class="site" style="height: 20px;line-height: 20px">117</div>
+ </div>
+
+ <!-- 绗�4鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-4">
+ <div id="site-200" class="site" style="height: 20px;line-height: 20px;margin-bottom: 21px; width: 160px">200</div>
+ <div id="site-202" class="site" style="height: 20px;line-height: 20px;margin-bottom: 44px;">202</div>
+ <div id="site-203" class="site" style="height: 20px;line-height: 20px;margin-bottom: 21px; width: 160px">203</div>
+ <div id="site-205" class="site" style="height: 20px;line-height: 20px;">205</div>
+ </div>
+
+ <!-- 绗�5鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-5">
+ <div id="site-201" class="site" style="height: 20px;line-height: 20px;margin-bottom: 85px">201</div>
+ <div id="site-204" class="site" style="height: 20px;line-height: 20px;">204</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
<div class="main-part">
- <!--绗竴鎺�-->
+ <!--绗竴缁�-->
<div class="lane">
- <span class="row-no">1#</span>
+ <span class="row-no">8#</span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-6" class="site" style="">6</div>
- <button class="item">1</button>
+ <div id="site-100" class="site" style="">100</div>
<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"> </div>
+ <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">
+ <hr class="pathway">
+ <div id="crn-2" class="machine"></div>
+ </div>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-124" class="site" style="">124</div>
+ <button class="item">2</button>
+ <button class="item">4</button>
+ <button class="item">6</button>
+ <button class="item">8</button>
+ <button class="item">10</button>
+ <button class="item">12</button>
+ <button class="item">14</button>
+ <button class="item">16</button>
+ <button class="item">18</button>
+ <button class="item">20</button>
+ <button class="item">22</button>
+ <button class="item">24</button>
+ <button class="item">26</button>
+ <button class="item">28</button>
+ <button class="item">30</button>
+ <button class="item">32</button>
+ <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>
+ <!--绗簩缁�-->
+ <div class="lane">
+ <span class="row-no">4#</span>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-120" class="site" style="">120</div>
+ <button class="item">2</button>
+ <button class="item">4</button>
+ <button class="item">6</button>
+ <button class="item">8</button>
+ <button class="item">10</button>
+ <button class="item">12</button>
+ <button class="item">14</button>
+ <button class="item">16</button>
+ <button class="item">18</button>
+ <button class="item">20</button>
+ <button class="item">22</button>
+ <button class="item">24</button>
+ <button class="item">26</button>
+ <button class="item">28</button>
+ <button class="item">30</button>
+ <button class="item">32</button>
+ <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">
@@ -155,44 +277,41 @@
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-5" class="site" style="">5</div>
- <button class="item">1</button>
+ <div id="site-118" class="site" style="">118</div>
<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"> </div>
+ <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">2#</span>
+ <span class="row-no">1#</span>
</div>
</div>
</main>
@@ -512,6 +631,9 @@
} else {
siteEl.html(sites[i].siteId);
}
+ if (i+1===8) {
+ carAnimate(i+1, Number(sites[i].nearbySta));
+ }
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -534,8 +656,10 @@
for (var i = 0; i < crns.length; i++){
var crnEl = $("#crn-"+crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- // crnAnimate(crns[i].crnId, crns[i].offset);
- crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000);
+
+ 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);
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -679,20 +803,6 @@
}
$("#site-" + id).animate({top: targetTop+'px'}, 1000);
}
-
-
- // 鍙拌溅鐐瑰嚮浜嬩欢
- $(document).on("click", ".item", function () {
- var value = prompt('鐩爣绔欙細', "1");
- if (value == null) {
- alert('涓嶈兘涓虹┖锛�');
- } else if (value === '') {
- alert('涓嶈兘涓虹┖锛�');
- } else {
- carAnimate(8, Number(value));
- // $("#site-" + 8).animate({top: (Number(value) + 122) +'px'}, 1000);
- }
- })
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1