From 28a7821e43bd5763739fe67384cfea6693b3500b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 13:19:26 +0800
Subject: [PATCH] Merge branches 'gdwcs' and 'jswcs' of https://gitee.com/luxiaotao1123/zy-wcs into jswcs
---
src/main/webapp/views/console.html | 241 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 195 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 8197622..57c5e84 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -51,14 +51,14 @@
<div class="tips-item">
<label>鍫嗗灈鏈虹姸鎬侀鑹�: </label>
<div class="item-group">
- <span class="machine-put">鍏ュ簱</span>
- <span class="machine-take">鍑哄簱</span>
- <span class="machine-stock-move">搴撳埌搴�</span>
- <span class="machine-site-move">绔欏埌绔�</span>
- <span class="machine-p-move">PToP</span>
- <span class="machine-error">寮傚父</span>
- <span class="machine-auto">鑷姩</span>
- <span class="machine-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ <span class="machine-put-flag">鍏ュ簱</span>
+ <span class="machine-take-flag">鍑哄簱</span>
+ <span class="machine-stock-move-flag">搴撳埌搴�</span>
+ <span class="machine-site-move-flag">绔欏埌绔�</span>
+ <span class="machine-p-move-flag">PToP</span>
+ <span class="machine-error-flag">寮傚父</span>
+ <span class="machine-auto-flag">鑷姩</span>
+ <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
</div>
</div>
<div class="tips-item">
@@ -79,27 +79,26 @@
<!----------- 宸ュ叿鏍� ---------->
<!-- 鍏ュ簱鍙� -->
<div class="cargo-put"></div>
- <!-- 鎵爜鍣� -->
- <div id="code-decoder-1" class="code-decoder">
- <span id="code-decoder-data-1" class="code-decoder-data">0</span>
- </div>
+
+<!-- <!– 鎵爜鍣� 1–>-->
+<!-- <div id="code-decoder-1" class="code-decoder">-->
+<!-- <span id="code-decoder-data-1" class="code-decoder-data">0</span>-->
+<!-- </div>-->
+
+<!-- <!– 鎵爜鍣� 2–>-->
+<!-- <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 id="site-8" class="site car">8</div>
-
<!-- 绗竴鍒楋紙瀹藉害 100px锛� -->
<div class="site-row site-row-1">
- <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 id="site-1" class="site" style="height: 20px;line-height: 20px;">1</div>
+ <div id="site-3" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">3</div>
+ <div id="site-5" class="site" style="height: 20px;line-height: 20px; margin-top: 0px">5</div>
+ <div id="site-7" class="site" style="height: 20px;line-height: 20px; margin-top: 20px">7</div>
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 -->
@@ -109,8 +108,7 @@
<span class="row-no">1#</span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-6" class="site" style="">6</div>
- <button class="item">1</button>
+ <div id="site-2" class="site" style="">2</div>
<button class="item">2</button>
<button class="item">3</button>
<button class="item">4</button>
@@ -144,6 +142,23 @@
<button class="item">32</button>
<button class="item">33</button>
<button class="item">34</button>
+ <button class="item">35</button>
+ <button class="item">36</button>
+ <button class="item">37</button>
+ <button class="item">38</button>
+ <button class="item">39</button>
+ <button class="item">40</button>
+ <button class="item">41</button>
+ <button class="item">42</button>
+ <button class="item">43</button>
+ <button class="item">44</button>
+ <button class="item">45</button>
+ <button class="item">46</button>
+ <button class="item">47</button>
+ <button class="item">48</button>
+ <button class="item">49</button>
+ <button class="item">50</button>
+ <button class="item">51</button>
<div class="site site-none"> </div>
</div>
<!-- 鍫嗗灈鏈� -->
@@ -153,8 +168,7 @@
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
- <div id="site-5" class="site" style="">5</div>
- <button class="item">1</button>
+ <div id="site-4" class="site" style="">4</div>
<button class="item">2</button>
<button class="item">3</button>
<button class="item">4</button>
@@ -188,9 +202,143 @@
<button class="item">32</button>
<button class="item">33</button>
<button class="item">34</button>
+ <button class="item">35</button>
+ <button class="item">36</button>
+ <button class="item">37</button>
+ <button class="item">38</button>
+ <button class="item">39</button>
+ <button class="item">40</button>
+ <button class="item">41</button>
+ <button class="item">42</button>
+ <button class="item">43</button>
+ <button class="item">44</button>
+ <button class="item">45</button>
+ <button class="item">46</button>
+ <button class="item">47</button>
+ <button class="item">48</button>
+ <button class="item">49</button>
+ <button class="item">50</button>
+ <button class="item">51</button>
<div class="site site-none"> </div>
</div>
- <span class="row-no">2#</span>
+ </div>
+ <div class="lane">
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-6" class="site" style="">6</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>
+ <button class="item">35</button>
+ <button class="item">36</button>
+ <button class="item">37</button>
+ <button class="item">38</button>
+ <button class="item">39</button>
+ <button class="item">40</button>
+ <button class="item">41</button>
+ <button class="item">42</button>
+ <button class="item">43</button>
+ <button class="item">44</button>
+ <button class="item">45</button>
+ <button class="item">46</button>
+ <button class="item">47</button>
+ <button class="item">48</button>
+ <button class="item">49</button>
+ <button class="item">50</button>
+ <button class="item">51</button>
+ <div class="site site-none"> </div>
+ </div>
+ <!-- 鍫嗗灈鏈� -->
+ <div class="crn">
+ <hr class="pathway">
+ <div id="crn-2" class="machine"></div>
+ </div>
+ <!-- 璐ф灦 -->
+ <div class="stock-group">
+ <div id="site-8" class="site" style="">8</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>
+ <button class="item">35</button>
+ <button class="item">36</button>
+ <button class="item">37</button>
+ <button class="item">38</button>
+ <button class="item">39</button>
+ <button class="item">40</button>
+ <button class="item">41</button>
+ <button class="item">42</button>
+ <button class="item">43</button>
+ <button class="item">44</button>
+ <button class="item">45</button>
+ <button class="item">46</button>
+ <button class="item">47</button>
+ <button class="item">48</button>
+ <button class="item">49</button>
+ <button class="item">50</button>
+ <button class="item">51</button>
+ <div class="site site-none"> </div>
+ </div>
+ <span class="row-no">4#</span>
</div>
</div>
</main>
@@ -459,7 +607,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -486,7 +634,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -511,9 +659,9 @@
}
}
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -532,12 +680,13 @@
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 + 20) +'px'}, 1000);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -558,7 +707,7 @@
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -678,17 +827,17 @@
}
- // 鍙拌溅鐐瑰嚮浜嬩欢
- $(document).on("click", ".car", function () {
- var value = prompt('鐩爣绔欙細', "1");
- if (value == null) {
- alert('涓嶈兘涓虹┖锛�');
- } else if (value === '') {
- alert('涓嶈兘涓虹┖锛�');
- } else {
- carAnimate(8, Number(value));
- }
- })
+ // // 鍙拌溅鐐瑰嚮浜嬩欢
+ // $(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