chore: sync local changes before merging huangzhenbao-admin

components/analytics/AnalyticsComboChart.uvue

@@ -129,7 +129,7 @@ export default {
             let result = params[0].name + '<br/>'
             for (let i = 0; i < params.length; i++) {
               const p = params[i]
-              if (p.seriesName === 'GMV') {
+              if (p.seriesName === '订单金额' || p.seriesName === 'GMV') {
                 const val = Number(p.value)
                 const formatted = val >= 10000 ? (val / 10000).toFixed(1) + '万' : val.toFixed(0)
                 result += `${p.marker} ${p.seriesName}: ¥${formatted}<br/>`
@@ -142,11 +142,11 @@ export default {
         },
         legend: { 
           top: 8, 
-          left: 8, 
+          left: 'center', 
           itemWidth: 10, 
           itemHeight: 10, 
           textStyle: { fontSize: 12 },
-          data: ['GMV', '订单数'],
+          data: ['订单金额', '订单数'],
           bottom: 'auto'
         },
         xAxis: {
@@ -156,15 +156,14 @@ export default {
           axisLine: { lineStyle: { color: 'rgba(0,0,0,0.12)' } },
           axisLabel: {
             color: 'rgba(0,0,0,0.55)',
-            rotate: x.length > 12 ? 45 : 0,
-            // 数据量大时不要强制全部展示，否则会全部重叠
-            interval: x.length > 60 ? 'auto' : 0
+            rotate: x.length > 20 ? 45 : 0,
+            interval: x.length > 15 ? 1 : 0
           }
         },
         yAxis: [
           {
             type: 'value',
-            name: 'GMV（元）',
+            name: '金额',
             position: 'left',
             axisLine: { show: false },
             splitLine: { lineStyle: { color: 'rgba(0,0,0,0.06)' } },
@@ -172,7 +171,7 @@ export default {
               color: 'rgba(0,0,0,0.55)',
               formatter: (value: number) => {
                 if (value >= 10000) {
-                  return (value / 10000).toFixed(1) + '万'
+                  return (value / 10000).toFixed(0) + '万'
                 }
                 return String(Math.round(value))
               }
@@ -180,7 +179,7 @@ export default {
           },
           {
             type: 'value',
-            name: '订单数',
+            name: '数量',
             position: 'right',
             alignTicks: true,
             axisLine: { show: false },
@@ -193,14 +192,14 @@ export default {
         ],
         series: [
           {
-            name: 'GMV',
+            name: '订单金额',
             type: 'bar',
             yAxisIndex: 0,
             data: bar,
             barMaxWidth: 14,
             barCategoryGap: '35%',
             itemStyle: { 
-              borderRadius: [6, 6, 0, 0],
+              borderRadius: [2, 2, 0, 0],
               color: '#3b82f6'
             }
           },
@@ -209,7 +208,7 @@ export default {
             type: 'line',
             yAxisIndex: 1,
             data: line,
-            smooth: true,
+            smooth: false,
             symbol: 'circle',
             symbolSize: 6,
             lineStyle: {