Merge remote-tracking branch 'gitee/master'

# Conflicts:
#	ruoyi-admin/src/main/resources/templates/broad/box.html

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
@@ -419,30 +419,26 @@
         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: '数量_',
-                    //     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: '数量_',
@@ -506,7 +502,7 @@
                 type: 'category',
                 axisTick: {
                     alignWithLabel: true,
-                    interval:0
+                    interval:0,
                 },
                 axisLabel: {
                     color: '#ffffff',
@@ -557,7 +553,7 @@
         ],
         series: [
             {
-                name: '内胆积存库',
+                name: '内胆库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {
@@ -589,7 +585,7 @@
                 },
             },
             {
-                name: '围板积存库',
+                name: '箱体壳',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {