From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/settings/views/clusterManagement.vue | 92 ++++++++++++++++++++++++++--------------------
1 files changed, 52 insertions(+), 40 deletions(-)
diff --git a/src/pages/settings/views/clusterManagement.vue b/src/pages/settings/views/clusterManagement.vue
index 3f706a5..a903df7 100644
--- a/src/pages/settings/views/clusterManagement.vue
+++ b/src/pages/settings/views/clusterManagement.vue
@@ -164,7 +164,7 @@
class="join-form"
v-loading="joinLoading"
>
- <!-- <el-form-item prop="clusterid">
+ <el-form-item prop="clusterid">
<div class="p-title">闆嗙兢ID</div>
<el-input v-model="joinForm.clusterid" size="small"></el-input>
</el-form-item>
@@ -177,7 +177,7 @@
size="small"
autocomplete="new-password"
></el-input>
- </el-form-item> -->
+ </el-form-item>
<el-form-item prop="clusterpwd">
<div class="p-title">闆嗙兢瀵嗙爜</div>
<el-input
@@ -217,9 +217,9 @@
{{ item.Address }}
</div>
</div>
- <!-- <div class="btns">
+ <div class="btns">
<div class="ok" @click="join('joinForm')">鍔犲叆闆嗙兢</div>
- </div> -->
+ </div>
</div>
</div>
</div>
@@ -246,20 +246,20 @@
export default {
data() {
const checkPwd = (rule, value, callback) => {
- if (value=="") {
+ if (value == "") {
return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"));
}
// setTimeout(() => {
- if (value.length != 6) {
- callback(new Error("瀵嗙爜搴斾负6浣�!"));
- } else {
- callback();
- }
+ if (value.length != 6) {
+ callback(new Error("瀵嗙爜搴斾负6浣�!"));
+ } else {
+ callback();
+ }
// }, 1000);
};
const checkID = (rule, value, callback) => {
if (!value) {
- return callback(new Error("瀵嗙爜涓嶈兘涓虹┖"));
+ return callback(new Error("ID涓嶈兘涓虹┖"));
}
};
return {
@@ -303,13 +303,13 @@
clustername: [
{ required: true, message: "璇疯緭鍏ラ泦缇ゅ悕绉�", trigger: "blur" },
],
- clusterpwd: [{ validator: checkPwd, required: true,trigger: "blur" }],
+ clusterpwd: [{ validator: checkPwd, required: true, trigger: "blur" }],
virtualIp: [{ required: true, validator: isIPv4, trigger: "change" }],
},
joinExistRules: {
clusterid: [{ validator: checkID, trigger: "blur" }],
clusterip: [{ validator: isIPv4, trigger: "blur" }],
- clusterpwd: [{ validator: checkPwd, required: true,trigger: "blur" }],
+ clusterpwd: [{ validator: checkPwd, required: true, trigger: "blur" }],
},
};
},
@@ -542,6 +542,8 @@
},
exitCluster() {
const h = this.$createElement;
+ let res = {};
+
this.$msgbox({
title: "",
message: h(
@@ -562,33 +564,43 @@
cancelButtonText: "鍙栨秷",
customClass: "del-account-message-box",
}).then(
- () => {
- this.showCurCluster = false;
- }
- // async () => {
- // let res = await leave();
- // this.$notify({
- // title: res.success ? "鎴愬姛" : "澶辫触",
- // message: res.msg,
- // type: res.success ? "success" : "error",
- // });
- // if (res && res.success) {
- // clearInterval(this.intervalTimer);
- // this.showCurCluster = false;
- // this.ruleForm.virtualIp = "";
- // this.ruleForm.clustername = "";
- // this.ruleForm.clusterpwd = "";
- // this.clusterid = "";
- // }
- // },
- // (err) => {
- // clearInterval(this.intervalTimer);
+ // () => {
// this.showCurCluster = false;
- // this.ruleForm.virtualIp = "";
- // this.ruleForm.clustername = "";
- // this.ruleForm.clusterpwd = "";
- // this.clusterid = "";
// }
+ async () => {
+ try {
+ res = await leave();
+ if (res && res.success) {
+ clearInterval(this.intervalTimer);
+ this.showCurCluster = false;
+ this.ruleForm.virtualIp = "";
+ this.ruleForm.clustername = "";
+ this.ruleForm.clusterpwd = "";
+ this.clusterid = "";
+ }
+
+ this.$notify({
+ title: res.success ? "鎴愬姛" : "澶辫触",
+ message: res.msg,
+ type: res.success ? "success" : "error",
+ });
+ this.findCluster();
+ } catch (err) {
+ console.log(err);
+ this.$notify.error({
+ title: "澶辫触",
+ message: err.msg,
+ });
+ }
+ },
+ (err) => {
+ clearInterval(this.intervalTimer);
+ this.showCurCluster = false;
+ this.ruleForm.virtualIp = "";
+ this.ruleForm.clustername = "";
+ this.ruleForm.clusterpwd = "";
+ this.clusterid = "";
+ }
);
},
clearInput(typ) {
@@ -690,7 +702,7 @@
}
.cluster-guanli {
margin: 0 auto;
- width: 760px;
+ // width: 760px;
padding: 0 10px;
.btns {
margin-top: 30px !important;
@@ -903,7 +915,7 @@
left: 20px;
}
.el-form-item {
- margin-bottom: 10px;
+ margin-bottom: 16px;
.el-input__inner {
background-color: #ffffff;
border: 2px solid transparent;
--
Gitblit v1.8.0