diff --git a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js index 4c31091..4ac065b 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js +++ b/ruoyi-admin/src/main/resources/static/js/board/finalAssemblyProductionData.js @@ -64,7 +64,7 @@ $(() => { arr[8] = Math.ceil(target.topTips / 22) arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - target.topTips) target.top = arr - // target.topProgress = arr.reduce((val1, val2) => val1 + val2, 0) + target.topProgress = arr.slice(0,data.length).reduce((val1, val2) => val1 + val2, 0) target.topProgress = 399 for (let i = 0; i < 12; i++) { xName.push(`${(oneTime + i) % 24}:30`) @@ -78,9 +78,9 @@ $(() => { arr[13] = Math.ceil(target.topTips / 46) arr[0] = arr[0] - (arr.reduce((val1, val2) => val1 + val2, 0) - target.topTips) target.top = arr - // target.topProgress = arr.reduce((val1, val2) => val1 + val2, 0) + target.topProgress = arr.slice(0,data.length).reduce((val1, val2) => val1 + val2, 0) - target.topProgress = 399 + // target.topProgress = 399 xName = ['0:00','1:00','2:00','3:00','4:00','5:00','6:00','7:00','8:00','9:00','10:00','11:00','12:00','13:00','14:00','15:00','16:00','17:00','18:00','19:00','20:00','21:00','22:00','23:00'] } barChartAndLineChartThree({ @@ -160,7 +160,7 @@ let isFirst = true let target = { top: [], bottom: [3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3], - topTips: 2000, + topTips: 0, bottomTips: 3.05, topProgress: 0, topReality: 0,