合并

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 || [];
         })

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;

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

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 !== "";
                 },
               },
             ],

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