Merge remote-tracking branch 'origin/main' into lichang

src/views/perfManage/goldTarget/index.vue

@@ -469,18 +469,25 @@ function fnRanderChartData() {
     }
   }
   // console.log(queryParams.sortOrder, chartLegendSelected);
-  // console.log(chartDataXAxisData, chartDataYSeriesData)
+  // console.log(chartDataXAxisData, chartDataYSeriesData);
 
   // 绘制图数据
-  kpiChart.value.setOption({
-    legend: {
-      selected: chartLegendSelected,
+  kpiChart.value.setOption(
+    {
+      legend: {
+        selected: chartLegendSelected,
+      },
+      xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: chartDataXAxisData,
+      },
+      series: chartDataYSeriesData,
     },
-    xAxis: {
-      data: chartDataXAxisData,
-    },
-    series: chartDataYSeriesData,
-  });
+    {
+      replaceMerge: ['xAxis', 'series'],
+    }
+  );
 }
 
 /**图表折线显示全部 */