Merge remote-tracking branch 'origin/master'

value

2023-08-29 4adc7c77ffa7fa3e5758814ebe928b0befddbb7d

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env.development

 src/views/chart/work/index.vue

@@ -326,6 +326,9 @@
              axisPointer: {
                type: 'shadow'
              },
              nameTextStyle:{
                padding:20
              }
            }
          ],
          yAxis: [
@@ -374,7 +377,7 @@
                  return value + ' %';
                }
              },
              data: [{value:20},{value:40}],
              data: data2,
              itemStyle: {
                color: '#d2eec5'
              }