Skip to content

Commit 9572c41

Browse files
Dot-LiuDot-Liu
committed
Merge remote-tracking branch 'github-pro/feature/1.8-cx' into feature/liujian-1.8
2 parents fef49eb + c0dc5bc commit 9572c41

9 files changed

Lines changed: 88 additions & 32 deletions

File tree

‎frontend/packages/common/src/locales/keyHashMap.json‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -673,20 +673,19 @@
673673
"暂无数据": "Kf8525cf2",
674674
"输入 Token": "K33bc1ad1",
675675
"输出 Token": "Ke00ff18b",
676-
"总 Token": "K81140e5b",
677676
"订阅数量": "Ke04bc00d",
678677
"已开启": "K1b97ae0a",
679678
"开启 MCP": "K19ec733b",
680679
"API 使用排名": "Kbee2340",
681680
"消费者使用排名": "Kf6af1f40",
682-
"请求数": "K318a7519",
683-
"流量": "K53eb7414",
681+
"请求次数": "K9d3f2d9d",
682+
"网络流量": "Ke2241377",
684683
"平均响应时间": "K7c8d5c23",
685-
"平均请求数": "K652843b0",
686-
"平均流量": "K8158a6e4",
687-
"Token": "K9ef68e3f",
688-
"平均 Token/s 统计": "K6c016898",
689-
"平均 Token/订阅者统计": "Kf5eeb9c5",
684+
"平均每消费者的请求次数": "K6c267c7b",
685+
"平均每消费者的网络流量": "K133d4291",
686+
"Token 消耗": "K37c5f1d0",
687+
"平均 Token 消耗": "K10a8bee3",
688+
"平均每消费者的 Token 消耗": "Kb98264d4",
690689
"单位：ms，最小值：1": "K2a16c93b",
691690
"API 路由设置": "Ka945cfb1",
692691
"API 基础信息": "K2e050340",

‎frontend/packages/common/src/locales/scan/en-US.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,5 +966,11 @@
966966
"Kc8bf447": "Request Log",
967967
"Kf8525cf2": "No Data",
968968
"K1be06929": "Response Time",
969-
"K5e51f5d": "Timestamp"
969+
"K5e51f5d": "Timestamp",
970+
"K9d3f2d9d": "Requests",
971+
"Ke2241377": "Traffic",
972+
"K6c267c7b": "Avg Requests per Subscriber",
973+
"K133d4291": "Avg Traffic per Subscriber",
974+
"K37c5f1d0": "Token",
975+
"Kb98264d4": "Avg Token per Subscriber"
970976
}

‎frontend/packages/common/src/locales/scan/ja-JP.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,5 +988,11 @@
988988
"Kc8bf447": "リクエストログ",
989989
"Kf8525cf2": "データがありません",
990990
"K1be06929": "応答時間",
991-
"K5e51f5d": "タイムスタンプ"
991+
"K5e51f5d": "タイムスタンプ",
992+
"K9d3f2d9d": "リクエスト数",
993+
"Ke2241377": "ネットワークトラフィック",
994+
"K6c267c7b": "消費者あたりの平均リクエスト数",
995+
"K133d4291": "消費者あたりの平均ネットワークトラフィック",
996+
"K37c5f1d0": "トークン消費量",
997+
"Kb98264d4": "消費者あたりの平均トークン消費量"
992998
}

‎frontend/packages/common/src/locales/scan/zh-CN.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,5 +917,11 @@
917917
"Kc8bf447": "请求日志",
918918
"Kf8525cf2": "暂无数据",
919919
"K1be06929": "响应时间",
920-
"K5e51f5d": "时间"
920+
"K5e51f5d": "时间",
921+
"K9d3f2d9d": "请求次数",
922+
"Ke2241377": "网络流量",
923+
"K6c267c7b": "平均每消费者的请求次数",
924+
"K133d4291": "平均每消费者的网络流量",
925+
"K37c5f1d0": "Token 消耗",
926+
"Kb98264d4": "平均每消费者的 Token 消耗"
921927
}

‎frontend/packages/common/src/locales/scan/zh-TW.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -988,5 +988,11 @@
988988
"Kc8bf447": "請求日誌",
989989
"Kf8525cf2": "暫無資料",
990990
"K1be06929": "回應時間",
991-
"K5e51f5d": "時間"
991+
"K5e51f5d": "時間",
992+
"K9d3f2d9d": "請求次數",
993+
"Ke2241377": "網路流量",
994+
"K6c267c7b": "平均每位使用者的請求次數",
995+
"K133d4291": "平均每位使用者的網路流量",
996+
"K37c5f1d0": "Token 消耗",
997+
"Kb98264d4": "平均每位使用者的 Token 消耗"
992998
}

‎frontend/packages/core/src/pages/serviceOverview/charts/ServiceAreaChart.tsx‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ const ServiceAreaChart = ({ customClassNames, dataInfo, height, showAvgLine }: S
168168
type: 'dashed'
169169
},
170170
label: {
171+
show: false,
171172
position: 'insideEndTop',
172173
formatter: '{c}',
173174
color: '#000',
@@ -177,6 +178,14 @@ const ServiceAreaChart = ({ customClassNames, dataInfo, height, showAvgLine }: S
177178
borderRadius: 2,
178179
distance: -5
179180
},
181+
emphasis: {
182+
lineStyle: {
183+
width: 1 // 保持线条宽度不变，禁用默认的悬停加粗
184+
},
185+
label: {
186+
show: false // 悬停时不显示标签
187+
}
188+
},
180189
data: [{ type: 'average', name: 'Avg' }]
181190
} : undefined,
182191
areaStyle: {
@@ -202,7 +211,10 @@ const ServiceAreaChart = ({ customClassNames, dataInfo, height, showAvgLine }: S
202211
}
203212
]
204213
}
205-
setOption(option)
214+
const echartsInstance = chartRef.current?.getEchartsInstance()
215+
if (echartsInstance) {
216+
echartsInstance.setOption(option)
217+
}
206218
}
207219
// 使用深度监听来确保图表数据更新
208220
useEffect(() => {

‎frontend/packages/core/src/pages/serviceOverview/charts/ServiceBarChar.tsx‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ const ServiceBarChar = ({ customClassNames, dataInfo, height, showAvgLine, showL
240240
type: 'dashed'
241241
},
242242
label: {
243+
show: false,
243244
position: 'insideEndTop',
244245
formatter: '{c}',
245246
color: '#000',
@@ -249,6 +250,14 @@ const ServiceBarChar = ({ customClassNames, dataInfo, height, showAvgLine, showL
249250
borderRadius: 2,
250251
distance: -5
251252
},
253+
emphasis: {
254+
lineStyle: {
255+
width: 1 // 保持线条宽度不变，禁用默认的悬停加粗
256+
},
257+
label: {
258+
show: false // 悬停时不显示标签
259+
}
260+
},
252261
data: [{ type: 'average', name: 'Avg' }]
253262
}
254263
: undefined,
@@ -268,6 +277,7 @@ const ServiceBarChar = ({ customClassNames, dataInfo, height, showAvgLine, showL
268277
type: 'dashed'
269278
},
270279
label: {
280+
show: false,
271281
position: 'insideEndTop',
272282
formatter: '{c}',
273283
color: '#000',
@@ -277,6 +287,14 @@ const ServiceBarChar = ({ customClassNames, dataInfo, height, showAvgLine, showL
277287
borderRadius: 2,
278288
distance: -5
279289
},
290+
emphasis: {
291+
lineStyle: {
292+
width: 1 // 保持线条宽度不变，禁用默认的悬停加粗
293+
},
294+
label: {
295+
show: false // 悬停时不显示标签
296+
}
297+
},
280298
data: [{ type: 'average', name: 'Avg' }]
281299
}
282300
: undefined,
@@ -290,7 +308,10 @@ const ServiceBarChar = ({ customClassNames, dataInfo, height, showAvgLine, showL
290308
data: item.value
291309
}))
292310
}
293-
setOption(option)
311+
const echartsInstance = chartRef.current?.getEchartsInstance()
312+
if (echartsInstance) {
313+
echartsInstance.setOption(option)
314+
}
294315
}
295316

296317
// 使用深度监听来确保图表数据更新

‎frontend/packages/core/src/pages/serviceOverview/serviceOverview.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
112112
// 服务请求次数
113113
{
114114
...setBarChartInfoData({
115-
title: $t('请求数'),
115+
title: $t('请求次数'),
116116
data: serviceOverview.requestOverview,
117117
value: serviceOverview.requestTotal,
118118
date: serviceOverview.date
@@ -124,7 +124,7 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
124124
// 流量消耗总数
125125
{
126126
...setBarChartInfoData({
127-
title: $t('流量'),
127+
title: $t('网络流量'),
128128
data: serviceOverview.trafficOverview,
129129
value: serviceOverview.trafficTotal,
130130
date: serviceOverview.date
@@ -149,15 +149,15 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
149149
},
150150
// 平均请求
151151
setBarChartInfoData({
152-
title: $t('平均请求数'),
152+
title: $t('平均每消费者的请求次数'),
153153
data: serviceOverview.avgRequestPerSubscriberOverview,
154154
value: serviceOverview.avgRequestPerSubscriber,
155155
date: serviceOverview.date,
156156
showXAxis: false
157157
}),
158158
// 平均流量消耗
159159
setBarChartInfoData({
160-
title: $t('平均流量'),
160+
title: $t('平均每消费者的网络流量'),
161161
data: serviceOverview.avgTrafficPerSubscriberOverview,
162162
value: serviceOverview.avgTrafficPerSubscriber,
163163
date: serviceOverview.date,
@@ -184,7 +184,7 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
184184
// 服务请求次数
185185
{
186186
...setBarChartInfoData({
187-
title: $t('请求数'),
187+
title: $t('请求次数'),
188188
data: serviceOverview.requestOverview,
189189
value: serviceOverview.requestTotal,
190190
date: serviceOverview.date
@@ -196,7 +196,7 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
196196
// token 消耗总数
197197
{
198198
...setBarChartInfoData({
199-
title: $t('Token'),
199+
title: $t('Token 消耗'),
200200
data: serviceOverview.tokenOverview.map((item: { inputToken: number; outputToken: number }) => ({
201201
inputToken: item.inputToken,
202202
outputToken: item.outputToken
@@ -212,7 +212,7 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
212212
setPerBarChartInfo([
213213
// 平均 token 消耗
214214
{
215-
title: $t('平均 Token/s 统计'),
215+
title: $t('平均 Token 消耗'),
216216
data: serviceOverview.avgTokenOverview,
217217
value: serviceOverview.avgToken,
218218
date: serviceOverview.date,
@@ -222,14 +222,14 @@ const ServiceOverview = ({ serviceType }: { serviceType: 'aiService' | 'restServ
222222
},
223223
// 平均请求
224224
setBarChartInfoData({
225-
title: $t('平均请求数'),
225+
title: $t('平均每消费者的请求次数'),
226226
data: serviceOverview.avgRequestPerSubscriberOverview,
227227
value: serviceOverview.avgRequestPerSubscriber,
228228
date: serviceOverview.date
229229
}),
230230
// 评价 token 消耗
231231
setBarChartInfoData({
232-
title: $t('平均 Token/订阅者统计'),
232+
title: $t('平均每消费者的 Token 消耗'),
233233
data: serviceOverview.avgTokenPerSubscriberOverview.map((item: { inputToken: number; outputToken: number }) => ({
234234
inputToken: item.inputToken,
235235
outputToken: item.outputToken

‎frontend/packages/dashboard/src/pages/DashboardTotal.tsx‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export default function DashboardTotal() {
133133
// 服务请求次数
134134
{
135135
...setBarChartInfoData({
136-
title: $t('请求数'),
136+
title: $t('请求次数'),
137137
data: serviceOverview.requestOverview,
138138
value: serviceOverview.requestTotal,
139139
date: serviceOverview.date
@@ -145,7 +145,7 @@ export default function DashboardTotal() {
145145
// 流量消耗总数
146146
{
147147
...setBarChartInfoData({
148-
title: $t('流量'),
148+
title: $t('网络流量'),
149149
data: serviceOverview.trafficOverview,
150150
value: serviceOverview.trafficTotal,
151151
date: serviceOverview.date
@@ -169,14 +169,14 @@ export default function DashboardTotal() {
169169
},
170170
// 平均请求
171171
setBarChartInfoData({
172-
title: $t('平均请求数'),
172+
title: $t('平均每消费者的请求次数'),
173173
data: serviceOverview.avgRequestPerSubscriberOverview,
174174
value: serviceOverview.avgRequestPerSubscriber,
175175
date: serviceOverview.date
176176
}),
177177
// 平均流量消耗
178178
setBarChartInfoData({
179-
title: $t('平均流量'),
179+
title: $t('平均每消费者的网络流量'),
180180
data: serviceOverview.avgTrafficPerSubscriberOverview,
181181
value: serviceOverview.avgTrafficPerSubscriber,
182182
date: serviceOverview.date
@@ -193,7 +193,7 @@ export default function DashboardTotal() {
193193
// 服务请求次数
194194
{
195195
...setBarChartInfoData({
196-
title: $t('请求数'),
196+
title: $t('请求次数'),
197197
data: serviceOverview.requestOverview,
198198
value: serviceOverview.requestTotal,
199199
date: serviceOverview.date
@@ -205,7 +205,7 @@ export default function DashboardTotal() {
205205
// token 消耗总数
206206
{
207207
...setBarChartInfoData({
208-
title: $t('Token'),
208+
title: $t('Token 消耗'),
209209
data: serviceOverview.tokenOverview.map((item: { inputToken: number; outputToken: number }) => ({
210210
inputToken: item.inputToken,
211211
outputToken: item.outputToken
@@ -221,7 +221,7 @@ export default function DashboardTotal() {
221221
setPerBarChartInfo([
222222
// 平均 token 消耗
223223
{
224-
title: $t('平均 Token/s 统计'),
224+
title: $t('平均 Token 消耗'),
225225
data: serviceOverview.avgTokenOverview,
226226
value: serviceOverview.avgToken,
227227
date: serviceOverview.date,
@@ -231,14 +231,14 @@ export default function DashboardTotal() {
231231
},
232232
// 平均请求
233233
setBarChartInfoData({
234-
title: $t('平均请求数'),
234+
title: $t('平均每消费者的请求次数'),
235235
data: serviceOverview.avgRequestPerSubscriberOverview,
236236
value: serviceOverview.avgRequestPerSubscriber,
237237
date: serviceOverview.date
238238
}),
239239
// 平均 token 消耗
240240
setBarChartInfoData({
241-
title: $t('平均 Token/订阅者统计'),
241+
title: $t('平均每消费者的 Token 消耗'),
242242
data: serviceOverview.avgTokenPerSubscriberOverview.map(
243243
(item: { inputToken: number; outputToken: number }) => ({
244244
inputToken: item.inputToken,

0 commit comments

Comments
 (0)