diff --git a/src/assets/svg/topology_ic_ganzhifw.svg b/src/assets/svg/topology_ic_ganzhifw.svg
new file mode 100644
index 0000000000000000000000000000000000000000..9d1f75758ede69f8da4df86630c6a1ef301f3efd
--- /dev/null
+++ b/src/assets/svg/topology_ic_ganzhifw.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><defs><style>.cls-1{fill:#a1b1f6;}.cls-2{fill:#495feb;}</style></defs><title>ic_画板 17</title><rect class="cls-1" x="4.22" y="4.22" width="13.56" height="13.56" transform="translate(-4.56 11) rotate(-45)"/><path class="cls-2" d="M11,2.83,19.17,11,11,19.17,2.83,11,11,2.83M11,0,0,11,11,22,22,11,11,0Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svg/topology_ic_shikongfw.svg b/src/assets/svg/topology_ic_shikongfw.svg
new file mode 100644
index 0000000000000000000000000000000000000000..48a34980bae936a73c52d9639c6097cd11846842
--- /dev/null
+++ b/src/assets/svg/topology_ic_shikongfw.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><defs><style>.cls-1{fill:#a1b1f6;}.cls-2{fill:#495feb;}</style></defs><title>ic_画板 15</title><path class="cls-1" d="M10,19a9,9,0,1,1,9-9A9,9,0,0,1,10,19Z"/><path class="cls-2" d="M10,2a8,8,0,1,1-8,8,8,8,0,0,1,8-8m0-2A10,10,0,1,0,20,10,10,10,0,0,0,10,0Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svg/topology_ic_shipinfw.svg b/src/assets/svg/topology_ic_shipinfw.svg
new file mode 100644
index 0000000000000000000000000000000000000000..1f386ccae335af89ea436108ab772a16ac5c923a
--- /dev/null
+++ b/src/assets/svg/topology_ic_shipinfw.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 19.05"><defs><style>.cls-1{fill:#a1b1f6;}.cls-2{fill:#495feb;}</style></defs><title>ic_画板 16</title><polygon class="cls-1" points="1.73 18.05 11 2 20.27 18.05 1.73 18.05"/><path class="cls-2" d="M11,4l7.54,13.05H3.46L11,4m0-4L0,19.05H22L11,0Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svg/topology_ic_shujufw.svg b/src/assets/svg/topology_ic_shujufw.svg
new file mode 100644
index 0000000000000000000000000000000000000000..d33bbe93cac67ea97b1943c6727a5e3646025b57
--- /dev/null
+++ b/src/assets/svg/topology_ic_shujufw.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#a1b1f6;}.cls-2{fill:#495feb;}</style></defs><title>ic_画板 14</title><rect class="cls-1" x="1" y="1" width="16" height="16"/><path class="cls-2" d="M16,2V16H2V2H16m2-2H0V18H18V0Z"/></svg>
\ No newline at end of file
diff --git a/src/assets/svg/topology_ic_zonghefw.svg b/src/assets/svg/topology_ic_zonghefw.svg
new file mode 100644
index 0000000000000000000000000000000000000000..b5b13db0304f4fddd6355f48a635d76620c10d39
--- /dev/null
+++ b/src/assets/svg/topology_ic_zonghefw.svg
@@ -0,0 +1 @@
+<svg id="图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 20.92"><defs><style>.cls-1{fill:#a1b1f6;}.cls-2{fill:#495feb;}</style></defs><title>ic_画板 18</title><polygon class="cls-1" points="4.93 19.92 1.18 8.37 11 1.24 20.82 8.37 17.07 19.92 4.93 19.92"/><path class="cls-2" d="M11,2.47l8.65,6.28-3.3,10.17H5.65L2.35,8.76,11,2.47M11,0,0,8,4.2,20.92H17.8L22,8,11,0Z"/></svg>
\ No newline at end of file
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue
index f1d0f41574ed81c6c7ce2588b607251ddfd3b183..29bf92c783102b4a71e164a5009c2dfec6b1f5b4 100644
--- a/src/components/shop-cloud/shop-cloud.vue
+++ b/src/components/shop-cloud/shop-cloud.vue
@@ -139,7 +139,7 @@
                       <div class="input_right">GB</div>
                     </el-form-item>
                   </el-col>
-                  
+
                   <el-col :span="24">
                     <div class="form_title">单个容器组规格</div>
                   </el-col>
@@ -1059,7 +1059,18 @@ export default {
           ]
         };
         this.$api.serviceShop.updateCloud(query).then(response => {
-          console.log(response);
+          if (response.data.success == 1) {
+            this.$message({
+              message: "申请成功",
+              type: "success"
+            });
+            this.$router.push("/services_shop");
+          } else {
+            this.$message({
+              message: "申请失败",
+              type: "error"
+            });
+          }
         });
       }
       console.log(this.form);
diff --git a/src/components/table/table-um.vue b/src/components/table/table-um.vue
index d544ffa05f2a0367c7078fea5e645a9e6581ac41..594e840cebcf87cbf27a36c9e612b9bf135a252b 100644
--- a/src/components/table/table-um.vue
+++ b/src/components/table/table-um.vue
@@ -86,7 +86,7 @@
           <template slot-scope="scope">
             <!-- 操作按钮 -->
             <span v-if="item.type === 'Button'">
-              <b v-for="(btn, key) in item.btnList" :key="key" :style="{marginRight:item.btngap}" v-if="!item.public_flag||item.public_flag==false?true:get_show_func(key,scope)">
+              <b v-for="(btn, key) in item.btnList" :key="key" :style="{marginRight:item.btngap}">
                 <em v-if="btn.label == '分配'">
                   <em
                     v-if="btn.label == '分配' && scope.row.state == 0"
diff --git a/src/components/topology.vue b/src/components/topology.vue
index 5dff6c0bc671718b25520f329321f05b53edf931..1df78ea4de99decf011a6ab92c82ee448dcbc16b 100644
--- a/src/components/topology.vue
+++ b/src/components/topology.vue
@@ -17,14 +17,23 @@
 import G6 from "@antv/g6";
 export default {
   props: {
-    datas: Object,
+    datas: {
+      type: Object,
+      default: () => {
+        return {
+          nodes: [],
+          edges: []
+        };
+      }
+    },
     namespace: String
   },
   mounted() {},
   watch: {
     datas(val) {
-      console.log(val);
       this.getCavData();
+      this.getLegendNodes();
+      this.getLegendEdges();
     }
   },
   methods: {
@@ -36,32 +45,32 @@ export default {
         switch (node.data.nodeType) {
           case "workload":
             node.type = "image";
-            node.img = "./static/topology_ic_shujufw.svg";
+            node.img = require("@/assets/svg/topology_ic_shujufw.svg");
             node.size = [15, 15];
             break;
           case "app":
             node.type = "image";
-            node.img = "./static/topology_ic_shujufw.svg";
+            node.img = require("@/assets/svg/topology_ic_shujufw.svg");
             node.size = [15, 15];
             break;
           case "unknow source":
             node.type = "image";
-            node.img = "./static/topology_ic_shujufw.svg";
+            node.img = require("@/assets/svg/topology_ic_shujufw.svg");
             node.size = [15, 15];
             break;
           case "service":
             node.type = "image";
-            node.img = "./static/topology_ic_shujufw.svg";
+            node.img = require("@/assets/svg/topology_ic_shujufw.svg");
             node.size = [15, 15];
             break;
           case "service entry":
             node.type = "image";
-            node.img = "./static/topology_ic_shujufw.svg";
+            node.img = require("@/assets/svg/topology_ic_shujufw.svg");
             node.size = [15, 15];
             break;
           default:
             node.type = "image";
-            node.img = "./static/topology_ic_shujufw.svg";
+            node.img = require("@/assets/svg/topology_ic_ganzhifw.svg");
             node.size = [15, 15];
             break;
         }
@@ -86,6 +95,11 @@ export default {
         edge.id = edge.data.id;
         edge.source = edge.data.source;
         edge.target = edge.data.target;
+        edge.label = edge.data.traffic.rates
+          ? edge.data.traffic.rates.tcp
+            ? edge.data.traffic.rates.tcp
+            : edge.data.traffic.rates.http
+          : "";
         edge.style = {
           stroke: "#494e8f",
           lineWidth: 1,
@@ -97,17 +111,43 @@ export default {
           strokeOpacity: 1,
           cursor: "pointer"
         };
-        if (edge.data.xxx == "success") {
-          // sueecss
-          edge.style.stroke = "#25bdb1";
+        if (edge.data.traffic.protocol == "tcp") {
+          // tcp
+          edge.type = "1";
+          edge.style.stroke = "#c77eb5";
+        } else if (edge.data.traffic.protocol == "http") {
+          if (edge.data.traffic.responses) {
+            let sta = 0;
+            for (let i in edge.data.traffic.responses) {
+              if (
+                i.substring(i.length - 3, i.length - 2) == 5 ||
+                i.substring(i.length - 3, i.length - 2) == 4
+              ) {
+                sta += edge.data.traffic.responses[i][0];
+              } else {
+                sta += 0;
+              }
+              if (sta > 20) {
+                edge.style.stroke = "#d93a49";
+                edge.type = "3";
+              } else if (sta == 0) {
+                edge.style.stroke = "#1d953f";
+                edge.type = "2";
+              } else {
+                edge.style.stroke = "#f36c21";
+                edge.type = "2";
+              }
+            }
+          } else {
+            edge.style.stroke = "#a1a3a6";
+            edge.type = "0";
+          }
         } else {
-            // warning
-          edge.style.stroke = "#e15260";
+          edge.style.stroke = "#1d953f";
+          edge.type = "2";
         }
       });
       self.getCav();
-      self.getLegendNodes();
-      self.getLegendEdges();
     },
     getCav() {
       const width = this.$refs.conCav.scrollWidth;
@@ -224,7 +264,7 @@ export default {
             x: legendX,
             y: legendBeginY,
             type: "image",
-            img: "./static/topology_ic_shujufw.svg",
+            img: require("@/assets/svg/topology_ic_shujufw.svg"),
             size: [15, 15],
             label: "数据服务"
           },
@@ -233,7 +273,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 1,
             type: "image",
-            img: "./static/topology_ic_shikongfw.svg",
+            img: require("@/assets/svg/topology_ic_shikongfw.svg"),
             size: [15, 15],
             label: "时空服务"
           },
@@ -242,7 +282,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 2,
             type: "image",
-            img: "./static/topology_ic_shipinfw.svg",
+            img: require("@/assets/svg/topology_ic_shipinfw.svg"),
             size: [15, 15],
             label: "视频服务"
           },
@@ -251,7 +291,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 3,
             type: "image",
-            img: "./static/topology_ic_ganzhifw.svg",
+            img: require("@/assets/svg/topology_ic_ganzhifw.svg"),
             size: [15, 15],
             label: "感知服务"
           },
@@ -260,7 +300,7 @@ export default {
             x: legendX,
             y: legendBeginY + legendYPadding * 4,
             type: "image",
-            img: "./static/topology_ic_zonghefw.svg",
+            img: require("@/assets/svg/topology_ic_zonghefw.svg"),
             size: [15, 15],
             label: "综合应用"
           }
@@ -403,11 +443,11 @@ export default {
   background-color: #fff;
 }
 .legend_in_tit {
-    color: #8890a7;
-    font-size: 14px;
-    line-height: 26px;
-    padding: 0 10px;
-    border-bottom: 2px #e5f0ff solid;;
+  color: #8890a7;
+  font-size: 14px;
+  line-height: 26px;
+  padding: 0 10px;
+  border-bottom: 2px #e5f0ff solid;
 }
 .legend_nodes {
   width: 100%;
diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue
index 5fe557b487f1803cbe64f8d96004e20aaeba8bac..5c89e234cff76b218a9d2e0fd19f825bc1a8cb22 100644
--- a/src/pages/workbench/fwgl/cloud-detail.vue
+++ b/src/pages/workbench/fwgl/cloud-detail.vue
@@ -36,7 +36,7 @@
             </p>
             <p class="head_right_msg_p">
               业务系统名：
-              <span class="head_right_msg_item">{{ cloudData.workplace }}</span>
+              <span class="head_right_msg_item">{{ cloudData.system_name }}</span>
               资源申请时间：
               <span class="head_right_msg_item">{{ cloudData.apply_time }}</span>
             </p>
@@ -291,7 +291,6 @@ export default {
   data() {
     return {
       id: "",
-      userId: "",
       url:
         "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
       helper,
@@ -456,7 +455,14 @@ export default {
       now_user: "",
       activeName: null,
       tabShow: true,
-      cloudData: {},
+      cloudData: {
+        namespace: "",
+        workplace: "",
+        user_name: "",
+        phone: "",
+        apply_time: "",
+        system_name: ""
+      },
       cloudDteail: {
         containers: "",
         cpu: "",
@@ -504,14 +510,38 @@ export default {
     }
   },
   mounted() {
+    this.getUrlQuery();
     this.getCloudDetail();
   },
   methods: {
+    getUrlQuery() {
+      this.apply_id = this.$route.query.apply_id || "";
+      this.user_id = this.$route.query.user_id || "";
+      this.apply_type = this.$route.query.apply_type || 0;
+      this.use_uid = this.$route.query.use_uid || "";
+      this.id = this.$route.query.id || "";
+      if (this.use_uid != "") {
+        this.getCloudApplication();
+      }
+    },
     getUrl() {
       return this.$route.path.substring(0, 9);
     },
+    getCloudApplication() {
+      this.$api.workbench
+        .getCloudApplication({ namespace: this.cloudData.namespace })
+        .then(response => {
+          if (response.data.success == 1) {
+            this.appList = response.data.data;
+          } else {
+            console.log(response.data.errMsg);
+          }
+        });
+    },
     download() {},
-    adjustment() {},
+    adjustment() {
+      this.$router.push("/shop/cloud");
+    },
     distribution() {
       this.$api.workbench
         .setCloudAllocation({ id: this.id, userId: this.user_id })
@@ -530,9 +560,74 @@ export default {
           }
         });
     },
-    refuse() {},
-    pass() {},
-    deleteItem() {},
+    refuse() {
+      let query = {
+        applyId: this.apply_id,
+        applyState: -1,
+        applyType: this.apply_type,
+        applyCloudId: this.id,
+        namespace: this.cloudData.namespace
+      };
+      this.$api.workbench.setCloudApproval(query).then(response => {
+        if (response.data.success == 1) {
+          this.$message({
+            message: "申请已拒绝",
+            type: "success"
+          });
+          this.$router.push(this.getUrl());
+        } else {
+          this.$message({
+            message: "申请拒绝失败",
+            type: "error"
+          });
+        }
+      });
+    },
+    pass() {
+      let query = {
+        applyId: this.apply_id,
+        applyState: 1,
+        applyType: this.apply_type,
+        applyCloudId: this.id,
+        namespace: this.cloudData.namespace
+      };
+      this.$api.workbench.setCloudApproval(query).then(response => {
+        if (response.data.success == 1) {
+          this.$message({
+            message: "申请已通过",
+            type: "success"
+          });
+          this.$router.push(this.getUrl());
+        } else {
+          this.$message({
+            message: "申请通过失败",
+            type: "error"
+          });
+        }
+      });
+    },
+    deleteItem() {
+      this.$api.workbench
+        .deleteCloud({
+          id: this.id,
+          namespace: this.cloudData.namespace,
+          useUid: this.use_uid
+        })
+        .then(response => {
+          if (response.data.success == 1) {
+          this.$message({
+            message: "该资源已删除",
+            type: "success"
+          });
+          this.$router.push(this.getUrl());
+        } else {
+          this.$message({
+            message: "资源删除失败",
+            type: "error"
+          });
+        }
+        });
+    },
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
@@ -547,6 +642,7 @@ export default {
       this.$refs.allotConfirm.getDetail(this.apply_id);
     },
     clickTab() {},
+    // 根据列表参数来判断显示什么
     setListWithRole() {
       if (this.now_user == 0) {
         // 普通用户
@@ -594,9 +690,9 @@ export default {
     },
     getCloudDetail() {
       let query = {
-        type: 0,
-        applyId: 13,
-        id: 25
+        type: this.apply_type,
+        applyId: this.apply_id,
+        id: this.id
       };
       this.$api.workbench.getCloudDetail(query).then(response => {
         let data = response.data.data;
@@ -633,7 +729,6 @@ export default {
             (count.containers_total / count.containers_use) * 100
           );
         }
-        // this.appList =
         this.cloudDteail.containers = data.containers;
         this.cloudDteail.cpu = data.cpu;
         this.cloudDteail.disk = data.disk;
@@ -654,6 +749,12 @@ export default {
         this.cloudDteail.adjust_one_memory_min = data.adjust_one_memory_min;
         this.apploy_msg.first_level = data.first_level;
         this.apploy_msg.second_level = data.second_level;
+        this.cloudData.namespace = data.namespace;
+        this.cloudData.workplace = data.workplace;
+        this.cloudData.user_name = data.user_name;
+        this.cloudData.phone = data.phone;
+        this.cloudData.apply_time = data.apply_time;
+        this.cloudData.system_name = data.system_name;
         this.setListWithRole();
       });
     }
diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue
index 86ab272b86cdcdef8bc0995b4fbc3246db8cb225..84b2cb6bd52ef6b9e6649bdf863968211939c04d 100644
--- a/src/pages/workbench/fwgl/serviceDetail.vue
+++ b/src/pages/workbench/fwgl/serviceDetail.vue
@@ -501,13 +501,9 @@ export default {
       });
     },
     getData() {
-      let url = "./static/antv.json";
-      this.$http
-        .get(url)
-        .then(response => {
-          this.datas = response.data.elements;
-        })
-        .catch(function(response) {});
+      this.$api.workbench.getServiceTopology().then(response => {
+        this.datas = response.data.elements;
+      });
     },
     getServiceInfo() {
       this.$http
diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue
index f3587a91788704d1d222769f5b05eb4e309bd696..b434b75d4c99a8d1303626308220309ea51f627f 100644
--- a/src/pages/workbench/yygl/deploy_app_detail.vue
+++ b/src/pages/workbench/yygl/deploy_app_detail.vue
@@ -181,20 +181,38 @@
                       :key="index + 6000"
                     >{{ item.name }}</span>
                   </p>
-                  <table-um
+                  <el-table
+                    :data="image_arr[index].data"
                     v-for="(item, index) in image_arr"
                     :key="index+7000"
-                    :height="300"
                     v-show="image_select == index"
-                    :headers="header_image_arr"
-                    :datas="image_arr[index].data"
-                    :public_arr="now_image_version"
-                    :stripe="true"
-                    @update="update"
-                    @rollback="rollback"
-                    @grouppublic="grouppublic"
-                    @online="online"
-                  ></table-um>
+                    stripe
+                    height="300"
+                    style="width: 100%">
+                    <el-table-column
+                      prop="tag"
+                      align="center"
+                      label="版本号">
+                    </el-table-column>
+                    <el-table-column
+                      prop="date"
+                      align="center"
+                      label="在线日期">
+                    </el-table-column>
+                    <el-table-column
+                      label="操作"
+                      align="center"
+                      width="300">
+                      <template slot-scope="scope">
+                        <el-button @click="update(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index<Math.min(...now_image_version)">升级</el-button>
+                        <el-button @click="update(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index>Math.max(...now_image_version)">回滚</el-button>
+                        <el-button @click="together(scope.row)" type="text" size="small" :disabled="up_flag" v-if="(!scope.row.subsets)&&scope.$index<Math.min(...now_image_version)">蓝绿发布</el-button>
+                        <el-button type="text" size="small" :disabled="true" v-if="scope.row.subsets">当前版本</el-button>
+                        <el-button @click="delete_ver(scope.row)" style="color:#830f53;font-weight:600;" type="text" size="small" :disabled="up_flag" v-if="scope.row.subsets&&now_image_version.length>=2">删除</el-button>
+                      </template>
+                    </el-table-column>
+                    
+                  </el-table>
                 </nor-card>
               </div>
             </div>
@@ -208,7 +226,6 @@
 
 <script>
 import infoList from "@/components/infoList";
-import tableUm from "@/components/table/table-um";
 import serviceHeader from "@/components/service-header";
 import dialogAction from "@/components/dialog-action";
 import uploadFile from "@/components/general/upload_file";
@@ -220,7 +237,6 @@ import { mapGetters, mapState } from "vuex";
 export default {
   components: {
     infoList,
-    tableUm,
     serviceHeader,
     dialogAction,
     uploadFile,
@@ -325,47 +341,6 @@ export default {
           { required: true, message: "请选择开放程度", trigger: "change" }
         ]
       },
-      header_image_arr: [
-        {
-          prop: "tag",
-          label: "版本号",
-          align: "center"
-        },
-        {
-          prop: "date",
-          label: "在线日期",
-          align: "center"
-        },
-        {
-          label: "操作",
-          type: "Button",
-          align: "center",
-          btngap:'15px',
-          public_flag:true,
-          btnList: [
-            {
-              type: "update",
-              label: "升级"
-            },
-            {
-              type: "rollback",
-              label: "回滚"
-            },
-            {
-              type: "grouppublic",
-              label: "蓝绿发布"
-            },
-            {
-              type: "online",
-              label: "当前版本",
-            },
-            {
-              type: "delete",
-              label: "删除"
-            },
-          ]
-        }
-      ],
       header_fw_arr: [
         {
           prop: "rank",
@@ -514,7 +489,9 @@ export default {
       appcode: "",
       showPass: false,
       public: false,
-      public_form: false
+      public_form: false,
+      now_tag:'',
+      up_flag:false,
     };
   },
   computed: {
@@ -536,8 +513,25 @@ export default {
       this.now_service = 1;
     }
   },
-  mounted() {},
+  mounted() {
+    
+  },
   methods: {
+    event_source(){
+      var _this = this
+      const se = new EventSource(`/apaas/istio/service/${this.header_data.namespace}/versions/events/${this.service_list_arr[this.now_micor_service].service}/${this.now_tag}/subscribe`, { withCredentials: true }) // 后端接口，要配置允许跨域属性
+      se.onopen=function(e){}
+      se.onmessage=function(e){
+        console.log(e.data)
+          se.close()
+          setTimeout(() => {
+            _this.get_micro_service()
+            _this.$message.success('更新完成')
+          }, 100);
+        
+      }
+      se.onerror=function(e){}
+    },
     getCurrentUser() {
       this.$api.user.getNowUser().then(({ data }) => {
         if (data.success == 1) {
@@ -556,7 +550,37 @@ export default {
       console.log(val);
     },
     update(val) {
-      console.log(val);
+      this.up_flag = true
+      this.$message.success('开始更新版本')
+      this.$http
+        .post(`/apaas/istio/service/${this.header_data.namespace}/image/${this.service_list_arr[this.now_micor_service].service}/${this.image_arr[this.image_select].name}/update`,{
+          tag:val.tag
+        })
+        .then(response => {
+          if(response.data.success){
+            this.get_micro_service(true)
+          }
+        })
+    },
+    together(val){
+      this.up_flag = true
+      this.$http
+        .post(`/apaas/istio/service/${this.header_data.namespace}/image/${this.service_list_arr[this.now_micor_service].service}/${this.image_arr[this.image_select].name}/publish`,{
+          tag:val.tag
+        }).then(response => {
+          this.up_flag = false
+          this.get_micro_service()
+        })
+    },
+    delete_ver(val){
+      this.up_flag = true
+      this.$http
+        .post(`/apaas/istio/service/${this.header_data.namespace}/image/${this.service_list_arr[this.now_micor_service].service}/${this.image_arr[this.image_select].name}/unpublish`,{
+          tag:val.tag
+        }).then(response => {
+          this.up_flag = false
+          this.get_micro_service(true,val.subsets)
+        })
     },
     rollback(val) {
       console.log(val);
@@ -585,7 +609,7 @@ export default {
           }
         })
     },
-    get_micro_service(){
+    get_micro_service(val,type){
       this.$http
         .get(`/apaas/istio/service/${this.header_data.namespace}/overview/${this.service_list_arr[this.now_micor_service].service}`)
         .then(response => {
@@ -606,7 +630,7 @@ export default {
               maxTraffic: data.throughput.max,
               memory: data.resource.memory
             }
-            this.getImageInfo()
+            this.getImageInfo(val,type)
           }
         })
     }, 
@@ -618,19 +642,58 @@ export default {
         return function(a,b){
             var value1 = a[property];
             var value2 = b[property];
-            // return value2 - value1;
-            return value1 - value2;
+            return value2 - value1;
+            // return value1 - value2;
         }
     },
-    getImageInfo() {
+    getImageInfo(val,type) {
       this.$http
         .get(`/apaas/istio/service/${this.header_data.namespace}/image/${this.service_list_arr[this.now_micor_service].service}/${this.image_arr[this.image_select].name}/versions`)
         .then(response => {
           console.log(response);
+          var _this = this
           let data = response.data.data;
           // this.image_arr = data.imagearr;
+          // console.log(data.list.sort(_this.compare('date')))
+          data.list.forEach(e => {
+            data.runnings.forEach(el => {
+              if(e.tag==el.tag){
+                e['subsets'] = el.subsets
+              }
+            });
+          });
           this.$set(this.image_arr[this.image_select],'data',data.list.sort(this.compare('date')))
-          this.now_image_version = data.runnings
+          this.now_image_version = []
+          this.image_arr[this.image_select].data.forEach((e,idx)=> {
+            if(e.subsets){
+              this.now_image_version.push(idx)
+            }
+          });
+          if(val){
+            //删除
+            if(type){
+              var temp = ''
+              this.now_tag.forEach(e => {
+                if(type==e){
+
+                }else{
+                  temp = e
+                }
+              });
+              this.now_tag = temp
+            }
+            //调用监听
+            this.event_source()
+          }else{
+            if(data.runnings.length==1){
+              this.now_tag = data.runnings[0].subsets
+            }else{
+              this.now_tag = [data.runnings[0].subsets,data.runnings[1].subsets]
+            }
+            this.up_flag = false
+          }
+          // console.log(Math.min(...now_image_version))
+          
         })
         .catch(function(response) {});
     },
diff --git a/src/pages/workbench/yygl/yyglList.vue b/src/pages/workbench/yygl/yyglList.vue
index 43c8a9c6b66f9ea2d3939b3a24dee3df84ef3480..5436acc8751a348d2fe479a46c78490c85caf0f0 100644
--- a/src/pages/workbench/yygl/yyglList.vue
+++ b/src/pages/workbench/yygl/yyglList.vue
@@ -233,6 +233,7 @@ export default {
               let time = item.time || "";
               return helper.dateStringTransform(time);
             },
+            width: 180,
             align: "center",
           },
           {
@@ -329,6 +330,7 @@ export default {
               let date = item.create_date || "";
               return helper.dateStringTransform(date);
             },
+            width: 180,
             align: "center",
           },
           {
@@ -444,6 +446,7 @@ export default {
               let date = item.created || "";
               return helper.dateStringTransform(date);
             },
+            width: 180,
             align: "center",
           },
           {
@@ -528,6 +531,7 @@ export default {
               let date = item.time || "";
               return helper.dateStringTransform(date);
             },
+            width: 180,
             align: "center",
           },
           {
@@ -585,14 +589,14 @@ export default {
             name: "申请状态",
             prop: "apply_state",
             data: [
-              {
-                name: "待审批",
-                value: 0,
-              },
               {
                 name: "已审批",
                 value: 1,
               },
+              {
+                name: "待审批",
+                value: 0,
+              },
             ],
           },
         ];
@@ -749,6 +753,7 @@ export default {
               let date = item.created || "";
               return helper.dateStringTransform(date);
             },
+            width: 180,
             align: "center",
           },
           {
@@ -833,6 +838,7 @@ export default {
               let date = item.time || "";
               return helper.dateStringTransform(date);
             },
+            width: 180,
             align: "center",
           },
           {
@@ -890,14 +896,14 @@ export default {
             name: "申请状态",
             prop: "apply_state",
             data: [
-              {
-                name: "待审批",
-                value: 0,
-              },
               {
                 name: "已审批",
                 value: 1,
               },
+              {
+                name: "待审批",
+                value: 0,
+              },
             ],
           },
         ];
diff --git a/src/request/api/workbench.js b/src/request/api/workbench.js
index ec80386935765e0d3d0ea5bbf1e13e92d105fec0..591e9976425c13fafbbfa5222c4ffab57b9bd473 100644
--- a/src/request/api/workbench.js
+++ b/src/request/api/workbench.js
@@ -34,7 +34,7 @@ const workbench = {
     },
     // cloud resource approval
     setCloudApproval(params) {
-        return axios.put(`/apaas/service/v3/resource/apply/approve?apply_id=${params.applyId}&apply_state=${params.applyState}&apply_type=${params.applyType}&cloud_id=${params.applyCloudId}&namespace=${params.namespace}`, params)
+        return axios.put(`/apaas/service/v3/resource/apply/approve?apply_id=${params.applyId}&apply_state=${params.applyState}&apply_type=${params.applyType}&cloud_id=${params.applyCloudId}&namespace=${params.namespace}`)
     },
     // cloud resource allocation
     setCloudAllocation(params) {
@@ -42,7 +42,7 @@ const workbench = {
     },
     // cloud resource delete
     deleteCloud(params) {
-        return axios.delete(`/apaas/service/v3/resource/apply/remove?id=${params.id}`)
+        return axios.delete(`/apaas/service/v3/resource/apply/remove?id=${params.id}&namespace=${params.namespace}&use_uid=${params.useUid}`)
     },
     // cloud resource disabled
     disabledCloud(params) {
@@ -52,6 +52,11 @@ const workbench = {
     getCloudApplication(params) {
         return axios.get(`/apaas/hubApi/market/deployList?page=1&limit=10000&namespaces=${params.namespace}`)
     },
+
+    // get service topology
+    getServiceTopology() {
+        return axios.get(`/awecloud/meshgraph/api/namespaces/graph?duration=60s&graphType=service&injectServiceNodes=false&appenders=deadNode,sidecarsCheck,serviceEntry,istio&namespaces=apaas-proxy`)
+    },
 }
 
 export default workbench;