From a076e6d07985015e80b430d8d1172a46f1754933 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Tue, 14 May 2024 10:02:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=96=91=E4=BC=BC{}=E5=BC=95=E5=8F=91?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/zh-CN.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index cef9baca..beeee24b 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1543,7 +1543,7 @@ export default {
         distributeUser:'分配用户',
         roleMark:'角色说明',
         menu:'菜单权限',
-        roleKeyTip:"权限标识示例:dba 控制器中使用权限标识，如： @PreAuthorize({ hasRoles: ['dba'] })",
+        roleKeyTip:"权限标识示例:dba 控制器中使用权限标识，如： '@PreAuthorize({ hasRoles: [dba] })'",
         openSwitch:'展开/折叠',
         selAllSwitch:'全选/全不选',
         relationSwitch:'节点联动',

From 3b793c107c4de50cdb245a847612df1f38b69e9b Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 14 May 2024 12:01:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E8=A7=92=E8=89=B2=E9=94=AE?=
 =?UTF-8?q?=E5=80=BC=E8=BE=93=E5=85=A5=E6=8F=90=E7=A4=BA=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/locales/en-US.ts | 2 +-
 src/i18n/locales/zh-CN.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locales/en-US.ts b/src/i18n/locales/en-US.ts
index cdb464ce..a8ffc188 100644
--- a/src/i18n/locales/en-US.ts
+++ b/src/i18n/locales/en-US.ts
@@ -1543,7 +1543,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',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index beeee24b..b22f8142 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -1543,7 +1543,7 @@ export default {
         distributeUser:'分配用户',
         roleMark:'角色说明',
         menu:'菜单权限',
-        roleKeyTip:"权限标识示例:dba 控制器中使用权限标识，如： '@PreAuthorize({ hasRoles: [dba] })'",
+        roleKeyTip:"权限标识用于控制页面控件或路由接口",
         openSwitch:'展开/折叠',
         selAllSwitch:'全选/全不选',
         relationSwitch:'节点联动',

From 9b4bbcedc5222cb8a918a1d94d8b56ff1883a94a Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Tue, 14 May 2024 14:47:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E9=BB=84=E9=87=91=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=A1=B9=E6=95=B0=E6=8D=AE=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=B4=AF=E7=A7=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/perfManage/goldTarget/index.vue | 25 +++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/views/perfManage/goldTarget/index.vue b/src/views/perfManage/goldTarget/index.vue
index dd32b9b5..5ce183ff 100644
--- a/src/views/perfManage/goldTarget/index.vue
+++ b/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'],
+    }
+  );
 }
 
 /**图表折线显示全部 */