From 6173d950ceb5044591a603cf25d4332172e2ab22 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Wed, 19 Aug 2020 19:21:36 +0800
Subject: [PATCH] =?UTF-8?q?namespace=E8=AF=B7=E6=B1=82=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/service-list/commodity-cell.vue | 4 ++--
 src/pages/workbench/fwgl/serviceDetail.vue     | 4 +++-
 src/request/api/workbench.js                   | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell.vue
index f0eb00f..ad081ad 100644
--- a/src/components/service-list/commodity-cell.vue
+++ b/src/components/service-list/commodity-cell.vue
@@ -80,7 +80,7 @@ export default {
 <style scoped>
 .com_cell {
   display: flex;
-  justify-content: flex-start;
+  justify-content: space-between;
   padding: 20px 10px;
   border-bottom: 2px #f4f7fc solid;
 }
@@ -97,7 +97,7 @@ export default {
 }
 .com_cell_message {
   padding-left: 20px;
-  width: calc(100% - 420px);
+  width: calc(100% - 470px);
 }
 .com_cell_msg_title {
   color: #0d1847;
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index f7155ca..e1a08f7 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -613,7 +613,8 @@ export default {
       });
     },
     getData() {
-      this.$api.workbench.getServiceTopology().then((response) => {
+      console.log(this.namespace)
+      this.$api.workbench.getServiceRunningTopology({ namespace: this.namespace }).then((response) => {
         this.datas = response.data.elements;
       });
     },
@@ -626,6 +627,7 @@ export default {
         .then((response) => {
           if (response.data.success === 1) {
             let data = response.data.data;
+            this.namespace = data.namespace;
             if(data.workflows_id){
               this.workflows_id = data.workflows_id
             }
diff --git a/src/request/api/workbench.js b/src/request/api/workbench.js
index 0844e78..389a1c3 100644
--- a/src/request/api/workbench.js
+++ b/src/request/api/workbench.js
@@ -82,6 +82,11 @@ const workbench = {
     releaseProcess(params) {
         return axios.post(`/apaas/serviceapp/v3/workflows/publish`, params)
     },
+
+    // get service running topology
+    getServiceRunningTopology(params) {
+        return axios.get(`/apaas/istio/service/apaas-proxy/overview/${params.namespace}`)
+    },
 }
 
 export default workbench;
-- 
2.26.0