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

src/i18n/locales/en-US.ts

@@ -1559,7 +1559,7 @@ export default {
         distributeUser:'Assign Users',
         roleMark:'Role Description',
         menu:'Menu Permissions',
-        roleKeyTip:"Example of permission identification: Use permission identification in dba controller, such as: @PreAuthorize({ hasRoles: ['dba'] })",
+        roleKeyTip:"Privilege identifiers are used to control page controls or routing interfaces",
         openSwitch:'Expand/Collapse',
         selAllSwitch:'Select All/Deselect All',
         relationSwitch:'Node Linkage',

src/i18n/locales/zh-CN.ts

@@ -1559,7 +1559,7 @@ export default {
         distributeUser:'分配用户',
         roleMark:'角色说明',
         menu:'菜单权限',
-        roleKeyTip:"权限标识示例:dba 控制器中使用权限标识，如： @PreAuthorize({ hasRoles: ['dba'] })",
+        roleKeyTip:"权限标识用于控制页面控件或路由接口",
         openSwitch:'展开/折叠',
         selAllSwitch:'全选/全不选',
         relationSwitch:'节点联动',

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'],
+    }
+  );
 }
 
 /**图表折线显示全部 */