diff --git a/src/views/sessions/TerminalList.vue b/src/views/sessions/TerminalList.vue index efe6a1580..fac763172 100644 --- a/src/views/sessions/TerminalList.vue +++ b/src/views/sessions/TerminalList.vue @@ -94,8 +94,8 @@ export default { url: '/api/v1/terminal/terminals/', columns: [ 'name', 'remote_addr', 'session_online', - 'state.session_active_count', 'state.system_cpu_load_1', - 'state.system_disk_used_percent', 'state.system_memory_used_percent', + 'stat.cpu_load', + 'stat.disk_used', 'stat.memory_used', 'status_display', 'is_active', 'is_alive', 'actions' ], @@ -103,19 +103,15 @@ export default { name: { sortable: 'custom' }, - 'state.session_active_count': { - label: this.$t('sessions.sessionActiveCount'), - width: '120px' - }, - 'state.system_cpu_load_1': { + 'stat.cpu_load': { label: this.$t('sessions.systemCpuLoad'), width: '120px' }, - 'state.system_disk_used_percent': { + 'stat.disk_used': { label: this.$t('sessions.systemDiskUsedPercent'), width: '120px' }, - 'state.system_memory_used_percent': { + 'stat.memory_used': { label: this.$t('sessions.systemMemoryUsedPercent'), width: '120px' }, diff --git a/src/views/xpack/SystemMonitor/component/MonitorCard.vue b/src/views/xpack/SystemMonitor/component/MonitorCard.vue index 7b3c42130..3cd23cc29 100644 --- a/src/views/xpack/SystemMonitor/component/MonitorCard.vue +++ b/src/views/xpack/SystemMonitor/component/MonitorCard.vue @@ -1,9 +1,7 @@ - {{ `OmniDB ( ${serviceData.total} )` }} - {{ `Guacamole ( ${serviceData.total} )` }} - {{ `KoKo ( ${serviceData.total} )` }} + {{ componentName }} ( {{ componentMetric.total }} ) @@ -14,40 +12,40 @@ - {{ $t('xpack.NormalLoad') }}: {{ serviceData.normal }} + {{ $t('xpack.NormalLoad') }}: {{ componentMetric.normal }} - {{ $t('xpack.HighLoad') }}: {{ serviceData.high }} + {{ $t('xpack.HighLoad') }}: {{ componentMetric.high }} - {{ $t('xpack.CriticalLoad') }}: {{ serviceData.critical }} + {{ $t('xpack.CriticalLoad') }}: {{ componentMetric.critical }} - {{ $t('xpack.Offline') }}: {{ serviceData.offline }} + {{ $t('xpack.Offline') }}: {{ componentMetric.offline }} @@ -56,7 +54,7 @@ {{ $t('dashboard.OnlineSessions') }} - {{ serviceData.session_active }} + {{ componentMetric.session_active }} @@ -70,7 +68,6 @@ export default { name: 'MonitorCard', components: { - }, props: { // koko/guacamole/omnidb/core @@ -78,29 +75,25 @@ export default { type: String, default: 'koko', required: true - } - }, - data() { - return { - baseUrl: `/api/v1/terminal/components/metrics/?type=`, - serviceData: { - - } + }, + componentMetric: { + type: Object, + default: () => ({}) } }, computed: { - - }, - mounted() { - this.getServiceData() + componentName() { + const nameMapper = { + koko: 'KoKo', + guacamole: 'Guacamole', + omnidb: 'OmniDB' + } + return nameMapper[this.componentMetric.type] + } }, methods: { - async getServiceData() { - const url = `${this.baseUrl}${this.type}` - this.serviceData = await this.$axios.get(url) - }, toPercent(num) { - return (Math.round(num / this.serviceData.total * 10000) / 100.00 + '%')// 小数点后两位百分比 + return (Math.round(num / this.componentMetric.total * 10000) / 100.00 + '%')// 小数点后两位百分比 } } } diff --git a/src/views/xpack/SystemMonitor/index.vue b/src/views/xpack/SystemMonitor/index.vue index d8ad20a6b..4ae364f83 100644 --- a/src/views/xpack/SystemMonitor/index.vue +++ b/src/views/xpack/SystemMonitor/index.vue @@ -1,18 +1,12 @@ - - - - - - - - - + + + -lg +