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

src/components/infoList.vue

@@ -12,7 +12,7 @@
         </span>
         <span v-else v-html="item.info" style="white-space:pre-wrap;"></span>
         <span
-          v-if="item.type && item.type == 'down'"
+          v-if="item.type && item.type == 'down' && item.url != ''"
           class="filebtn"
           @click="download(item.url)"
         >下载文件</span>

src/pages/user/order/order_detail.vue

@@ -80,7 +80,7 @@
             @click="nextApply"
           >再次申请</el-button>
           <el-button
-            v-if="orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1"
+            v-if="(orderDetail.approval_first_level == 0 &&  orderDetail.pay_status != -1) || (orderDetail.approval_first_level == 1 && orderDetail.approval_second_level == 0 && orderDetail.pay_status != -1)"
             class="again"
             @click="cancelDetail"
           >取消申请</el-button>
@@ -121,7 +121,7 @@
             <img :src="require('@/assets/imgs/img_yunziyuan.png')" class="detail_service_msg_img" />
             <div class="detail_service_msg_right">
               <div class="detail_service_name_cloud">
-                <span>{{ orderDetail.namespace }}（云资源申请）</span>
+                <span>{{ orderDetail.namespace }}（{{ orderDetail.workplace }}）</span>
               </div>
             </div>
           </el-col>
@@ -382,7 +382,10 @@ export default {
         .then(response => {
           if (response.data.success == 1) {
             this.orderDetail = response.data.data;
-            this.data = JSON.parse(this.orderDetail.res_fields);
+            if (this.orderDetail.res_fields != "") {
+              this.data = JSON.parse(this.orderDetail.res_fields);
+            }
+            console.log(this.data);
             this.getOrderUser();
             this.getOrderApproval();
           } else {
@@ -407,7 +410,10 @@ export default {
     },
     getOrderApproval() {
       this.$api.user
-        .getOrderApproval({ apply_id: this.orderDetail.apply_id })
+        .getOrderApproval({
+          apply_id: this.orderDetail.apply_id,
+          kind: this.orderDetail.order_type
+        })
         .then(response => {
           if (response.data.success == 1) {
             let data = response.data.data;

src/pages/workbench/fwgl/fwglList.vue

@@ -1205,39 +1205,42 @@ export default {
           if (this.type == 2) {
             const cloud = data.data.cloud_resource_count;
 
-            if (this.level == 1) {
+            if (this.level != 2) {
               this.listTotal = data.total;
               this.listData = data.data.cloud_apply_list;
-              this.cloud_zuzhi = {
-                count_zy: cloud.count_zy,
-                dashboard_list: [
-                  {
-                    name: "CPU使用量",
-                    value: cloud.cpu_use,
-                    total: cloud.cpu_total,
-                    unit: "（核）",
-                  },
-                  {
-                    name: "内存使用量",
-                    value: cloud.memory_use,
-                    total: cloud.memory_total,
-                    unit: "（GB）",
-                  },
-                  /* {
+
+              if (this.level == 1) {
+                this.cloud_zuzhi = {
+                  count_zy: cloud.count_zy,
+                  dashboard_list: [
+                    {
+                      name: "CPU使用量",
+                      value: cloud.cpu_use,
+                      total: cloud.cpu_total,
+                      unit: "（核）",
+                    },
+                    {
+                      name: "内存使用量",
+                      value: cloud.memory_use,
+                      total: cloud.memory_total,
+                      unit: "（GB）",
+                    },
+                    /* {
                     name: "数据盘使用量",
                     value: cloud.disk_use,
                     total: cloud.disk_total,
                     unit: "（GB）",
                   }, */
-                  {
-                    name: "容器组使用量",
-                    value: cloud.containers_use,
-                    total: cloud.containers_total,
-                    unit: "（个）",
-                  },
-                ],
-              };
-            } else if (this.level == 2) {
+                    {
+                      name: "容器组使用量",
+                      value: cloud.containers_use,
+                      total: cloud.containers_total,
+                      unit: "（个）",
+                    },
+                  ],
+                };
+              }
+            } else {
               this.cloud_admin = {
                 dashboard_list: [
                   {

src/pages/workbench/yygl/yyglList.vue

@@ -450,7 +450,7 @@ export default {
             align: "center",
           },
           {
-            label: "部署区域",
+            label: "工作区域",
             prop: "namespace",
             align: "center",
           },
@@ -757,7 +757,7 @@ export default {
             align: "center",
           },
           {
-            label: "部署区域",
+            label: "工作区域",
             prop: "namespace",
             align: "center",
           },

src/request/api/user.js

@@ -32,7 +32,7 @@ const user = {
         return axios.get(`/apaas/serviceapp/v3/order/applyInfo?order_id=${params.order_id}`);
     },
     getOrderApproval(params) {
-        return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}`);
+        return axios.get(`/apaas/serviceapp/v3/order/approval?apply_id=${params.apply_id}&kind=${params.kind}`);
     },
     cancelOrder(params) {
         return axios.get(`/order/cancel?order_id=${params.order_id}`);