test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

loading

This commit is contained in:
Captain.B 2020-04-07 19:08:47 +08:00
parent 35a5c3c13e
commit 0f6607cdc2
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div v-loading="loading"> <div v-loading="result.loading">
<el-card> <el-card>
<template v-slot:header> <template v-slot:header>
@ -72,7 +72,9 @@
</div> </div>
</el-card> </el-card>
<el-dialog :title="$t('test_resource_pool.create_resource_pool')" :visible.sync="createVisible" width="70%" <el-dialog v-loading="result.loading"
:title="$t('test_resource_pool.create_resource_pool')"
:visible.sync="createVisible" width="70%"
@closed="closeFunc" @closed="closeFunc"
:destroy-on-close="true"> :destroy-on-close="true">
<el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule" <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule"
@ -151,9 +153,11 @@
</template> </template>
</el-dialog> </el-dialog>
<el-dialog :title="$t('test_resource_pool.update_resource_pool')" :visible.sync="updateVisible" width="70%" <el-dialog
:destroy-on-close="true" v-loading="result.loading"
@close="closeFunc"> :title="$t('test_resource_pool.update_resource_pool')" :visible.sync="updateVisible" width="70%"
:destroy-on-close="true"
@close="closeFunc">
<el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule" <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule"
ref="updateTestResourcePoolForm"> ref="updateTestResourcePoolForm">
<el-form-item :label="$t('commons.name')" prop="name"> <el-form-item :label="$t('commons.name')" prop="name">
@ -239,7 +243,7 @@
components: {MsCreateBox}, components: {MsCreateBox},
data() { data() {
return { return {
loading: false, result: {},
testLoading: false, testLoading: false,
createVisible: false, createVisible: false,
infoList: [], infoList: [],
@ -367,7 +371,7 @@
cancelButtonText: this.$t('commons.cancel'), cancelButtonText: this.$t('commons.cancel'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$get(`/testresourcepool/delete/${row.id}`).then(() => { this.result = this.$get(`/testresourcepool/delete/${row.id}`).then(() => {
this.initTableData(); this.initTableData();
}); });
this.$message({ this.$message({
@ -388,7 +392,7 @@
if (vri.validate) { if (vri.validate) {
this.testLoading = true; this.testLoading = true;
this.convertSubmitResources(); this.convertSubmitResources();
this.$post("/testresourcepool/add", this.form, () => { this.result = this.$post("/testresourcepool/add", this.form, () => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: this.$t('commons.save_success') message: this.$t('commons.save_success')
@ -430,7 +434,7 @@
let vri = this.validateResourceInfo(); let vri = this.validateResourceInfo();
if (vri.validate) { if (vri.validate) {
this.convertSubmitResources(); this.convertSubmitResources();
this.$post("/testresourcepool/update", this.form, () => { this.result = this.$post("/testresourcepool/update", this.form, () => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: this.$t('commons.modify_success') message: this.$t('commons.modify_success')
@ -457,7 +461,7 @@
this.form = {}; this.form = {};
}, },
changeSwitch(row) { changeSwitch(row) {
this.$post('/testresourcepool/update', row).then(() => { this.result = this.$post('/testresourcepool/update', row).then(() => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: this.$t('test_resource_pool.status_change_success') message: this.$t('test_resource_pool.status_change_success')

2
frontend/src/i18n/zh-CN.js
View File

@ -242,7 +242,7 @@ export default {
'enable_disable': '启用/禁用', 'enable_disable': '启用/禁用',
'search_by_name': '根据名称搜索', 'search_by_name': '根据名称搜索',
'create_resource_pool': '创建资源池', 'create_resource_pool': '创建资源池',
'update_resource_pool': '创建资源池', 'update_resource_pool': '修改资源池',
'select_pool_type': '选择资源类型', 'select_pool_type': '选择资源类型',
'max_threads': '最大并发数', 'max_threads': '最大并发数',
'input_pool_name': '请输入资源池名称', 'input_pool_name': '请输入资源池名称',