diff --git a/.changeset/thirty-mayflies-look.md b/.changeset/thirty-mayflies-look.md new file mode 100644 index 0000000000..e56a44d5de --- /dev/null +++ b/.changeset/thirty-mayflies-look.md @@ -0,0 +1,5 @@ +--- +"@scow/mis-web": patch +--- + +修正了 mis 系统下平台数据统计横坐标的表现形式 diff --git a/apps/mis-web/src/i18n/en.ts b/apps/mis-web/src/i18n/en.ts index 7db5f2d295..f13fed1b43 100644 --- a/apps/mis-web/src/i18n/en.ts +++ b/apps/mis-web/src/i18n/en.ts @@ -1107,8 +1107,8 @@ export default { topTenSubmitJobUser: "Top 10 Submit Job User", newJobCount: "New Job Count", systemFeatureUsageCount: "System Feature Usage Count", - portalFeatureUsageCount: "Portal Feature Usage Count", - misFeatureUsageCount: "MIS Feature Usage Count", + topTenPortalFeatureUsageCount: "Portal Feature Usage Count Top Ten", + topTenMisFeatureUsageCount: "MIS Feature Usage Count Top Ten", jobCount: "Job Count", usageCount:"count", userName: "User Name", diff --git a/apps/mis-web/src/i18n/zh_cn.ts b/apps/mis-web/src/i18n/zh_cn.ts index ad907817cc..096da17914 100644 --- a/apps/mis-web/src/i18n/zh_cn.ts +++ b/apps/mis-web/src/i18n/zh_cn.ts @@ -1105,8 +1105,8 @@ export default { topTenSubmitJobUser: "作业提交用户Top10", newJobCount: "新增作业数", systemFeatureUsageCount: "系统使用量", - portalFeatureUsageCount: "门户系统使用功能次数", - misFeatureUsageCount: "管理系统使用功能次数", + topTenPortalFeatureUsageCount: "门户系统使用功能次数Top10", + topTenMisFeatureUsageCount: "管理系统使用功能次数Top10", jobCount: "作业数", usageCount:"次数", userName: "用户名", diff --git a/apps/mis-web/src/pageComponents/admin/DataBarChart.tsx b/apps/mis-web/src/pageComponents/admin/DataBarChart.tsx index 22a01c597e..e2fc99a131 100644 --- a/apps/mis-web/src/pageComponents/admin/DataBarChart.tsx +++ b/apps/mis-web/src/pageComponents/admin/DataBarChart.tsx @@ -62,8 +62,6 @@ export const DataBarChart: React.FC = ({ return roundedValue.toString(); }; - console.log(title); - return ( {isLoading ? : ( @@ -81,9 +79,8 @@ export const DataBarChart: React.FC = ({ padding={{ left: 20, right: 20 }} label={{ value: xLabel, position: "insideBottom", offset: 0 }} interval={0} - height={(title.includes("系统使用功能次数") || title.includes("Feature Usage Count")) ? 80 : 40} - tick={(title.includes("系统使用功能次数") || title.includes("Feature Usage Count")) ? - : true} + height={ 80 } + tick={ } /> u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) bordered={false} > - + u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) toolTipFormatter={amountToolTipFormatter} /> - + ({ x: d.date.format("YYYY-MM-DD"), @@ -456,7 +456,7 @@ requireAuth((u) => u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) - + u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) toolTipFormatter={amountToolTipFormatter} /> - + ({ x: d.date.format("YYYY-MM-DD"), @@ -492,7 +492,7 @@ requireAuth((u) => u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) bordered={false} > - + u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) toolTipFormatter={(value) => [value, t(p("jobCount"))]} /> - + ({ x: d.date.format("YYYY-MM-DD"), @@ -526,24 +526,24 @@ requireAuth((u) => u.platformRoles.includes(PlatformRole.PLATFORM_ADMIN)) bordered={false} > - + ({ + data={portalUsageCountData.slice(0, 10).map((d) => ({ x: OperationTypeTexts[d.operationType], y: d.count, }))} - title={t(p("portalFeatureUsageCount"))} + title={t(p("topTenPortalFeatureUsageCount"))} toolTipFormatter={(value) => [value, t(p("usageCount"))]} isLoading={portalUsageCountLoading} /> - + ({ + data={misUsageCountData.slice(0, 10).map((d) => ({ x: OperationTypeTexts[d.operationType], - y:d.count, + y: d.count, }))} - title={t(p("misFeatureUsageCount"))} + title={t(p("topTenMisFeatureUsageCount"))} toolTipFormatter={(value) => [value, t(p("usageCount"))]} isLoading={misUsageCountLoading} />