diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index 8985b17fcc2709e9aa1e289e344cdc621c445745..fbe8b0f836656e79450f5b82035baa9b3709a33c 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -48,7 +48,9 @@
规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个； - {{ cellItem.disk_num }}数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB + 数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB
待审核
审核中
-
审核通过
-
审核未通过
-
订单已取消
+
审核通过
+
审核未通过
+
订单已取消
查看详情 -
再次申请
+
再次申请
diff --git a/src/components/order-list/order-list-com.vue b/src/components/order-list/order-list-com.vue index 9c117f6417bd4492448947d7f26d738ece4fdb49..61ad6d9d6434dee978791c69a16b509259e6bb3d 100644 --- a/src/components/order-list/order-list-com.vue +++ b/src/components/order-list/order-list-com.vue @@ -23,7 +23,7 @@
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index 55a72d604be37d6aa769b4c8d9cdabcfea2e82e9..5760eb609efb6397011025782728da23814d866e 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -107,14 +107,14 @@
数据盘（可选）：
- + @@ -345,14 +345,14 @@
增加数据盘：
- + @@ -593,10 +593,10 @@ class="dia_block_item_val" >{{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB -
+
单个容器组规格：
@@ -1042,7 +1042,7 @@ export default { this.$router.push("/services_shop"); } else { this.$message({ - message: "申请失败", + message: `申请失败，${response.data.errMsg}`, type: "error" }); } @@ -1081,7 +1081,7 @@ export default { this.$router.push("/services_shop"); } else { this.$message({ - message: "申请调整失败", + message: `申请调整失败，${response.data.errMsg}`, type: "error" }); } diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue index 96cbf74d557b54ccdf93fafdd91d007924f3f02b..653c027bd9fc3025d1e0a2fd29b3fe48018a3b54 100644 --- a/src/pages/user/order/order_detail.vue +++ b/src/pages/user/order/order_detail.vue @@ -15,17 +15,17 @@ >待审核

审核中

审核通过

审核未通过

-

订单已取消

+

订单已取消

订单编号

@@ -457,19 +457,19 @@ export default { }, nextApply() { let query = {}; - if (this.cellItem.order_type == 1) { + if (this.orderDetail.order_type == 1) { query = { - service_id: parseFloat(this.cellItem.service_id), - spec_id: this.cellItem.svc_spec_id, - duration: this.cellItem.duration, - duration_unit: this.cellItem.duration_unit + service_id: parseFloat(this.orderDetail.service_id), + spec_id: this.orderDetail.svc_spec_id, + duration: this.orderDetail.duration, + duration_unit: this.orderDetail.duration_unit }; - } else if (this.cellItem.order_type == 2) { + } else if (this.orderDetail.order_type == 2) { query = { - app_id: parseFloat(this.cellItem.app_id), - spec_id: this.cellItem.spec_app, - duration: this.cellItem.duration, - duration_unit: this.cellItem.duration_unit + app_id: parseFloat(this.orderDetail.app_id), + spec_id: this.orderDetail.spec_app, + duration: this.orderDetail.duration, + duration_unit: this.orderDetail.duration_unit }; } window.sessionStorage.setItem("shoppingCart", JSON.stringify(query)); @@ -497,9 +497,9 @@ export default { }); }, getMessage() { - if (this.cellItem.order_type == 1) { + if (this.orderDetail.order_type == 1) { this.$api.user - .getServiceEvaluation({ apply_id: this.cellItem.apply_id }) + .getServiceEvaluation({ apply_id: this.orderDetail.apply_id }) .then(response => { if (response.data.success == 1) { this.message = response.data.data; @@ -511,9 +511,9 @@ export default { }); } }); - } else if (this.cellItem.order_type == 2) { + } else if (this.orderDetail.order_type == 2) { this.$api.user - .getAppEvaluation({ apply_id: this.cellItem.apply_id }) + .getAppEvaluation({ apply_id: this.orderDetail.apply_id }) .then(response => { if (response.data.success == 1) { this.message = response.data.data; diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index a395c0a60a2d27f8c117e9c93e54ac871b846636..35e0706dac7281f7e3338359e44cc6415cfe58ff 100644 --- a/src/pages/workbench/fwgl/cloud-detail.vue +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -35,8 +35,14 @@ v-if="apploy_msg.first_level == 0" class="head_right_msg_item apply_wait" >待审批 - 审批通过 - 审批未通过 + 审批通过 + 审批未通过

业务系统名： @@ -74,12 +80,12 @@

{{ cloudDteail.disk }}
-
+
申请时长： {{ cloudDteail.apply_duration_time }} @@ -124,12 +130,12 @@
{{ cloudDetailNew.adjust_disk}}
-
+
续期时长： {{ cloudDetailNew.adjust_duration_time }}核 @@ -218,10 +224,10 @@
-
+
待审批 - 审批通过 - 审批未通过 + 审批通过 + 审批未通过
@@ -245,12 +251,12 @@ @click="distribution" >分配 拒绝 通过 @@ -646,9 +652,9 @@ export default { this.list_arr[6].info = data.bgn_time; // get time this.list_arr[7].info = data.time_remaining; // remaining days this.list_arr[8].info = data.end_time; // maturity time - this.list_arr_my[0].info = data.first_level_time; // submit application time - this.list_arr_my[1].info = data.second_level_time; // super get time - this.super_status = data.second_leve; // super status + this.list_arr_my[0].info = data.first_level_time || "暂未提交"; // submit application time + this.list_arr_my[1].info = data.second_level_time || "暂未获取"; // super get time + this.super_status = data.second_level; // super status this.desc = data.workplacedesc; // workplace description let count = data.cloud_resource_count; // resource usage if (count) { @@ -830,6 +836,10 @@ export default { padding-left: 15px; line-height: 26px; } +.params_apply_desc_1 { + margin: 5px 0; + line-height: 26px; +} .params_resource_overview { margin: 5px 0; padding-left: 15px;