2.21日版
This commit is contained in:
@@ -25,7 +25,7 @@ function LeftDown() {
|
||||
headerBGC: "rgba(79, 114, 136, 0.3)",
|
||||
oddRowBGC: "rgba(79, 114, 136, 0.3)",
|
||||
evenRowBGC: "rgba(76, 97, 123, 0.1)",
|
||||
columnWidth: [73, 117, 190],
|
||||
columnWidth: [73, 200, 107],
|
||||
data: [
|
||||
["1", "磨边后", 224],
|
||||
["2", "包装1", 322],
|
||||
@@ -40,7 +40,7 @@ function LeftDown() {
|
||||
headerBGC: "rgba(79, 114, 136, 0.3)",
|
||||
oddRowBGC: "rgba(79, 114, 136, 0.3)",
|
||||
evenRowBGC: "rgba(76, 97, 123, 0.1)",
|
||||
columnWidth: [73, 117, 190],
|
||||
columnWidth: [73, 200, 107],
|
||||
data: [
|
||||
["1", "磨边后", 1119],
|
||||
["2", "包装1", 1798],
|
||||
@@ -55,7 +55,7 @@ function LeftDown() {
|
||||
headerBGC: "rgba(79, 114, 136, 0.3)",
|
||||
oddRowBGC: "rgba(79, 114, 136, 0.3)",
|
||||
evenRowBGC: "rgba(76, 97, 123, 0.1)",
|
||||
columnWidth: [73, 117, 190],
|
||||
columnWidth: [73, 200, 107],
|
||||
data: [
|
||||
["1", "磨边后", 5004],
|
||||
["2", "包装1", 9122],
|
||||
@@ -65,7 +65,9 @@ function LeftDown() {
|
||||
const color1 = ["#9DD5FF", "#1295FF"];
|
||||
const color2 = ["#85F6E9", "#2EC6B4"];
|
||||
// @ts-ignore
|
||||
let xData: string[] = data.scrapBars
|
||||
let xData1: string[] = [];
|
||||
let xData2: string[] = [];
|
||||
let xData3: string[] = [];
|
||||
let dataProps1: number[] = [];
|
||||
let dataProps2: number[] = [];
|
||||
let dataProps3: number[] = [];
|
||||
@@ -77,9 +79,10 @@ function LeftDown() {
|
||||
// @ts-ignore
|
||||
data.todayProductionScraps.map((item,index)=>{
|
||||
let arrInner = [];
|
||||
arrInner.push(index+1,item.sectionName,item.scrapNum);
|
||||
arrInner.push(index+1,item.sectionName,item.scrapNum || 0);
|
||||
arr1.push(arrInner);
|
||||
dataProps1.push(item.scrapNum);
|
||||
xData1.push(item.sectionName);
|
||||
dataProps1.push(item.scrapNum || 0);
|
||||
})
|
||||
}else{
|
||||
dataProps1 = []
|
||||
@@ -89,9 +92,10 @@ function LeftDown() {
|
||||
// @ts-ignore
|
||||
data.weekProductionScraps.map((item,index)=>{
|
||||
let arrInner = [];
|
||||
arrInner.push(index+1,item.sectionName,item.scrapNum);
|
||||
arrInner.push(index+1,item.sectionName,item.scrapNum || 0);
|
||||
arr2.push(arrInner);
|
||||
dataProps2.push(item.scrapNum);
|
||||
xData2.push(item.sectionName);
|
||||
dataProps2.push(item.scrapNum || 0);
|
||||
})
|
||||
}else{
|
||||
dataProps2 = []
|
||||
@@ -101,9 +105,10 @@ function LeftDown() {
|
||||
// @ts-ignore
|
||||
data.monthProductionScraps.map((item,index)=>{
|
||||
let arrInner = [];
|
||||
arrInner.push(index+1,item.sectionName,item.scrapNum);
|
||||
arrInner.push(index+1,item.sectionName,item.scrapNum || 0);
|
||||
arr3.push(arrInner);
|
||||
dataProps3.push(item.scrapNum);
|
||||
xData3.push(item.sectionName);
|
||||
dataProps3.push(item.scrapNum || 0);
|
||||
})
|
||||
}else{
|
||||
dataProps3 = []
|
||||
@@ -111,9 +116,9 @@ function LeftDown() {
|
||||
configDay.data = arr1;
|
||||
configWeek.data = arr2;
|
||||
configMonth.data = arr3;
|
||||
const options1 = getOptions(dataProps1,xData, color1);
|
||||
const options2 = getOptions(dataProps2,xData, color2);
|
||||
const options3 = getOptions(dataProps3,xData, color1);
|
||||
const options1 = getOptions(dataProps1,xData1, color1);
|
||||
const options2 = getOptions(dataProps2,xData2, color2);
|
||||
const options3 = getOptions(dataProps3,xData3, color1);
|
||||
return (
|
||||
<div className="left_down">
|
||||
<TitleBox title={"left_down"} />
|
||||
|
||||
@@ -54,21 +54,34 @@ function LeftUp() {
|
||||
})
|
||||
// @ts-ignore
|
||||
dataSource.day.xData = Object.keys(data.todayAllProductionScraps)
|
||||
dataSource.day.xData.map((item,index)=>{
|
||||
let sumIner = 0
|
||||
dataSource.day.xData.sort((a,b)=>{// 保证横坐标是有序的
|
||||
// @ts-ignore
|
||||
data.todayAllProductionScraps[item].map((itemInner,indexInner)=>{
|
||||
sumIner += itemInner.scrapNum
|
||||
dataSource.day.series.map((itemSeries,indexSeries)=>{
|
||||
const lastDigitA = parseInt(a[a.length - 1], 10);
|
||||
// @ts-ignore
|
||||
const lastDigitB = parseInt(b[b.length - 1], 10);
|
||||
return lastDigitA - lastDigitB;
|
||||
})
|
||||
for (let k = 0; k < dataSource.day.xData.length; k++) {
|
||||
let item = dataSource.day.xData[k];
|
||||
let sumIner = 0
|
||||
for(let i = 0;i < dataSource.day.series.length;i++){
|
||||
let itemSeries = dataSource.day.series[i]
|
||||
// @ts-ignore
|
||||
data.todayAllProductionScraps[item].map((itemInner,indexInner)=>{
|
||||
// @ts-ignore
|
||||
if (itemSeries.name === itemInner.sectionName) {
|
||||
if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) {
|
||||
// @ts-ignore
|
||||
itemSeries.data.push(itemInner.scrapNum)
|
||||
itemSeries.data.push(itemInner.scrapNum || 0)
|
||||
sumIner += itemInner.scrapNum || 0
|
||||
return
|
||||
}
|
||||
})
|
||||
})
|
||||
if (itemSeries.data.length === k) {
|
||||
itemSeries.data.push(0)
|
||||
}
|
||||
}
|
||||
sum.push(sumIner)
|
||||
})
|
||||
}
|
||||
dataSource.day.series.push({
|
||||
data: sum,
|
||||
type: "bar",
|
||||
@@ -109,21 +122,34 @@ function LeftUp() {
|
||||
})
|
||||
// @ts-ignore
|
||||
dataSource.week.xData = Object.keys(data.weekAllProductionScraps)
|
||||
dataSource.week.xData.map((item,index)=>{
|
||||
let sumIner = 0
|
||||
dataSource.week.xData.sort((a,b)=>{// 保证横坐标是有序的
|
||||
// @ts-ignore
|
||||
data.weekAllProductionScraps[item].map((itemInner,indexInner)=>{
|
||||
sumIner += itemInner.scrapNum
|
||||
dataSource.week.series.map((itemSeries,indexSeries)=>{
|
||||
const lastDigitA = parseInt(a[a.length - 1], 10);
|
||||
// @ts-ignore
|
||||
const lastDigitB = parseInt(b[b.length - 1], 10);
|
||||
return lastDigitA - lastDigitB;
|
||||
})
|
||||
for (let k = 0; k < dataSource.week.xData.length; k++) {
|
||||
let item = dataSource.week.xData[k];
|
||||
let sumIner = 0
|
||||
for(let i = 0;i < dataSource.week.series.length;i++){
|
||||
let itemSeries = dataSource.week.series[i]
|
||||
// @ts-ignore
|
||||
data.weekAllProductionScraps[item].map((itemInner,indexInner)=>{
|
||||
// @ts-ignore
|
||||
if (itemSeries.name === itemInner.sectionName) {
|
||||
if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) {
|
||||
// @ts-ignore
|
||||
itemSeries.data.push(itemInner.scrapNum)
|
||||
itemSeries.data.push(itemInner.scrapNum || 0)
|
||||
sumIner += itemInner.scrapNum || 0
|
||||
return
|
||||
}
|
||||
})
|
||||
})
|
||||
if (itemSeries.data.length === k) {
|
||||
itemSeries.data.push(0)
|
||||
}
|
||||
}
|
||||
sum.push(sumIner)
|
||||
})
|
||||
}
|
||||
dataSource.week.series.push({
|
||||
data: sum,
|
||||
type: "bar",
|
||||
@@ -164,21 +190,34 @@ function LeftUp() {
|
||||
})
|
||||
// @ts-ignore
|
||||
dataSource.month.xData = Object.keys(data.monthAllProductionScraps)
|
||||
dataSource.month.xData.map((item,index)=>{
|
||||
let sumIner = 0
|
||||
dataSource.month.xData.sort((a,b)=>{// 保证横坐标是有序的
|
||||
// @ts-ignore
|
||||
data.monthAllProductionScraps[item].map((itemInner,indexInner)=>{
|
||||
sumIner += itemInner.scrapNum
|
||||
dataSource.month.series.map((itemSeries,indexSeries)=>{
|
||||
const lastDigitA = parseInt(a[a.length - 1], 10);
|
||||
// @ts-ignore
|
||||
const lastDigitB = parseInt(b[b.length - 1], 10);
|
||||
return lastDigitA - lastDigitB;
|
||||
})
|
||||
for (let k = 0; k < dataSource.month.xData.length; k++) {
|
||||
let item = dataSource.month.xData[k];
|
||||
let sumIner = 0
|
||||
for(let i = 0;i < dataSource.month.series.length;i++){
|
||||
let itemSeries = dataSource.month.series[i]
|
||||
// @ts-ignore
|
||||
data.monthAllProductionScraps[item].map((itemInner,indexInner)=>{
|
||||
// @ts-ignore
|
||||
if (itemSeries.name === itemInner.sectionName) {
|
||||
if (itemInner.sectionName.indexOf(itemSeries.name)!==-1) {
|
||||
// @ts-ignore
|
||||
itemSeries.data.push(itemInner.scrapNum)
|
||||
itemSeries.data.push(itemInner.scrapNum || 0)
|
||||
sumIner += itemInner.scrapNum || 0
|
||||
return
|
||||
}
|
||||
})
|
||||
})
|
||||
if (itemSeries.data.length === k) {
|
||||
itemSeries.data.push(0)
|
||||
}
|
||||
}
|
||||
sum.push(sumIner)
|
||||
})
|
||||
}
|
||||
dataSource.month.series.push({
|
||||
data: sum,
|
||||
type: "bar",
|
||||
@@ -198,6 +237,7 @@ function LeftUp() {
|
||||
dataSource.month.series = []
|
||||
}
|
||||
const options = getOptions(chartData);
|
||||
console.log('dataSource',dataSource)
|
||||
return (
|
||||
<div className="left_up">
|
||||
<TitleBox title={"left_up"} />
|
||||
|
||||
Reference in New Issue
Block a user