From cb15c6400b7dfc3855e5fdd76b8b217bf6bc9567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期三, 30 十二月 2020 10:55:09 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 109 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 93 insertions(+), 16 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index f063bf9..898b7fd 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -83,6 +83,10 @@
<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>
<!----------- 宸﹁緭閫佺嚎 ---------->
@@ -104,9 +108,22 @@
<div id="site-1" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">1</div>
</div>
+ <!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-2">
+ <div id="site-103" class="site" style="height: 20px;line-height: 20px">103</div>
+ <div id="site-104" class="site" style="height: 20px;line-height: 20px">104</div>
+ <div id="site-105" class="site" style="height: 20px;line-height: 20px">105</div>
+ </div>
+
+ <!-- 绗簩鍒楋紙瀹藉害 100px锛� -->
+ <div class="site-row site-row-3">
+ <div id="site-102" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">102</div>
+ <div id="site-106" class="site" style="height: 20px;line-height: 20px;margin-bottom: 20px">106</div>
+ </div>
+
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
<div class="main-part">
- <!--绗竴鎺�-->
+ <!--绗竴缁�-->
<div class="lane">
<span class="row-no">1#</span>
<!-- 璐ф灦 -->
@@ -193,6 +210,74 @@
<div class="site site-none"> </div>
</div>
<span class="row-no">2#</span>
+ </div>
+ <!--绗簩缁�-->
+ <div class="lane" style="margin-left: 300px">
+ <span class="row-no">3#</span>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-101" class="site" style="">101</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>
+ <div class="site site-none"> </div>
+ </div>
+ <!-- 鍫嗗灈鏈� -->
+ <div class="crn">
+ <hr class="pathway" style="width: 67.5%">
+ <div id="crn-2" class="machine"></div>
+ </div>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-107" class="site" style="">107</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>
+ <div class="site site-none"> </div>
+ </div>
+ <span class="row-no">4#</span>
</div>
</div>
</main>
@@ -512,6 +597,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 +622,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,19 +769,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));
- }
- })
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1