diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index f666bd1aa..0ca00fa23 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -592,6 +592,8 @@ "LoginTo": "Login to", "LoginUsers": "Active users", "Monthly": "Monthly", + "CurrentConnections": "Current connections", + "TodayFailedConnections": "Connections failed today", "OnlineSessions": "Online sessions", "OnlineUsers": "Online users", "ConnectUsers": "Connect users", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index e2d84a0e7..fc307973e 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -603,6 +603,8 @@ "LoginTo": "ログインしました", "LoginUsers": "アクティブユーザー", "Monthly": "月ごと", + "CurrentConnections": "現在の接続数", + "TodayFailedConnections": "今日の接続に失敗しました", "OnlineSessions": "オンラインセッション", "OnlineUsers": "オンラインユーザー", "ConnectUsers": "ユーザーの接続", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index e14648068..a935799de 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -624,7 +624,9 @@ "LoginTo": "登录了", "LoginUsers": "活跃用户", "Monthly": "按月", - "OnlineSessions": "在线会话", + "CurrentConnections": "当前连接数", + "TodayFailedConnections": "今日连接失败数", + "OnlineSessions": "在线会话数", "OnlineUsers": "在线用户", "ConnectUsers": "连接用户", "TimesWeekUnit": "次/周", diff --git a/src/icons/svg/broken-line.svg b/src/icons/svg/broken-line.svg new file mode 100644 index 000000000..0dd9f463d --- /dev/null +++ b/src/icons/svg/broken-line.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/dashboard/Left.vue b/src/views/dashboard/LeftSummary.vue similarity index 100% rename from src/views/dashboard/Left.vue rename to src/views/dashboard/LeftSummary.vue diff --git a/src/views/dashboard/RankSummary.vue b/src/views/dashboard/RankSummary.vue new file mode 100644 index 000000000..fc439785a --- /dev/null +++ b/src/views/dashboard/RankSummary.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/views/dashboard/components/DataCard.vue b/src/views/dashboard/components/DataCard.vue index 06cade9b6..1c854ebb4 100644 --- a/src/views/dashboard/components/DataCard.vue +++ b/src/views/dashboard/components/DataCard.vue @@ -7,10 +7,10 @@
本周新增:0 - + - +
@@ -27,7 +27,10 @@ export default { RingChart }, props: { - + object: { + type: Object, + default: () => ({}) + } }, data() { return { diff --git a/src/views/dashboard/components/LineChart.vue b/src/views/dashboard/components/LineChart.vue index 11d98ad59..680d8af24 100644 --- a/src/views/dashboard/components/LineChart.vue +++ b/src/views/dashboard/components/LineChart.vue @@ -5,7 +5,7 @@ 用户/资产活跃情况 - 更新时间:2022-11-17 + + + diff --git a/src/views/dashboard/components/RealTimeSummary.vue b/src/views/dashboard/components/RealTimeSummary.vue index 9f3eaa829..48e825736 100644 --- a/src/views/dashboard/components/RealTimeSummary.vue +++ b/src/views/dashboard/components/RealTimeSummary.vue @@ -2,7 +2,7 @@
实时数据 - 更新时间:2022-11-17 +
@@ -25,10 +25,9 @@ export default { data() { return { counter: { - total_count_assets: '.', - total_count_users: '.', + total_count_online_sessions: '.', total_count_online_users: '.', - total_count_online_sessions: '.' + total_count_today_failed_sessions: '.' } } }, @@ -36,15 +35,15 @@ export default { summaryItems() { return [ { - title: this.$t('dashboard.AssetsTotal'), + title: this.$t('dashboard.OnlineSessions'), body: { - route: { name: 'AssetList' }, - count: this.counter.total_count_assets, - disabled: !this.$hasPerm('assets.view_asset') + route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }}, + count: this.counter.total_count_online_sessions, + disabled: !this.$hasPerm('terminal.view_session') } }, { - title: this.$t('dashboard.ConnectUsers'), + title: this.$t('dashboard.CurrentConnections'), body: { route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }}, count: this.counter.total_count_online_users, @@ -52,11 +51,10 @@ export default { } }, { - title: this.$t('dashboard.OnlineSessions'), + title: this.$t('dashboard.TodayFailedConnections'), body: { - route: { name: `SessionList`, params: { activeMenu: 'OnlineList' }}, - count: this.counter.total_count_online_sessions, - disabled: !this.$hasPerm('terminal.view_session') + count: this.counter.total_count_today_failed_sessions, + disabled: true } } ] diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index cbb86acfd..7fab8fa18 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -2,18 +2,15 @@
- - - + - - +
@@ -22,21 +19,19 @@