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 | 206 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 139 insertions(+), 67 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 4fa7e1f..898b7fd 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;
@@ -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">
@@ -83,36 +83,47 @@
<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>
- <!-- 宸﹁緭閫佺嚎 -->
-
- <!-- 鍙拌溅1 -->
+ <!----------- 宸﹁緭閫佺嚎 ---------->
<!-- 鍙拌溅杞ㄩ亾 -->
- <div id="car-track-1" class="car-track" style="position: absolute; top: 122px; left: 100px; width: 100px; height: 200px; background: url(../static/image/bg.jpg);"></div>
+ <div id="car-track-1" class="car-track">
+ <div></div>
+ </div>
<!-- 鍙拌溅瀹炰緥 -->
- <div id="site-8" class="site car" style="
- position: absolute;
- top: 122px;
- left: 100px;
- width: 100px;
- height: 40px;
- line-height: 40px">8</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-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>
+
+ <!-- 绗簩鍒楋紙瀹藉害 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>
<!-- 璐ф灦 -->
@@ -200,6 +211,74 @@
</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>
@@ -250,21 +329,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>
<!-- 绗笁琛� -->
@@ -465,9 +544,10 @@
parent.systemRunning = false;
}
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
+
}
}
});
@@ -492,9 +572,9 @@
parent.systemRunning = false;
}
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -517,11 +597,14 @@
} else {
siteEl.html(sites[i].siteId);
}
+ if (i+1===8) {
+ carAnimate(i+1, Number(sites[i].nearbySta));
+ }
}
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -539,13 +622,15 @@
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 * 30) +'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){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -564,9 +649,9 @@
$("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
}
} else if (res.code === 403){
- window.location.href = baseUrl+"/login";
+ parent.location.href = baseUrl+"/login";
} else {
- alert(res.msg);
+ console.log(res.msg);
}
}
});
@@ -665,7 +750,7 @@
targetTop += 160;
break;
case 2:
- targetTop += 120;
+ targetTop += 140;
break;
case 3:
targetTop += 80;
@@ -684,19 +769,6 @@
}
$("#site-" + id).animate({top: targetTop+'px'}, 1000);
}
-
-
- // 鍙拌溅鐐瑰嚮浜嬩欢
- $(document).on("click", ".car", 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