diff --git a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js index a8bf562..dce895a 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js +++ b/ruoyi-admin/src/main/resources/static/js/board/beforeLibrary.js @@ -46,8 +46,8 @@ $(() => { }), document.getElementById("distributionOfBadTypesInProductionLineByDay")); barChartAndLineChart(data.map(val => { return { - xName: data.map(value => value.name), - yDataTwo: data.map(value => value.qty), + xName: data.map(val => val.name), + yDataTwo: data.map(val => val.qty), yDataTwoName: "质量", } diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html index 0c0b50f..f0946fc 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/fp.html +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -38,14 +38,14 @@ left: 3.4%; } - /*#bottom-left { + #bottom-left { position: absolute; - border: 1px solid red; + border: 0px solid red; width: 68%; height: 29.6%; top: 66.4%; left: 3.5%; - }*/ + } #top-mid { position: absolute; @@ -193,18 +193,6 @@ padding-bottom: 0.3%; } - .my-transition { - position: absolute; - border: 0px solid red; - width: 68%; - height: 29.6%; - top: 66.4%; - left: 3.5%; - - /*transform: scale(0.5, 0.5);*/ - /*opacity: 0;*/ - transition: transform 0.5s linear, opacity 0.5s linear; - } .my-transition2 { position: absolute; @@ -474,7 +462,7 @@ headerBGC: 'rgba(8,36,75,0.2)', oddRowBGC: 'rgba(8,36,75,0.2)', evenRowBGC: 'rgba(6,25,57,0.2)', - colWidth: ['70%', '15%', '15%',] + colWidth: ["5%", '10%', "7%", "5%", "5%", "5%", "8%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%", "4.2%"] }); // orderInf.loadData(data, Object.keys(orderInfColumns)) // let consolidatedRow = ["", "合计", ""]