From 0f6607cdc25a136c0eafa00ce0ab0025f2edc76b Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 7 Apr 2020 19:08:47 +0800
Subject: [PATCH] loading

---
 .../settings/system/TestResourcePool.vue      | 24 +++++++++++--------
 frontend/src/i18n/zh-CN.js                    |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontend/src/business/components/settings/system/TestResourcePool.vue b/frontend/src/business/components/settings/system/TestResourcePool.vue
index f4d1d221ff..90912e247e 100644
--- a/frontend/src/business/components/settings/system/TestResourcePool.vue
+++ b/frontend/src/business/components/settings/system/TestResourcePool.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="result.loading">
 
     <el-card>
       <template v-slot:header>
@@ -72,7 +72,9 @@
       </div>
     </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"
                :destroy-on-close="true">
       <el-form :model="form" label-position="right" label-width="100px" size="small" :rules="rule"
@@ -151,9 +153,11 @@
       </template>
     </el-dialog>
 
-    <el-dialog :title="$t('test_resource_pool.update_resource_pool')" :visible.sync="updateVisible" width="70%"
-               :destroy-on-close="true"
-               @close="closeFunc">
+    <el-dialog
+      v-loading="result.loading"
+      :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"
                ref="updateTestResourcePoolForm">
         <el-form-item :label="$t('commons.name')" prop="name">
@@ -239,7 +243,7 @@
     components: {MsCreateBox},
     data() {
       return {
-        loading: false,
+        result: {},
         testLoading: false,
         createVisible: false,
         infoList: [],
@@ -367,7 +371,7 @@
           cancelButtonText: this.$t('commons.cancel'),
           type: 'warning'
         }).then(() => {
-          this.$get(`/testresourcepool/delete/${row.id}`).then(() => {
+          this.result = this.$get(`/testresourcepool/delete/${row.id}`).then(() => {
             this.initTableData();
           });
           this.$message({
@@ -388,7 +392,7 @@
             if (vri.validate) {
               this.testLoading = true;
               this.convertSubmitResources();
-              this.$post("/testresourcepool/add", this.form, () => {
+              this.result = this.$post("/testresourcepool/add", this.form, () => {
                 this.$message({
                     type: 'success',
                     message: this.$t('commons.save_success')
@@ -430,7 +434,7 @@
             let vri = this.validateResourceInfo();
             if (vri.validate) {
               this.convertSubmitResources();
-              this.$post("/testresourcepool/update", this.form, () => {
+              this.result = this.$post("/testresourcepool/update", this.form, () => {
                 this.$message({
                     type: 'success',
                     message: this.$t('commons.modify_success')
@@ -457,7 +461,7 @@
         this.form = {};
       },
       changeSwitch(row) {
-        this.$post('/testresourcepool/update', row).then(() => {
+        this.result = this.$post('/testresourcepool/update', row).then(() => {
           this.$message({
             type: 'success',
             message: this.$t('test_resource_pool.status_change_success')
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index ad9eaa589c..5193913a10 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -242,7 +242,7 @@ export default {
     'enable_disable': '启用/禁用',
     'search_by_name': '根据名称搜索',
     'create_resource_pool': '创建资源池',
-    'update_resource_pool': '创建资源池',
+    'update_resource_pool': '修改资源池',
     'select_pool_type': '选择资源类型',
     'max_threads': '最大并发数',
     'input_pool_name': '请输入资源池名称',