From 216ba7805e9705e32cfe99dfae69cb8114fe62a2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 08 九月 2020 14:13:12 +0800 Subject: [PATCH] # --- src/main/webapp/views/console.html | 257 ++++++++++---------------------------------------- 1 files changed, 54 insertions(+), 203 deletions(-) diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index 57c5e84..ba80c58 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -16,7 +16,7 @@ <style> /* layer 娣辫摑鑹叉寜閽慨鏀� */ /*.layui-layer-lan .layui-layer-btn {*/ - /*border-top: none;*/ + /*border-top: none;*/ /*}*/ .layui-layer-lan .layui-layer-btn a { background: #4476A7; @@ -79,26 +79,27 @@ <!----------- 宸ュ叿鏍� ----------> <!-- 鍏ュ簱鍙� --> <div class="cargo-put"></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="code-decoder-1" class="code-decoder"> + <span id="code-decoder-data-1" 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-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 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> <!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 + 鍑哄簱绔欑偣 --> @@ -108,7 +109,8 @@ <span class="row-no">1#</span> <!-- 璐ф灦 --> <div class="stock-group"> - <div id="site-2" class="site" style="">2</div> + <div id="site-6" class="site" style="">6</div> + <button class="item">1</button> <button class="item">2</button> <button class="item">3</button> <button class="item">4</button> @@ -142,23 +144,6 @@ <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> <!-- 鍫嗗灈鏈� --> @@ -168,7 +153,8 @@ </div> <!-- 璐ф灦 --> <div class="stock-group"> - <div id="site-4" class="site" style="">4</div> + <div id="site-5" class="site" style="">5</div> + <button class="item">1</button> <button class="item">2</button> <button class="item">3</button> <button class="item">4</button> @@ -202,143 +188,9 @@ <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> - <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> + <span class="row-no">2#</span> </div> </div> </main> @@ -390,21 +242,21 @@ <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem"> </div> </div> - <div class="form-item" style="width: 20%"> - <div class="form-item-label"> - <span>鑳藉叆</span> - </div> - <div class="form-item-input"> - <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem"> - </div> - </div> - <div class="form-item" style="width: 20%"> - <div class="form-item-label"> - <span>鑳藉嚭</span> - </div> - <div class="form-item-input"> - <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem"> - </div> + <div class="form-item" style="width: 20%"> + <div class="form-item-label"> + <span>鑳藉叆</span> + </div> + <div class="form-item-input"> + <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem"> + </div> + </div> + <div class="form-item" style="width: 20%"> + <div class="form-item-label"> + <span>鑳藉嚭</span> + </div> + <div class="form-item-input"> + <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem"> + </div> </div> <!-- 绗笁琛� --> @@ -607,7 +459,7 @@ } else if (res.code === 403){ window.location.href = baseUrl+"/login"; } else { - console.log(res.msg); + alert(res.msg); } } }); @@ -634,7 +486,7 @@ } else if (res.code === 403){ window.location.href = baseUrl+"/login"; } else { - console.log(res.msg); + alert(res.msg); } } }); @@ -659,9 +511,9 @@ } } } else if (res.code === 403){ - parent.location.href = baseUrl+"/login"; + window.location.href = baseUrl+"/login"; } else { - console.log(res.msg); + alert(res.msg); } } }); @@ -680,13 +532,12 @@ var crnEl = $("#crn-"+crns[i].crnId); crnEl.attr("class", "machine " + crns[i].crnStatus); // crnAnimate(crns[i].crnId, crns[i].offset); - var unit = $('.item').eq(0).width()+4; - crnEl.animate({left: (crns[i].bay * unit + 20) +'px'}, 1000); + crnEl.animate({left: (crns[i].bay * ($('.item').eq(0).width()+4)) +'px'}, 1000); } } else if (res.code === 403){ window.location.href = baseUrl+"/login"; } else { - console.log(res.msg); + alert(res.msg); } } }); @@ -707,7 +558,7 @@ } else if (res.code === 403){ window.location.href = baseUrl+"/login"; } else { - console.log(res.msg); + alert(res.msg); } } }); @@ -827,17 +678,17 @@ } - // // 鍙拌溅鐐瑰嚮浜嬩欢 - // $(document).on("click", ".item", 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