From 194292085457bbf5c93038e6330719e26aa4d839 Mon Sep 17 00:00:00 2001
From: liudianxin <liudianxin@bd-apaas.com>
Date: Mon, 24 Aug 2020 11:22:44 +0800
Subject: [PATCH] =?UTF-8?q?order=E5=88=97=E8=A1=A8=EF=BC=8C=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E6=A1=A3=E6=A1=88=EF=BC=8C=E4=BA=91=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order-list/order-list-com.vue | 36 ++++++++++++--------
 src/pages/user/user_info.vue                 | 16 +++++----
 src/pages/workbench/fwgl/cloud-detail.vue    |  8 +++--
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/components/order-list/order-list-com.vue b/src/components/order-list/order-list-com.vue
index f7a1ab1..274ef1b 100644
--- a/src/components/order-list/order-list-com.vue
+++ b/src/components/order-list/order-list-com.vue
@@ -169,22 +169,28 @@ export default {
       let service = 0;
       let app = 0;
       let resource = 0;
-      this.buttonList.forEach((item) => {
-        if (item.state == true) {
-          if (item.id == 0) {
-            resource = 1;
-            app = 1;
-            service = 1;
-          } else if (item.id == "cloud") {
-            resource = 1;
-          } else if (item.id == "app") {
-            app = 1;
-          } else {
-            service = 1;
-            arr.push(item.id);
+      if (this.buttonList.length == 0) {
+        resource = 1;
+        app = 1;
+        service = 1;
+      } else {
+        this.buttonList.forEach((item) => {
+          if (item.state == true) {
+            if (item.id == 0) {
+              resource = 1;
+              app = 1;
+              service = 1;
+            } else if (item.id == "cloud") {
+              resource = 1;
+            } else if (item.id == "app") {
+              app = 1;
+            } else {
+              service = 1;
+              arr.push(item.id);
+            }
           }
-        }
-      });
+        });
+      }
       // console.log(service, app, resource);
       let params = {
         select: this.search,
diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue
index e789deb..ffbfe0c 100644
--- a/src/pages/user/user_info.vue
+++ b/src/pages/user/user_info.vue
@@ -83,9 +83,9 @@
           <el-form-item class="info_item">
             <p>IP（白名单）：</p>
             <div class="ip_block">
-              <div v-for="item in formBusiness.ip_white" :key="item" class="ip_item">
+              <div v-for="(item, index) in formBusiness.ip_white" :key="item" class="ip_item">
                 {{ item }}
-                <i class="el-icon-close ip_del" @click="delIp(item, 'white')"></i>
+                <i class="el-icon-close ip_del" @click="delIp(index, 'white')"></i>
               </div>
               <el-input
                 v-if="whiteAddShow"
@@ -99,9 +99,9 @@
           <el-form-item class="info_item">
             <p>IP（黑名单）：</p>
             <div class="ip_block">
-              <div v-for="item in formBusiness.ip_black" :key="item" class="ip_item">
+              <div v-for="(item, index) in formBusiness.ip_black" :key="item" class="ip_item">
                 {{ item }}
-                <i class="el-icon-close ip_del" @click="delIp(item, 'black')"></i>
+                <i class="el-icon-close ip_del" @click="delIp(index, 'black')"></i>
               </div>
               <el-input
                 v-if="blackAddShow"
@@ -564,8 +564,12 @@ export default {
       }
       document.body.removeChild(input);
     },
-    delIp(ip, type) {
-      console.log(ip, type);
+    delIp(index, type) {
+      if (type == "white") {
+        this.ruleForm_1.ip_white.splice(index, 1);
+      } else if (type == "black") {
+        this.ruleForm_1.ip_black.splice(index, 1);
+      }
     },
     addIp(type) {
       if (type == "white") {
diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue
index 071d89b..e54b799 100644
--- a/src/pages/workbench/fwgl/cloud-detail.vue
+++ b/src/pages/workbench/fwgl/cloud-detail.vue
@@ -302,8 +302,7 @@ export default {
   data() {
     return {
       id: "",
-      url:
-        "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
+      url: "",
       helper,
       list_arr: [
         {
@@ -322,7 +321,7 @@ export default {
         },
         {
           title: "资源申请文件：",
-          info: "2222222222222222222222.docs",
+          info: "2.docs",
           url: "",
           type: "down",
         },
@@ -493,6 +492,9 @@ export default {
       this.apply_type = this.$route.query.apply_type || 0;
       this.use_uid = this.$route.query.use_uid || "";
       this.id = this.$route.params.id || "";
+      if (this.apply_type != 0) {
+        this.list_arr[2].title = "资源调整数据规格";
+      }
     },
     getUrl() {
       return this.$route.path.substring(0, 9);
-- 
2.26.0