From bebe61d84eae20ca8997152b8bdb453e8094ab3d Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期五, 18 三月 2022 16:56:48 +0800
Subject: [PATCH] # ycq 堆垛机位置
---
src/main/webapp/views/console.html | 168 ++++++++++++++++++++++++++++---------------------------
1 files changed, 85 insertions(+), 83 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 932fc12..c57b160 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -109,10 +109,10 @@
<div class="lane">
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -148,10 +148,10 @@
</div>
<div class="stock-group">
<div id="site-100" class="site" style="">100</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -193,10 +193,10 @@
<!-- 璐ф灦 -->
<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"> 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>
@@ -231,10 +231,10 @@
<span class="row-no">3#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -275,10 +275,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div class="site" style="background-color: rgb(108,167,168)"></div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -314,10 +314,10 @@
</div>
<div class="stock-group">
<div id="site-102" class="site" style="">102</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -359,10 +359,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-103" class="site" style="">103</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -398,10 +398,10 @@
</div>
<div class="stock-group">
<div class="site" style="background-color: rgb(108,167,168)"></div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -441,10 +441,10 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -480,10 +480,10 @@
</div>
<div class="stock-group">
<div id="site-104" class="site" style="">104</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -525,10 +525,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-105" class="site" style="">105</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -563,10 +563,10 @@
<span class="row-no">11#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -606,10 +606,10 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -645,10 +645,10 @@
</div>
<div class="stock-group">
<div id="site-106" class="site" style="">106</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -690,10 +690,10 @@
<!-- 璐ф灦 -->
<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"> 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>
@@ -728,10 +728,10 @@
<span class="row-no">15#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -771,10 +771,10 @@
<span class="row-no"></span>
<!-- 璐ф灦 -->
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -810,10 +810,10 @@
</div>
<div class="stock-group">
<div id="site-108" class="site" style="">108</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -855,10 +855,10 @@
<!-- 璐ф灦 -->
<div class="stock-group">
<div id="site-109" class="site" style="">109</div>
- <button class="item">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <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>
@@ -893,10 +893,10 @@
<span class="row-no">19#</span>
</div>
<div class="stock-group">
- <button class="item" style="margin-left: 82px">2</button>
- <button class="item">4</button>
- <button class="item">6</button>
- <button class="item">8</button>
+ <button class="item" style="margin-left: 82px"> 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>
@@ -1503,8 +1503,11 @@
for (var i = 0; i < crns.length; i++){
var crnEl = $("#crn-"+crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = ($('.item').eq(0).width()+4)/2;
- crnEl.animate({left: (crns[i].bay * unit + 25) +'px'}, 1000);
+ var unit = ($('.item').eq(0).width()+13)/2;
+ if (crns[i].bay < 0) {
+ crns[i].bay = 0
+ }
+ crnEl.animate({left: (crns[i].bay * unit) +'px'}, 1000);
}
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -1514,7 +1517,6 @@
}
});
}
-
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
function getBarcodeInfo(){
$.ajax({
--
Gitblit v1.9.1