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

src/assets/css/index.css

@@ -676,6 +676,10 @@ width: 620px!important;
   height: calc(100vh - 84px - 83px);
   min-height: 400px;
 }
+.apaas_detail_container .main_contaner.locked_height_900 {
+  height: calc(100vh - 84px - 83px);
+  min-height: 900px;
+}
 .apaas_detail_container .detail_action {
   text-align: right;
   margin-top: 50px;

src/components/shop-cloud/shop-cloud.vue

@@ -1300,6 +1300,7 @@ export default {
               store_type: "nfs-client",
             },
           ],
+          remove_disks: this.delDataDiskList.map((item) => item.id),
         };
         this.$api.serviceShop.updateCloud(query).then((response) => {
           if (response.data.success == 1) {

src/pages/message-management/directed-push/directed-push-add.vue

@@ -14,7 +14,7 @@
       </el-breadcrumb>
     </div>
 
-    <div class="main_contaner locked_height">
+    <div class="main_contaner locked_height_900">
       <steps
         :active-step="step"
         :done="done"

src/pages/message-management/message-alert/message-alert-add.vue

@@ -14,7 +14,7 @@
       </el-breadcrumb>
     </div>
 
-    <div class="main_contaner locked_height">
+    <div class="main_contaner locked_height_900">
       <steps
         :active-step="step"
         :done="done"

src/pages/workbench/fwgl/fwglList.vue

@@ -502,10 +502,7 @@ export default {
             align: "center",
             type: "image-tooltip",
             getImage(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return require("@/assets/imgs/ic_cancel.png");
               }
 
@@ -514,10 +511,7 @@ export default {
                 : require("@/assets/imgs/ic_failed.png");
             },
             getTooltip(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return "审批未通过";
               }
 
@@ -873,10 +867,7 @@ export default {
             align: "center",
             type: "image-tooltip",
             getImage(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return require("@/assets/imgs/ic_cancel.png");
               }
 
@@ -885,10 +876,7 @@ export default {
                 : require("@/assets/imgs/ic_failed.png");
             },
             getTooltip(item) {
-              if (
-                (item.apply_type === 0 && item.approve_state === -1) ||
-                (item.apply_type === 1 && item.approve_update_state === -1)
-              ) {
+              if (item.apply_type === 0 && item.approve_state === -1) {
                 return "审批未通过";
               }
 

src/pages/workbench/fwgl/organizationCloudResource.vue

@@ -443,10 +443,7 @@ export default {
         align: "center",
         type: "image-tooltip",
         getImage(item) {
-          if (
-            (item.apply_type === 0 && item.approve_state === -1) ||
-            (item.apply_type === 1 && item.approve_update_state === -1)
-          ) {
+          if (item.apply_type === 0 && item.approve_state === -1) {
             return require("@/assets/imgs/ic_cancel.png");
           }
 
@@ -455,10 +452,7 @@ export default {
             : require("@/assets/imgs/ic_failed.png");
         },
         getTooltip(item) {
-          if (
-            (item.apply_type === 0 && item.approve_state === -1) ||
-            (item.apply_type === 1 && item.approve_update_state === -1)
-          ) {
+          if (item.apply_type === 0 && item.approve_state === -1) {
             return "审批未通过";
           }