From 8e12e678decdf72f546e488601dc0842127aeabc Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 19 十月 2020 16:43:58 +0800
Subject: [PATCH] 加入集群添加loading
---
src/pages/settings/components/ClusterManagement.vue | 15 +++++++++++----
src/pages/settings/components/CloudNode.vue | 3 +--
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/pages/settings/components/CloudNode.vue b/src/pages/settings/components/CloudNode.vue
index e3a08bc..bf5eafa 100644
--- a/src/pages/settings/components/CloudNode.vue
+++ b/src/pages/settings/components/CloudNode.vue
@@ -27,7 +27,7 @@
></serfDiagram>
</div>
</div>
- <div class="outer">
+ <div class="outer" v-if="outsideNodes.length">
<serfDiagram
ref="outer-nodes"
:members="outsideNodes"
@@ -252,7 +252,6 @@
<style lang="scss">
.cloud {
width: 100%;
- height: 500px;
display: flex;
.inner {
background: url('/images/settings/easy-cloud.png') no-repeat;
diff --git a/src/pages/settings/components/ClusterManagement.vue b/src/pages/settings/components/ClusterManagement.vue
index 51173b1..4e9a70e 100644
--- a/src/pages/settings/components/ClusterManagement.vue
+++ b/src/pages/settings/components/ClusterManagement.vue
@@ -30,7 +30,7 @@
<!-- 鍔犲叆宸叉湁闆嗙兢 -->
<el-tab-pane label="鍔犲叆宸叉湁闆嗙兢" name="2" :disabled="isHasColony">
- <el-form label-width="80px" :model="joinForm" :rules="joinRules" ref="joinForm">
+ <el-form label-width="80px" :model="joinForm" :rules="joinRules" ref="joinForm" v-loading="joinLoading">
<el-form-item label="IP鍦板潃" style="width:440px">
<el-input
v-model="joinForm.clusterip"
@@ -125,7 +125,7 @@
</el-col>
</el-row>
- <div class="ui-top-view">
+ <!-- <div class="ui-top-view">
<div class="ui-top-title">瀛樺偍闆嗙兢绠＄悊</div>
</div>
<el-row>
@@ -138,7 +138,7 @@
size="small"
@click="createEsCluster()"
>鍒涘缓瀛樺偍闆嗙兢</el-button>
- <!-- <p>鐐瑰嚮灏嗘湰鏈哄垱寤轰负瀛樺偍闆嗙兢</p> -->
+
</el-tab-pane>
<el-tab-pane label="鍔犲叆宸叉湁闆嗙兢" name="s-second" v-if="sActiveName != 's-third1'">
<el-form label-width="80px">
@@ -175,7 +175,7 @@
</el-tab-pane>
</el-tabs>
</el-col>
- </el-row>
+ </el-row> -->
</div>
</template>
@@ -289,6 +289,7 @@
members: [],
innerNodes: [],
intervalTimer: null,
+ joinLoading: false
};
},
mounted() {
@@ -350,8 +351,10 @@
},
join(formName) {
+ let _this = this;
this.$refs[formName].validate(valid => {
if (valid) {
+ _this.joinLoading = true;
if (Object.keys(this.currentCluster).length === 0) {
this.$notify({
type: "info",
@@ -369,7 +372,11 @@
nodeIps: nodeIps
};
this.joinCluster(json).then(() => {
+ _this.joinLoading = false;
this.findCluster();
+ }).catch(e=>{
+ console.log(e);
+ _this.joinLoading = false;
});
} else {
console.log("error submit!!");
--
Gitblit v1.8.0