diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue index 676fe745b15939cc5932566d9a6993a92bac1e16..375fb4e19d726a42fd22174517da3e2471571e9e 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 c1f3c6f0230457972710b02b3c4a5f48cb42aa68..6d347a6678228975142e9c5a1f5177308b1ffcb3 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 {