From 16ae0857633ee15170ed63d3e22c380a9350148c Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 19 三月 2024 11:11:35 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/WareHouseSetting/StorageLegend.html | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 4823a11..7629f74 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -152,18 +152,18 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
- <td><button class="btnShow five" disabled></button></td>
- <td>绉诲嚭涓�</td>
- <td><button class="btnShow four" disabled></button></td>
- <td>绉诲叆涓�</td>
- <td><button class="btnShow three" disabled></button></td>
- <td>鍑哄簱涓�</td>
- <td><button class="btnShow two" disabled></button></td>
- <td>鍏ュ簱涓�</td>
- <td><button class="btnShow one" disabled></button></td>
- <td>鏈夌墿鍝�</td>
<td><button class="btnShow zero" disabled></button></td>
<td>绌哄簱浣�</td>
+ <td><button class="btnShow one" disabled></button></td>
+ <td>鏈夌墿鍝�</td>
+ <td><button class="btnShow two" disabled></button></td>
+ <td>鍏ュ簱涓�</td>
+ <td><button class="btnShow three" disabled></button></td>
+ <td>鍑哄簱涓�</td>
+ <td><button class="btnShow four" disabled></button></td>
+ <td>绉诲叆涓�</td>
+ <td><button class="btnShow five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
<td><button class="btnShow filg" disabled></button></td>
<td>鎹熷潖\灞忚斀</td>
</tr>
@@ -574,11 +574,11 @@
//绉诲叆涓� 4
if (statu.Status == 4) {
- html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow four"></button></td>'
}
//绉诲嚭涓� 5
if (statu.Status == 5) {
- html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow five"></button></td>'
}
} else {
@@ -671,7 +671,7 @@
{ value: value[3], name: key[3] }, //鍑哄簱涓�
{ value: value[4], name: key[4] }, //绉诲叆涓�
{ value: value[5], name: key[5] }, //绉诲嚭涓�
- { value: value[6], name: key[4] }, //鎹熷潖\灞忚斀
+ { value: value[6], name: key[6] }, //鎹熷潖\灞忚斀
],
// emphasis: {
// itemStyle: {
@@ -775,6 +775,24 @@
{
status3.push(0)
}
+ if (status4.length == 0)
+ {
+ status4.push(0)
+ status4.push(0)
+ }
+ else
+ {
+ status4.push(0)
+ }
+ if (status5.length == 0)
+ {
+ status5.push(0)
+ status5.push(0)
+ }
+ else
+ {
+ status5.push(0)
+ }
if (status6.length == 0)
{
status6.push(0)
--
Gitblit v1.8.0