diff --git a/ruoyi-admin/src/main/resources/templates/broad/fp.html b/ruoyi-admin/src/main/resources/templates/broad/fp.html index cbc18a7..dd973f2 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/fp.html +++ b/ruoyi-admin/src/main/resources/templates/broad/fp.html @@ -453,18 +453,18 @@ } // 当班计划/实际产量/当班差异 - autoUpdate('/broad/fp/selectFpOrderInfo', INTERVAL, data => { - // let p = [data[1], data[0][2], data[0][3]] - let p = [data.planned_number, data.quantity_number, data.planned_number - data.quantity_number] - - for (let i in p) { - updateSplitBlocks(p[i], selectors[i]) - } - }) -let a = [ - {name :'当班计划',qty:'123'}, - {name :'实际产量',qty:'123'}, -] + // autoUpdate('/broad/fp/selectFpOrderInfo', INTERVAL, data => { + // // let p = [data[1], data[0][2], data[0][3]] + // let p = [data.planned_number, data.quantity_number, data.planned_number - data.quantity_number] + // + // for (let i in p) { + // updateSplitBlocks(p[i], selectors[i]) + // } + // }) + // let a = [ + // {name: '当班计划', qty: '123'}, + // {name: '实际产量', qty: '123'}, + // ] // 生产统计数据 autoUpdate('/broad/fp/selectStationHourInfo', INTERVAL, data => { $('#bottom-left').remove() @@ -581,7 +581,7 @@ let a = [ xAxis: { data: data.map(val => val.name), axisLabel: { - interval:0, + interval: 0, // rotate: -30, }, }, @@ -662,7 +662,7 @@ let a = [ axisLabel: { color: '#ffffff', fontSize: '10', - interval:0, + interval: 0, rotate: -30, }, }, @@ -733,9 +733,9 @@ let a = [ type: 'category', axisLabel: { fontSize: '10px', - interval:0, + interval: 0, color: '#ffffff', - rotate:-30, + rotate: -30, } }, yAxis: { @@ -857,7 +857,7 @@ let a = [ }, axisLabel: { show: true, - interval:0, + interval: 0, }, axisTick: { show: true, @@ -873,7 +873,7 @@ let a = [ color: 'rgba(219,225,255,1)' }, axisLabel: { - interval:0, + interval: 0, textStyle: { color: "rgba(219,225,255,1)", margin: 15 diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index b9f6fa7..4ec1037 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -209,19 +209,19 @@ group by MATERIAL_NAME