From d5144e7cb7ccf2795e02098b850e282eb2a6e74f Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 14 十月 2020 10:27:07 +0800
Subject: [PATCH] 集群节点展示测试

---
 src/pages/settings/components/ClusterManagement.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/pages/settings/components/ClusterManagement.vue b/src/pages/settings/components/ClusterManagement.vue
index 9a04946..8ab8f83 100644
--- a/src/pages/settings/components/ClusterManagement.vue
+++ b/src/pages/settings/components/ClusterManagement.vue
@@ -104,6 +104,7 @@
         <serfDiagram
           ref="diagram"
           :members="members"
+          :searchNodes="nodes"
           :agent="agentName"
           v-loading="loading"
           @selected-node="joinNode"
@@ -272,12 +273,12 @@
       loading: false,
       searchDis: false,
       agentName: "",
-      members: []
+      members: [],
+      nodes: [],
     };
   },
   mounted() {
     this.findCluster();
-    this.getVrrpInfo();
     this.getEsClusterNodes();
   },
   methods: {
@@ -290,7 +291,6 @@
     submitForm(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
-          debugger
           //alert("submit!");
           let json = {
             clusterId: this.clusterid,
@@ -409,6 +409,7 @@
         this.stopSearch();
       }, 10 * 1000);
     },
+    //鎼滅储闆嗙兢
     async getSearchNodes() {
       let res = await getSearchNodes();
       if (res && res.success) {
@@ -428,7 +429,8 @@
             return element.node_id === i.node_id;
           });
           if (found === undefined) {
-            this.members.push(i);
+            //this.members.push(i);
+            this.nodes.push(i);
           }
         });
       }
@@ -477,6 +479,8 @@
             debugger
             let obj = {};
             obj.device_type = i.device_type;
+            obj.workType = i.device_type.substr(2,2);
+            obj.hardwareType = i.device_type.substr(4,2);
             obj.cluster_id = i.cluster_id;
             obj.clusterName = res.data.clusterName;
             obj.create_time = i.create_time;
@@ -489,6 +493,7 @@
             return obj;
           });
           this.members = this.members.concat(list);
+          console.log(this.members)
         } else {
           this.isHasColony = false;
           // this.activeName = '1'
@@ -550,6 +555,7 @@
 
     },
     joinNode(event, node) {
+      debugger
       this.currentCluster.cluster_id = node.cluster_id;
       if (this.activeName === "3") {
         this.manageForm.clustername = node.clusterName;
@@ -695,14 +701,9 @@
       this.ruleForm.virtualIp = ip;
       console.log(this.ruleForm.virtualIp)
     }
-  
 
-    
   },
-  mounted () {
-    this.findCluster();
-    
-  },
+
   created () { }
 
 };
@@ -777,6 +778,6 @@
   line-height: 30px;
 }
 .nodes-svg{
-  background-color: aquamarine;
+  background-color: rgba(127, 255, 212, 0.459);
 }
 </style>

--
Gitblit v1.8.0