From fc7566522ecdd5a14b2a0801d14b2630ae93c7b0 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 22 八月 2024 16:57:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC26WMS
---
HTML/views/WareHouseSetting/StorageLegend.html | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 170 insertions(+), 2 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 0280638..380f98c 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -197,7 +197,7 @@
</div>
</div>
</div>
-
+
</div>
</div>
</div>
@@ -600,7 +600,7 @@
// 鍔犺浇浠撳簱鍥句緥
//鍦�
- function GetSlotChart(warehouseNo) {
+ function GetSlotChart1(warehouseNo) {
sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
// console.log("鍥暟鎹�",res)
@@ -675,6 +675,174 @@
});
};
+ //鏂扮増鍦嗗舰鍥�
+ function GetSlotChart(warehouseNo) {
+ sendData(IP + "/Sys/GetStorageProportion?WareHouseNo=" + warehouseNo, {}, 'get', function (res) {
+ // console.log("鍦嗘暟鎹�",res)
+ if (res.code == 0) {
+ // console.log("鍦嗘暟鎹�",res.data)
+ var LayerName = res.data[0].warehouseNo;
+
+ var list = res.data;
+ //0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6: 鎹熷潖\灞忚斀
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�', '鎹熷潖/灞忚斀'];
+ var value = [0,0,0,0,0,0,0];
+ list.forEach(item => {
+ value[item.Status] = item.StatusNum;
+ });
+ // console.log(value)
+
+ this.chartLine2 = echarts.init(document.getElementById("yuan"));
+
+ var option2 = {
+ tooltip: { //寮瑰嚭淇℃伅
+ trigger: 'item',
+ formatter: '{a} <br/>{b}: {c} ({d}%)'
+ },
+ legend: { //宸︿晶淇℃伅
+ top:'5%',
+ orient: 'vertical',
+ left: 'left'
+ },
+ series: [
+ { //涓績鍥�
+ type: 'pie',
+ radius: [0, '30%'],
+ label: {
+ position: 'inner',
+ fontSize: 35,
+ },
+ title:'12',
+ },
+ { //渚ц竟鍥�
+ color: [ //棰滆壊
+ '#5470c6', //绌哄偍浣�
+ '#91cc75', //鏈夌墿鍝�
+ '#ffdc60', //鍏ュ簱涓�
+ '#ee6666', //鍑哄簱涓�
+ '#ffff7f', //绉诲叆涓�
+ '#ee23ee', //绉诲嚭涓�
+ '#808080', //鎹熷潖/灞忚斀
+ ],
+ name: '鍌ㄤ綅鐘舵��',
+ type: 'pie',
+ radius: ['40%', '70%'],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 10,
+ borderColor: '#fff',
+ borderWidth: 2
+ },
+ label: { //鏄惁鏄剧ず澶栭儴绾挎潯淇℃伅
+ show: false,
+ position: 'center'
+ },
+ emphasis: { //榧犳爣绉诲叆鏄惁涓棿鏄剧ず淇℃伅
+ label: {
+ show: true,
+ fontSize: 20,
+ fontWeight: 'bold'
+ }
+ },
+ labelLine: { //鏍囩绾挎潯
+ show: false
+ },
+ data: [
+ { value: value[0], name: key[0] }, //绌哄偍浣�
+ { 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[6], name: key[6] }, //鎹熷潖\灞忚斀
+ // { value: 1048, name: '绌哄偍浣�' },
+ // { value: 735, name: '鏈夌墿鍝�' },
+ // { value: 580, name: '鍏ュ簱涓�' },
+ // { value: 484, name: '鍑哄簱涓�' },
+ // { value: 484, name: '绉诲叆涓�' },
+ // { value: 484, name: '绉诲嚭涓�' },
+ // { value: 300, name: '鎹熷潖/灞忚斀' }
+ ]
+ },
+ ],
+ };
+
+ this.chartLine2.setOption(option2);
+
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000
+ }, function () { })
+ }
+ });
+ };
+ // option = {
+ // tooltip: { //寮瑰嚭淇℃伅
+ // trigger: 'item',
+ // formatter: '{a} <br/>{b}: {c} ({d}%)'
+ // },
+ // legend: { //宸︿晶淇℃伅
+ // top:'5%',
+ // orient: 'vertical',
+ // left: 'left'
+ // },
+ // series: [
+ // //涓績鍥�
+ // {
+ // type: 'pie',
+ // radius: [0, '30%'],
+ // label: {
+ // position: 'inner',
+ // fontSize: 35,
+ // },
+ // title:'12',
+ // },
+ // {
+ // color: [
+ // '#5470c6', //绌哄偍浣�
+ // '#91cc75', //鏈夌墿鍝�
+ // '#ffdc60', //鍏ュ簱涓�
+ // '#ee6666', //鍑哄簱涓�
+ // '#ffff7f', //绉诲叆涓�
+ // '#ee23ee', //绉诲嚭涓�
+ // '#808080', //鎹熷潖/灞忚斀
+ // ],
+ // name: '鍌ㄤ綅鐘舵��',
+ // type: 'pie',
+ // radius: ['40%', '70%'],
+ // avoidLabelOverlap: false,
+ // itemStyle: {
+ // borderRadius: 10,
+ // borderColor: '#fff',
+ // borderWidth: 2
+ // },
+ // label: { //鏄惁鏄剧ず澶栭儴绾挎潯淇℃伅
+ // show: false,
+ // position: 'center'
+ // },
+ // emphasis: { //榧犳爣绉诲叆鏄惁涓棿鏄剧ず淇℃伅
+ // label: {
+ // show: true,
+ // fontSize: 40,
+ // fontWeight: 'bold'
+ // }
+ // },
+ // labelLine: { //鏍囩绾挎潯
+ // show: false
+ // },
+ // data: [
+ // { value: 1048, name: '绌哄偍浣�' },
+ // { value: 735, name: '鏈夌墿鍝�' },
+ // { value: 580, name: '鍏ュ簱涓�' },
+ // { value: 484, name: '鍑哄簱涓�' },
+ // { value: 484, name: '绉诲叆涓�' },
+ // { value: 484, name: '绉诲嚭涓�' },
+ // { value: 300, name: '鎹熷潖/灞忚斀' }
+ // ]
+ // }
+ // ]
+ // };
//鏌�
function GetSlotChartz(warehouseNo, roadwayNo) {
--
Gitblit v1.8.0