From 7912915a2b076e7ed4772ce2939f33862587a54b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 三月 2022 17:19:32 +0800
Subject: [PATCH] Merge branch 'xgmwcs' of http://47.97.1.152:5880/r/zy-wcs into xgmwcs
---
src/main/webapp/views/console.html | 200 +++++++++++++++++++++++++++----------------------
1 files changed, 110 insertions(+), 90 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index a1d0f1f..c57b160 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -17,8 +17,13 @@
<body>
<div id="root">
<div class="head">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
- <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ <div class="head-left">
+ <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+ <h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
+ </div>
+ <div class="head-right">
+ <img src="../static/images/zy-logo.png" alt="涓壃" height="44" width="80" >
+ </div>
</div>
<!--绗�1鍒楋紙瀹藉害 70px锛� -->
<div class="site-row site-row-1">
@@ -50,8 +55,8 @@
</div>
<!-- 绗�4鍒楋紙瀹藉害 70px 140px锛� -->
- <!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
- <div class="site-row site-row-5">
+ <!--<!– 绗�4鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-4">
<div id="site-163" class="site" style="height: 28.5px;line-height: 28.5px">163</div>
<div id="site-162" class="site" style="height: 28.5px;line-height: 28.5px">162</div>
<div id="site-161" class="site" style="height: 71px;line-height: 71px">161</div>
@@ -67,8 +72,8 @@
<div id="site-151" class="site" style="height: 28.5px;line-height: 28.5px">151</div>
<div id="site-150" class="site" style="height: 28.5px;line-height: 28.5px">150</div>
</div>
- <!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
- <div class="site-row site-row-6">
+ <!--<!– 绗�5鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-5">
<div id="site-120" class="site" style="height: 28.5px;line-height: 28.5px">120</div>
<div id="site-121" class="site" style="height: 28.5px;line-height: 28.5px">121</div>
<div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
@@ -84,6 +89,19 @@
<div id="site-132" class="site" style="height: 28.5px;line-height: 28.5px">132</div>
<div id="site-133" class="site" style="height: 28.5px;line-height: 28.5px">133</div>
</div>
+ <!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
+ <div class="site-row site-row-6">
+ <div id="site-183" class="site">183</div>
+ <div id="site-184" class="site" style="margin-top: 21px">184</div>
+ <div id="site-185" class="site" style="margin-top: 73px">185</div>
+ <div id="site-186" class="site" style="margin-top: 21px">186</div>
+ <div id="site-187" class="site" style="margin-top: 73px">187</div>
+ <div id="site-188" class="site" style="margin-top: 21px">188</div>
+ <div id="site-189" class="site" style="margin-top: 73px">189</div>
+ <div id="site-190" class="site" style="margin-top: 21px">190</div>
+ <div id="site-191" class="site" style="margin-top: 73px">191</div>
+ <div id="site-192" class="site" style="margin-top: 21px">192</div>
+ </div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
@@ -91,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>
@@ -130,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>
@@ -175,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>
@@ -213,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>
@@ -257,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>
@@ -296,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>
@@ -341,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>
@@ -380,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>
@@ -423,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>
@@ -462,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>
@@ -507,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>
@@ -545,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>
@@ -588,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>
@@ -627,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>
@@ -672,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>
@@ -710,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>
@@ -753,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>
@@ -792,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>
@@ -837,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>
@@ -875,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>
@@ -955,7 +973,7 @@
<div class="body-head">杈撻�佺嚎鐘舵��</div>
<div class="state states">
<span>杩愯緭绾挎�绘暟</span>
- <span class="line-ss">48</span>
+ <span class="line-ss">58</span>
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
@@ -1485,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";
@@ -1496,7 +1517,6 @@
}
});
}
-
// 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
function getBarcodeInfo(){
$.ajax({
--
Gitblit v1.9.1