diff --git a/wwwroot/chart_top_models.ui b/wwwroot/chart_top_models.ui index fd0232d..cc1c7eb 100644 --- a/wwwroot/chart_top_models.ui +++ b/wwwroot/chart_top_models.ui @@ -1,10 +1,10 @@ { "widgettype": "ChartBar", "options": { - "height": "210px", + "height": "250px", "width": "100%", "data_url": "{{entire_url('api/top_models.dspy')}}", "nameField": "model_name", - "valueFields": ["cnt", "total_amount"] + "valueFields": ["total_amount", "cnt"] } } diff --git a/wwwroot/chart_top_providers.ui b/wwwroot/chart_top_providers.ui index 250e138..f582758 100644 --- a/wwwroot/chart_top_providers.ui +++ b/wwwroot/chart_top_providers.ui @@ -1,7 +1,7 @@ { "widgettype": "ChartBar", "options": { - "height": "210px", + "height": "250px", "data_url": "{{entire_url('api/top_providers.dspy')}}", "nameField": "provider_name", "valueFields": ["total_amount", "cnt"] diff --git a/wwwroot/chart_top_users.ui b/wwwroot/chart_top_users.ui index de60ae0..ae0482e 100644 --- a/wwwroot/chart_top_users.ui +++ b/wwwroot/chart_top_users.ui @@ -1,7 +1,7 @@ { "widgettype": "ChartBar", "options": { - "height": "210px", + "height": "250px", "data_url": "{{entire_url('api/top_users.dspy')}}", "nameField": "user_name", "valueFields": ["total_amount", "cnt"] diff --git a/wwwroot/index.ui b/wwwroot/index.ui index 45fe20c..0bcf372 100644 --- a/wwwroot/index.ui +++ b/wwwroot/index.ui @@ -36,7 +36,7 @@ { "widgettype": "Text", "options": { - "text": "最后更新: {{get_today_usage(request) and request._run_ns.curDateString() or ''}}", + "text": "{{get_today_usage(request) and request._run_ns.curDateString() or ''}}", "fontSize": "13px" } }, @@ -65,11 +65,10 @@ } {% if 'owner.*' in roles or 'reseller.*' in roles %} ,{ - "widgettype": "ResponsableBox", + "widgettype": "HBox", "options": { "width": "100%", "gap": "16px", - "minWidth": "180px", "marginBottom": "16px" }, "subwidgets": [ @@ -78,7 +77,8 @@ "id": "stat_today_usage", "options": { "period_seconds": 30, - "url": "{{entire_url('stat_today_usage.ui')}}" + "url": "{{entire_url('stat_today_usage.ui')}}", + "width": "50%" } }, { @@ -86,15 +86,27 @@ "id": "stat_today_amount", "options": { "period_seconds": 30, - "url": "{{entire_url('stat_today_amount.ui')}}" + "url": "{{entire_url('stat_today_amount.ui')}}", + "width": "50%" } - }, + } + ] + }, + { + "widgettype": "HBox", + "options": { + "width": "100%", + "gap": "16px", + "marginBottom": "16px" + }, + "subwidgets": [ { "widgettype": "RefreshWidget", "id": "stat_total_users", "options": { "period_seconds": 60, - "url": "{{entire_url('stat_total_users.ui')}}" + "url": "{{entire_url('stat_total_users.ui')}}", + "width": "25%" } }, { @@ -102,7 +114,8 @@ "id": "stat_active_users", "options": { "period_seconds": 60, - "url": "{{entire_url('stat_active_users.ui')}}" + "url": "{{entire_url('stat_active_users.ui')}}", + "width": "25%" } }, { @@ -110,7 +123,8 @@ "id": "stat_concurrent", "options": { "period_seconds": 15, - "url": "{{entire_url('stat_concurrent.ui')}}" + "url": "{{entire_url('stat_concurrent.ui')}}", + "width": "25%" } }, { @@ -118,34 +132,8 @@ "id": "stat_errors", "options": { "period_seconds": 30, - "url": "{{entire_url('stat_errors.ui')}}" - } - } - ] - }, - { - "widgettype": "ResponsableBox", - "options": { - "width": "100%", - "gap": "16px", - "minWidth": "180px", - "marginBottom": "16px" - }, - "subwidgets": [ - { - "widgettype": "RefreshWidget", - "id": "stat_new_users_month", - "options": { - "period_seconds": 120, - "url": "{{entire_url('stat_new_users_month.ui')}}" - } - }, - { - "widgettype": "RefreshWidget", - "id": "stat_total_orgs", - "options": { - "period_seconds": 120, - "url": "{{entire_url('stat_total_orgs.ui')}}" + "url": "{{entire_url('stat_errors.ui')}}", + "width": "25%" } } ] @@ -419,4 +407,4 @@ ] } ] -} \ No newline at end of file +}