From 27f5dec30ee350fa31b1a0b8aaffc11ba0423e28 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 27 一月 2022 14:08:29 +0800
Subject: [PATCH] 冲突解决

---
 src/pages/settings/views/clusterManagement.vue |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/pages/settings/views/clusterManagement.vue b/src/pages/settings/views/clusterManagement.vue
index 82da64e..9db717a 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,6 +205,18 @@
               </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>
@@ -226,7 +238,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";
@@ -302,7 +314,7 @@
     };
   },
   components: {
-    cloudNode,
+    // cloudNode,
     NetNode,
     ipInput,
   },
@@ -412,12 +424,9 @@
       });
     },
     join(formName) {
-      debugger;
       let _this = this;
       this.$refs[formName].validate((valid) => {
-        debugger;
         if (valid) {
-          debugger;
           _this.joinLoading = true;
           let data = {
             clusterId: _this.joinForm.clusterid,
@@ -894,7 +903,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