diff --git a/productionboard/src/main/resources/static/js/aluminumLiner/index.js b/productionboard/src/main/resources/static/js/aluminumLiner/index.js index 4618190..07e3562 100644 --- a/productionboard/src/main/resources/static/js/aluminumLiner/index.js +++ b/productionboard/src/main/resources/static/js/aluminumLiner/index.js @@ -39,13 +39,11 @@ $(() => { dataType: 'JSON', success: function (res) { let Res = {} - console.log(res) Res.data=res.map(val => { return [val.spe,val.oq,val.aq,val.cha,val.round,] }) Res.header = ['型号', '计划数', '完成数', '差异数', '执行进度'] - console.log(Res) dynamicTable({ el: '#productionPlan', rowNum: 5, @@ -62,7 +60,6 @@ $(() => { }); }, error: function (e) { - console.log(e) } }); tableAnimation('#productionPlan') diff --git a/productionboard/src/main/resources/static/js/aluminumTank/index.js b/productionboard/src/main/resources/static/js/aluminumTank/index.js index 133dc3b..f2dffd7 100644 --- a/productionboard/src/main/resources/static/js/aluminumTank/index.js +++ b/productionboard/src/main/resources/static/js/aluminumTank/index.js @@ -16,6 +16,7 @@ $(()=>{ //库存统计 $.getJSON('/aluminumTank/getMaterialStoreJson', function (result) { + console.log(result) multipleThreeDimensionalCylindrical(result,document.getElementById("inventoryStatistics")); }); }) diff --git a/productionboard/src/main/resources/static/js/common/echarts.common.js b/productionboard/src/main/resources/static/js/common/echarts.common.js index b67df25..80ab7ca 100644 --- a/productionboard/src/main/resources/static/js/common/echarts.common.js +++ b/productionboard/src/main/resources/static/js/common/echarts.common.js @@ -55,7 +55,6 @@ const horizontalBarChart = (res, ids) => { let values = []; - function dataFormat(data) { let arr = []; data.forEach(function (item, i) { @@ -174,10 +173,9 @@ const horizontalBarChart = (res, ids) => { fontSize: 12, color: "#A8A6AB", textBorderWidth: 2, - position:'insideTopLeft', + position: 'insideTopLeft', padding: [-20, 0, 0, 0], - formatter:function (params) { - console.log(dataFormat(xValue)[params[`dataIndex`]]) + formatter: function (params) { return dataFormat(xValue)[params[`dataIndex`]].value } }, @@ -566,7 +564,6 @@ const threeDimensionalCylindrical = (res, ids) => { //多个折线面积图 const multipleBrokenLineAreaDiagram = (res, ids) => { let mycharts = echarts.init(ids); - console.log(res); let option = { tooltip: { @@ -1172,15 +1169,15 @@ const bluePolygonHistogram = (res, ids) => { //多个立体柱状图 const multipleThreeDimensionalCylindrical = (res, ids) => { let mycharts = echarts.init(ids); - const xValue = res.map(val => val.materialName) - const lineStoreAmount = res.map(val => val.lineStoreAmount) - const hullStoreAmount = res.map(val => val.hullStoreAmount) + const xValue = res.map(val => val.materialName?.split(',')[0] || ' ') + const lineStoreAmount = res.map(val => val.lineStoreAmount) || [] + const hullStoreAmount = res.map(val => val.hullStoreAmount || '0') let lineColor = "#406A92"; let labelColor = "#fff"; let fontSize = "12"; let lineWidth = 1; let isDataZoom = xValue.length > 3 - let stepSize = 20 + let stepSize = 1 / (xValue.length / 3) * 100 // hullStoreAmount.forEach((val, index) => { // if (val == 0) { // hullStoreAmount[index] = 0 @@ -1228,6 +1225,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { lineHeight: 20, }, axisLabel: { + interval:0, color: labelColor, fontSize: fontSize, margin: 30, @@ -1519,7 +1517,7 @@ const multipleThreeDimensionalCylindrical = (res, ids) => { }; if (isDataZoom) { option.dataZoom.push({ - show:false, + show: false, type: 'slider', start: 0, end: stepSize, @@ -1710,8 +1708,9 @@ const inventory = (res, ids) => { let barBottomColor = [ "rgba(2,195,241,0.1)", ]; - const xAxisData = res.map(val => val.materialName) + const xAxisData = res.map(val => val.materialName?.split(',')[0] ) const seriesData1 = res.map(val => val.lineStoreAmount) + console.log(xAxisData,seriesData1) // Res.forEach((item) => { // xAxisData.push(item.name); // seriesData1.push(item.value); @@ -2378,8 +2377,8 @@ const energyConsumption = (res, ids) => { return value + ' °C'; } }, - lineStyle:{ - color:'#45b685' + lineStyle: { + color: '#45b685' }, data: yAxisDataTwo, }, diff --git a/productionboard/src/main/resources/static/js/common/scrollTable.js b/productionboard/src/main/resources/static/js/common/scrollTable.js index 9520df9..2f47b3a 100644 --- a/productionboard/src/main/resources/static/js/common/scrollTable.js +++ b/productionboard/src/main/resources/static/js/common/scrollTable.js @@ -213,7 +213,6 @@ let dynamicTable = resource => { } else { for (let i = 0; i < colWidth.length; i++) { let emptyUnitColWidth = emptyUnit(colWidth[i]); - console.log(emptyUnitColWidth) $(`${ele}>.table>.thead>.tr>.th:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`); $(`${ele}>.table>.tbody>.tr>.td:nth-child(${i+1})`).width(`${emptyUnitColWidth}%`); } diff --git a/productionboard/src/main/resources/static/js/common/synthetic.js b/productionboard/src/main/resources/static/js/common/synthetic.js index 4947541..ef92502 100644 --- a/productionboard/src/main/resources/static/js/common/synthetic.js +++ b/productionboard/src/main/resources/static/js/common/synthetic.js @@ -13,7 +13,6 @@ const dataInformationFunction = (statusArray) => { $("#dataInformation").append(info); } const synthetic = (statusArray,param={a:0,b:0}) => { - console.log(statusArray); let info = `
${statusArray[0] || 0} |