From a363af9f457b46da3f6052795e69e6fda23a27be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Tue, 12 Jul 2022 14:53:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/broad/box.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 3424800..73320fd 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -351,7 +351,7 @@ let demo = [] demo.push([1, 2, 3, 4, 5]) const planWorkOrderTable = new AutoScrollTable(document.getElementById("plan-work-order"), planWorkOrderColumns, {width: ['30%', null, null, null, '17%']}) - const planTable = new AutoScrollTable(document.getElementById("plan-table"), planWorkOrderColumns, { + const planTable = new AutoScrollTable(document.getElementById("plan-table"), [], { width: ['15%', '5%', null, null, null, null, null, null, null, null, null, null, null, null, null, null, "5%", "5%", "5%"], caption: "生产计划统计", scrollInfo: demo From c8fb10d359ba5ae3cbd2fb32291a1137512429f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Wed, 13 Jul 2022 09:44:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/broad/box.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 73320fd..3b30b45 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -419,12 +419,12 @@ autoUpdate('/broad/box/selectOutputByType', INTERVAL, data => { statByType.setOption({ xAxis: { - data: data['xAxisInfo'].map(value => value), + data: data.map(value => value.name), }, series: [ { name: '数量', - data: data['seriesInfo'], + data: data.map(value => value.qty), }, // { // name: '数量_', @@ -505,7 +505,8 @@ { type: 'category', axisTick: { - alignWithLabel: true + alignWithLabel: true, + interval:0, }, axisLabel: { color: '#ffffff', From ea82723642a6e52c8227ac43aab9d8d94818e0cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Wed, 13 Jul 2022 09:56:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/templates/broad/box.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/broad/box.html b/ruoyi-admin/src/main/resources/templates/broad/box.html index 3b30b45..bffaaf0 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/box.html +++ b/ruoyi-admin/src/main/resources/templates/broad/box.html @@ -426,23 +426,19 @@ name: '数量', data: data.map(value => value.qty), }, - // { - // name: '数量_', - // data: data['seriesInfo'], - // } ] }) }) - autoUpdate('/system/UShellMes/getHourOutPut', INTERVAL, data => { + autoUpdate('/broad/box/selectOutputByTime', INTERVAL, data => { statByHour.setOption({ xAxis: { - data: data['xAxisInfo'], + data: data.map(value => value.name), }, series: [ { name: '数量', - data: data['seriesInfo'], + data: data.map(value => value.qty), }, // { // name: '数量_',