From 34d478a5ed3cb7487e04e598de7b76a23d1c340f Mon Sep 17 00:00:00 2001
From: xuyiming <xuyiming@bd-apaas.com>
Date: Mon, 13 Jul 2020 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/workbench/fwgl/approveWorkspace.vue    | 13 +++++++------
 src/pages/workbench/fwgl/fwglList.vue            | 16 +++++++++++-----
 .../workbench/fwgl/organizationCloudResource.vue | 10 ++++++++--
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue
index 676fe74..375fb4e 100644
--- a/src/pages/workbench/fwgl/approveWorkspace.vue
+++ b/src/pages/workbench/fwgl/approveWorkspace.vue
@@ -91,18 +91,19 @@ export default {
     detailAction(item) {
       this.$router.push({
         path: `/fwgl/${this.level}/${this.type}/cloud_detail/${item.id}`,
+        query: {
+          apply_id: item.apply_id,
+          apply_type: item.apply_type,
+          use_uid: item.use_uid,
+          user_id: item.user_id,
+        },
       });
     },
     approveAction(item) {
       let action = (type) => {
         this.$http
           .put("/apaas/service/v3/resource/apply/approve", null, {
-            params: {
-              apply_id: item.apply_id,
-              apply_type: item.apply_type,
-              cloud_id: item.id,
-              apply_state: type,
-            },
+            params: {},
           })
           .then(({ data }) => {
             if (data.success == 1) {
diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue
index c1f3c6f..6d347a6 100644
--- a/src/pages/workbench/fwgl/fwglList.vue
+++ b/src/pages/workbench/fwgl/fwglList.vue
@@ -1223,12 +1223,12 @@ export default {
                     total: cloud.memory_total,
                     unit: "（GB）",
                   },
-                  {
+                  /* {
                     name: "数据盘使用量",
                     value: cloud.disk_use,
                     total: cloud.disk_total,
                     unit: "（GB）",
-                  },
+                  }, */
                   {
                     name: "容器组使用量",
                     value: cloud.containers_use,
@@ -1252,12 +1252,12 @@ export default {
                     total: cloud.memory_total,
                     unit: "（GB）",
                   },
-                  {
+                  /* {
                     name: "数据盘使用量",
                     value: cloud.disk_use,
                     total: cloud.disk_total,
                     unit: "（GB）",
-                  },
+                  }, */
                   {
                     name: "容器组使用量",
                     value: cloud.containers_use,
@@ -1488,6 +1488,12 @@ export default {
     cloudDetail(item) {
       this.$router.push({
         path: `/fwgl/${this.level}/${this.type}/cloud_detail/${item.id}`,
+        query: {
+          apply_id: item.apply_id,
+          apply_type: item.apply_type,
+          use_uid: item.use_uid,
+          user_id: item.user_id,
+        },
       });
     },
     cloudAllot(item) {
@@ -2037,7 +2043,7 @@ export default {
 <style scoped>
 .service_management_list {
   height: 100%;
-  min-width: 1500px;
+  min-width: 1200px;
 }
 .cloud_title {
   margin-top: 15px;
diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue
index d3bbea1..738a0ab 100644
--- a/src/pages/workbench/fwgl/organizationCloudResource.vue
+++ b/src/pages/workbench/fwgl/organizationCloudResource.vue
@@ -119,12 +119,12 @@ export default {
               total: cloud.memory_total,
               unit: "（GB）",
             },
-            {
+            /* {
               name: "数据盘使用量",
               value: cloud.disk_use,
               total: cloud.disk_total,
               unit: "（GB）",
-            },
+            }, */
             {
               name: "容器组使用量",
               value: cloud.containers_use,
@@ -323,6 +323,12 @@ export default {
     detailAction(item) {
       this.$router.push({
         path: `/fwgl/${this.level}/${this.type}/cloud_detail/${item.id}`,
+        query: {
+          apply_id: item.apply_id,
+          apply_type: item.apply_type,
+          use_uid: item.use_uid,
+          user_id: item.user_id,
+        },
       });
     },
     stateAction(item) {
-- 
2.26.0