Merge remote-tracking branch 'gitee/master'

ruoyi-admin/src/main/resources/static/js/echartsCommon.js

@@ -2005,6 +2005,7 @@ const multipleVerticalBarChartTwo = function (data, id, rotate = 0, unit = '',ma
                     focus: 'series'
                 },
                 barWidth: '30%',
+                barMaxWidth: '50px',
                 itemStyle: {
                     //图形样式
                     normal: {
@@ -2029,6 +2030,7 @@ const multipleVerticalBarChartTwo = function (data, id, rotate = 0, unit = '',ma
                     focus: 'series'
                 },
                 barWidth: '30%',
+                barMaxWidth: '50px',
                 barGap: '40%',
                 label: {
                     show: true,

ruoyi-admin/src/main/resources/templates/broad/fp.html

@@ -538,7 +538,7 @@
             classes = data[`班组`]
         })
         // 生产统计数据
-        autoUpdate('/broad/fp/selectStationHourInfo', INTERVAL, data => {
+        autoUpdate( classes == 0 ?'/broad/fp/selectOrderExecutionDay' : '/broad/fp/selectStationHourInfo', INTERVAL, data => {
             tableData = data
             let dataOne = []
             if (isFirst) {