Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

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) {

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;

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) {