From 340c6c02b720eaf73eb7fa0c368acff8e9942e50 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 15 三月 2024 11:19:48 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/WareHouseSetting/StorageLegend.html | 84 ++++++++++++++++++++++--------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 22313ca..4823a11 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -152,6 +152,10 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<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>
@@ -569,13 +573,13 @@
}
//绉诲叆涓� 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>'
- // }
+ 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>'
+ }
//绉诲嚭涓� 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>'
- // }
+ 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>'
+ }
} else {
// console.log(i, a);
@@ -624,7 +628,7 @@
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6: 鎹熷潖\灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�', '鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�', '鎹熷潖\灞忚斀'];
var value = [0,0,0,0,0,0,0];
list.forEach(item => {
value[item.Status] = item.StatusNum;
@@ -637,8 +641,8 @@
'#91cc75',
'#ffdc60',
'#ee6666',
- // '#ffff7f',
- // '#ee23ee',
+ '#ffff7f',
+ '#ee23ee',
'#808080',
],
title: {
@@ -665,8 +669,8 @@
{ value: value[1], name: key[1] }, //鏈夌墿鍝�
{ value: value[2], name: key[2] }, //鍏ュ簱涓�
{ value: value[3], name: key[3] }, //鍑哄簱涓�
- // { value: value[4], name: key[4] },
- // { value: value[5], name: key[5] },
+ { value: value[4], name: key[4] }, //绉诲叆涓�
+ { value: value[5], name: key[5] }, //绉诲嚭涓�
{ value: value[6], name: key[4] }, //鎹熷潖\灞忚斀
],
// emphasis: {
@@ -698,7 +702,7 @@
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6锛氭崯鍧廫灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�','鎹熷潖\灞忚斀'];
this.chartLine2 = echarts.init(document.getElementById("zhu"));
//宸烽亾
var roarylist = [xianga, xiangb];
@@ -707,8 +711,8 @@
var status1 = [];
var status2 = [];
var status3 = [];
- // var status4 = [];
- // var status5 = [];
+ var status4 = [];
+ var status5 = [];
var status6 = [];
//鑾峰彇
//鎬�
@@ -725,12 +729,12 @@
if (list[i].Status == '3') {
status3.push(list[i].StatusNum)
}
- // if (list[i].Status == '4') {
- // status4.push(list[i].StatusNum)
- // }
- // if (list[i].Status == '5') {
- // status5.push(list[i].StatusNum)
- // }
+ if (list[i].Status == '4') {
+ status4.push(list[i].StatusNum)
+ }
+ if (list[i].Status == '5') {
+ status5.push(list[i].StatusNum)
+ }
if (list[i].Status == '6') {
status6.push(list[i].StatusNum)
}
@@ -845,26 +849,26 @@
},
data: status3
},
- // {
- // name: '绉诲叆涓�',
- // type: 'bar',
- // color: '#ffff7f',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status4
- // },
- // {
- // name: '绉诲嚭涓�',
- // type: 'bar',
- // color: '#ee23ee',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status5
- // },
+ {
+ name: '绉诲叆涓�',
+ type: 'bar',
+ color: '#ffff7f',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status4
+ },
+ {
+ name: '绉诲嚭涓�',
+ type: 'bar',
+ color: '#ee23ee',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status5
+ },
{
name: '鎹熷潖\灞忚斀',
type: 'bar',
--
Gitblit v1.8.0