From da4f50e1008b815067cf47352747bf6d23b8b043 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 27 一月 2022 13:58:54 +0800
Subject: [PATCH] bug修复

---
 src/pages/settings/views/clusterManagement.vue |   39 +++++++++++++++------------------------
 1 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/pages/settings/views/clusterManagement.vue b/src/pages/settings/views/clusterManagement.vue
index d13ad38..82da64e 100644
--- a/src/pages/settings/views/clusterManagement.vue
+++ b/src/pages/settings/views/clusterManagement.vue
@@ -2,7 +2,7 @@
   <div class="all">
     <!--  -->
     <div class="cluster-guanli" v-if="showCurCluster && isHasColony">
-      <!-- <cloud-node :nodes="innerNodes"></cloud-node> -->
+      <cloud-node :nodes="innerNodes"></cloud-node>
       <net-node :innerNodes="innerNodes"></net-node>
 
       <div class="cls-bar">瑙嗛鍒嗘瀽闆嗙兢绠＄悊</div>
@@ -205,18 +205,6 @@
               </el-input>
             </el-form-item>
           </el-form>
-          <div class="clu-list">
-            <!-- :class="pickedNodeI == index ? 'clu-item-active' : ''" -->
-            <div
-              class="clu-item"
-              v-for="(item, index) in members"
-              :key="index"
-              @click="pickNode(index)"
-            >
-              <i class="iconfont">&#xe727;</i>
-              {{ item.Address }}
-            </div>
-          </div>
           <div class="btns">
             <div class="ok" @click="join('joinForm')">鍔犲叆闆嗙兢</div>
           </div>
@@ -238,7 +226,7 @@
   updateClusterName,
   joinCluster,
 } from "@/api/clusterManage";
-// import cloudNode from "../components/CloudNode";
+import cloudNode from "../components/CloudNode";
 import NetNode from "../components/NetNode";
 import ipInput from "../components/IPInput";
 import { isIPv4 } from "@/scripts/validate";
@@ -246,15 +234,15 @@
 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) => {
@@ -303,18 +291,18 @@
         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" }],
       },
     };
   },
   components: {
-    // cloudNode,
+    cloudNode,
     NetNode,
     ipInput,
   },
@@ -424,9 +412,12 @@
       });
     },
     join(formName) {
+      debugger;
       let _this = this;
       this.$refs[formName].validate((valid) => {
+        debugger;
         if (valid) {
+          debugger;
           _this.joinLoading = true;
           let data = {
             clusterId: _this.joinForm.clusterid,
@@ -903,7 +894,7 @@
       left: 20px;
     }
     .el-form-item {
-          margin-bottom: 16px;
+      margin-bottom: 10px;
       .el-input__inner {
         background-color: #ffffff;
         border: 2px solid transparent;

--
Gitblit v1.8.0