diff --git a/src/components/image-detail.vue b/src/components/image-detail.vue index 8a9bcea1e599186f43c3658b0f2063b7c17bfc10..33eca3458be7b84db1f5af34c9595fa491b43ae7 100644 --- a/src/components/image-detail.vue +++ b/src/components/image-detail.vue @@ -86,8 +86,7 @@ export default { }, }, methods: { - showDialog(image,id) { - image.id = id + showDialog(image) { this.image = image; this.imageData = []; this.getImageDetail(); @@ -153,7 +152,7 @@ export default { }, getImageDetail() { this.$http - .get(`/apaas/hubApi/image/imageDetails/${this.image.name}?app_id=${this.image.id}`) + .get(`/apaas/hubApi/image/imageDetails/${this.image.name}?app_id=${this.image.app_id}`) .then(({ data }) => { this.imageData = data.data || []; }) diff --git a/src/pages/workbench/app_build.vue b/src/pages/workbench/app_build.vue index adeea4335ea64c99b2430b552090a2b251855ad3..70c0ecd48206c8e626f5f4403e8f283a5d7daae9 100644 --- a/src/pages/workbench/app_build.vue +++ b/src/pages/workbench/app_build.vue @@ -597,7 +597,10 @@ export default { this.$refs.dialog.show(); }, showImageDetail(item) { - this.$refs.imageDetail.showDialog(item); + this.$refs.imageDetail.showDialog({ + ...item, + app_id: this.app_id + }); }, stepsDone() { this.done = true; diff --git a/src/pages/workbench/fwgl/approveWorkspace.vue b/src/pages/workbench/fwgl/approveWorkspace.vue index 04fb2c945e3ce9e5b9bef3e6f768ca31b2e5c79e..98e26d54a1528ad542dcc5509e9be5c8ed49f871 100644 --- a/src/pages/workbench/fwgl/approveWorkspace.vue +++ b/src/pages/workbench/fwgl/approveWorkspace.vue @@ -109,7 +109,12 @@ export default { let action = (type) => { this.$http .put("/apaas/service/v3/resource/apply/approve", null, { - params: {}, + params: { + apply_id: item.apply_id, + apply_type: item.apply_type, + cloud_id: item.id, + apply_state: type, + }, }) .then(({ data }) => { if (data.success == 1) { diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue index 12fa59048b9df35944b28cd887f1a343b75fa6df..0ea9176a16ea3df56980a549ffeda304d01815fd 100644 --- a/src/pages/workbench/fwgl/fwglList.vue +++ b/src/pages/workbench/fwgl/fwglList.vue @@ -921,11 +921,11 @@ export default { actionList: [ { getLabel(item) { - return item.use_uid ? "已分配" : "分配"; + return item.use_uid !== "" ? "已分配" : "分配"; }, callback: this.cloudAllot, disabledRule(item) { - return item.use_uid; + return item.use_uid !== ""; }, }, ], diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue index 2ba77c19038e90ecf6e2a22cb5466f74b446a2bd..a3160637d462f8d21494ff333738c22275526b08 100644 --- a/src/pages/workbench/yygl/app_detail.vue +++ b/src/pages/workbench/yygl/app_detail.vue @@ -390,7 +390,10 @@ export default { }, methods: { showImageDetail(item) { - this.$refs.imageDetail.showDialog(item, this.$route.params.id); + this.$refs.imageDetail.showDialog({ + ...item, + app_id: this.$route.params.id + }); }, getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => {