fix: 批量修复2.6版本测试产生的Bug

This commit is contained in:
Orange
2020-12-15 20:06:30 +08:00
committed by Jiangjie.Bai
parent 3aced25da4
commit f364c8fdf9
7 changed files with 50 additions and 9 deletions

View File

@@ -423,6 +423,7 @@
"UserGroups": "用户组",
"DatabaseAppPermission": "数据库授权",
"RemoteAppPermission": "远程应用授权",
"addApplicationToThisPermission": "添加应用",
"KubernetesAppPermission": "Kubernetes授权",
"addAssetToThisPermission": "添加资产",
"addDatabaseAppToThisPermission": "添加数据库应用",
@@ -614,6 +615,10 @@
"name": "名称",
"protocol": "协议",
"region": "地域",
"sessionActiveCount": "在线会话数量",
"systemCpuLoad": "CPU负载",
"systemDiskUsedPercent": "硬盘使用率",
"systemMemoryUsedPercent": "内存使用率",
"remoteAddr": "远端地址",
"replay": "回放",
"replaySession": "回放会话",

View File

@@ -425,6 +425,7 @@
"addAssetToThisPermission": "Add asset to this permission",
"addDatabaseAppToThisPermission": "Add DatabaseApp to this permission",
"addK8sAppToThisPermission": "Add KubernetesApp to this permission",
"addApplicationToThisPermission": "Add Application to this permission",
"addNodeToThisPermission": "Add node to this permission",
"addRemoteAppToThisPermission": "Add RemoteApp to this permission",
"addSystemUserToThisPermission": "System user",
@@ -595,6 +596,10 @@
"duration": "Duration",
"endPoint": "Endpoint",
"endpointSuffix": "Endpoint suffix",
"sessionActiveCount": "session active count",
"systemCpuLoad": "cpu load",
"systemDiskUsedPercent": "disk used percent",
"systemMemoryUsedPercent": "memory used percent",
"go": "Go",
"goto": "Goto",
"hosts": "Hosts",

View File

@@ -1,12 +1,14 @@
<template>
<IBox>
<GenericCreateUpdateForm
ref="GenericCreateUpdateForm"
:fields="fields"
:fields-meta="fieldsMeta"
:initial="object"
:url="url"
:get-method="getMethod"
:more-buttons="moreButtons"
:on-perform-success="onPerformSuccess"
/>
</IBox>
</template>
@@ -65,6 +67,10 @@ export default {
methods: {
getMethod() {
return 'put'
},
onPerformSuccess() {
this.$refs.GenericCreateUpdateForm.$refs.form.$refs.dataForm.resetForm('form')
this.$message.success(this.$t('common.updateSuccessMsg'))
}
}
}

View File

@@ -68,14 +68,14 @@ export default {
},
remoteAppRelationConfig: {
icon: 'fa-edit',
title: this.$t('perms.addRemoteAppToThisPermission'),
title: this.$t('perms.addApplicationToThisPermission'),
objectsAjax: {
url: `/api/v1/applications/applications/?category=${this.object.category}&type=${this.object.type}`,
transformOption: (item) => {
return { label: item.name + ' (' + item.type_display + ')', value: item.id }
}
},
hasObjectsId: this.object.application,
hasObjectsId: this.object.applications,
showHasObjects: false,
performAdd: (items) => {
const objectId = this.object.id

View File

@@ -92,11 +92,34 @@ export default {
},
tableConfig: {
url: '/api/v1/terminal/terminals/',
columns: ['name', 'remote_addr', 'session_online', 'is_active', 'is_alive', 'actions'],
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',
'is_active',
'is_alive',
'actions'],
columnsMeta: {
name: {
sortable: 'custom'
},
'state.session_active_count': {
label: this.$t('sessions.sessionActiveCount'),
width: '160px'
},
'state.system_cpu_load_1': {
label: this.$t('sessions.systemCpuLoad'),
width: '160px'
},
'state.system_disk_used_percent': {
label: this.$t('sessions.systemDiskUsedPercent'),
width: '160px'
},
'state.system_memory_used_percent': {
label: this.$t('sessions.systemMemoryUsedPercent'),
width: '160px'
},
remote_addr: {
sortable: 'custom'
},

View File

@@ -1,7 +1,9 @@
<template>
<div>
<div style="font-size: 24px;font-weight: 300">
<span>{{ `${(type).replace(/^\S/, s => s.toUpperCase())} ( ${serviceData.total} )` }}</span>
<span v-if="type === 'omnidb'">{{ `OmniDB ( ${serviceData.total} )` }}</span>
<span v-else-if="type === 'guacamole'">{{ `Guacamole ( ${serviceData.total} )` }}</span>
<span v-else>{{ `KoKo ( ${serviceData.total} )` }}</span>
</div>
<el-card class="box-card" shadow="never">
<el-row :gutter="10">

View File

@@ -1,18 +1,18 @@
<template>
<Page>
<el-row :gutter="40">
<el-col :lg="8" :offset="4" class="monitorCard">
<el-col :lg="{span:8,offset:4 }" :md="24" class="monitorCard">
<MonitorCard type="koko" />
</el-col>
<el-col :lg="8" class="monitorCard">
<el-col :lg="8" :md="24" class="monitorCard">
<MonitorCard type="guacamole" />
</el-col>
<el-col :offset="4" :lg="8" class="monitorCard">
<MonitorCard type="omniDB" />
<el-col :lg="{span:8,offset:4 }" :md="24" class="monitorCard">
<MonitorCard type="omnidb" />
</el-col>
</el-row>
</Page>
</template>
</template>lg
<script>
import Page from '@/layout/components/Page/index'