Merge remote-tracking branch 'origin/master'

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

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

@@ -393,8 +393,8 @@
         })
     }
 
-    const rowName1 = '内胆积存库'
+    const rowName1 = '内胆集存库'
-    const rowName2 = '围板积存库'
+    const rowName2 = '箱壳集存库'
     $(() => {
         let url = '/broad/box'
         //生产计划工单
@@ -519,6 +519,7 @@
                 },
                 axisLabel: {
                     color: '#ffffff',
+                    // fontSize:0.6 * vw,
                     interval:0,
                 },
                 splitLine: {
@@ -567,7 +568,7 @@
         ],
         series: [
             {
-                name: '内胆积存库',
+                name: '内胆集存库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {
@@ -599,7 +600,7 @@
                 },
             },
             {
-                name: '围板积存库',
+                name: '箱壳集存库',
                 type: 'bar',
                 barWidth: '20rem',
                 itemStyle: {