From 4f146238a3117e4f9810bcd96960eb115cc1f5ed Mon Sep 17 00:00:00 2001 From: liudianxin Date: Mon, 29 Jun 2020 17:23:17 +0800 Subject: [PATCH] =?UTF-8?q?helper=E4=B8=8B=E8=BD=BD=E3=80=81=E6=95=B0?= =?UTF-8?q?=E5=AD=97=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=BA=91=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/infoList.vue | 45 +- src/components/order-list/order-list-cell.vue | 11 +- src/components/table/table-input.vue | 7 +- src/pages/user/order/order_detail.vue | 147 ++- src/pages/workbench/workPlace.vue | 840 +++++++++--------- src/services/helper.js | 24 + 6 files changed, 635 insertions(+), 439 deletions(-) diff --git a/src/components/infoList.vue b/src/components/infoList.vue index 1339c71..6d32596 100644 --- a/src/components/infoList.vue +++ b/src/components/infoList.vue @@ -6,39 +6,42 @@ {{ item.title }}

- 访问地址: {{ item.info }} - - 下载文件 + + 访问地址: + {{ item.info }} + + + 下载文件

- + diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index f294ecc..6dc3577 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -23,18 +23,25 @@ -
+
规格:日访问次数:{{ cellItem.spec_svc_count }}次,日访问量:{{ cellItem.spec_svc_pv }}
申请方式:{{ cellItem.duration_unit == 1 ? $t('lang.byMonth') : $t('lang.byYear') }}
+
+
规格:{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}
+
+
+
规格:CPU 2核,内存 4GB,容器组 8个;数据盘 3块,每块数据盘容量 2GB
+
单个容器组:CPU最高 4核,默认 2核;内存最高 8 GB,默认 4GB
+
待审核
审核中
审核通过
审核未通过
diff --git a/src/components/table/table-input.vue b/src/components/table/table-input.vue index 8f5e2d8..4b89558 100644 --- a/src/components/table/table-input.vue +++ b/src/components/table/table-input.vue @@ -58,7 +58,7 @@ import helper from "@/services/helper"; export default { props: { item: { - type: [String,Number], + type: [String, Number], default: "" }, header: { @@ -95,7 +95,8 @@ export default { anotherData: { directory: "file" }, - inputTextUp: "" + inputTextUp: "", + helper: helper }), mounted() { this.inputText = this.item; @@ -118,7 +119,7 @@ export default { url: response.data, name: response.data }); - this.inputTextUp = file.name; + this.inputTextUp = helper.downloadFileFormat(file.name); this.$emit("changeUpFile", { rowId: this.rowId, header: this.header, diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue index 469a6df..b7c0de2 100644 --- a/src/pages/user/order/order_detail.vue +++ b/src/pages/user/order/order_detail.vue @@ -89,7 +89,7 @@
{{ orderDetail.order_type == 1 ? "服务" : "应用"}}信息
- +
@@ -105,8 +105,28 @@
+ + +
+
+ {{ orderDetail.name }} +
+
+
{{ orderDetail.sector }}
+
{{ orderDetail.src_organization }}
+
+
+
+ + +
+
+ {{ orderDetail.name }} +
+
+
-
+
规格: {{orderDetail.duration_unit == 1 ? "按月" : "按年"}}
+
+
+ 规格: + 申请获取应用镜像部署权限 +
+
+
+
+ 类型: + 申请新的工作区域 +
+
@@ -131,10 +163,64 @@
-
应用场景:
-
{{ orderDetail.scene }}
-
申请内容:
- +
+
应用简介:
+
{{ orderDetail.scene }}
+
+
+
功能简介:
+
{{ orderDetail.scene }}
+
+
+
应用场景:
+
{{ orderDetail.scene }}
+
+
+
工作区域描述:
+
{{ orderDetail.scene }}
+
+
+ 申请规格: +
+
+ CPU: + 2核 +
+
+ 内存: + 4GB +
+
+ 容器组: + 2核 +
+
+ 数据盘: + 2核 +
+
+ 单个容器组规格: +
+
+ CPU: +

+ 最高 2核 + 默认 2核 +

+
+
+ CPU: +

+ 最高 2核 + 默认 2核 +

+
+
+
+
+
申请内容:
+ +
申请人信息
@@ -512,6 +598,19 @@ export default { -webkit-box-orient: vertical; font-size: 16px; } +.detail_service_name_cloud { + width: 100%; + line-height: 24px; + margin-top: 50px; + text-overflow: -o-ellipsis-lastline; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + line-clamp: 2; + -webkit-box-orient: vertical; + font-size: 16px; +} .detail_service_msg_other { position: absolute; bottom: 2px; @@ -598,6 +697,42 @@ export default { background-color: #e1e4fb; color: #626de9; } +.params_block { + background-color: #f8f9fd; + border-radius: 8px; + margin: 10px 0; + padding: 20px; + font-size: 14px; + line-height: 22px; +} +.params_block_title { + padding-left: 10px; + color: #242c43; +} +.params_block_item { + padding: 10px 0 0 0; +} +.params_block_item_in { + display: flex; + justify-content: space-between; + margin-bottom: 5px; +} +.params_block_item_title { + color: #8890a7; + width: 120px; + text-align: right; +} +.params_block_item_val { + color: #242c43; + width: calc(100% - 130px); +} +.val_has_2 { + margin-right: 20px; +} +.margin_top_20 { + display: block; + margin-top: 20px; +}