From 30f3f139a83eeb7f36e98d77160ff0db566bb554 Mon Sep 17 00:00:00 2001 From: liudianxin Date: Fri, 10 Jul 2020 15:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E8=B5=84=E6=BA=90=EF=BC=8Cfix?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/imgs/img_yunziyuan.png | Bin 0 -> 4392 bytes src/components/e-charts/dashboard.vue | 30 ++-- src/components/order-list/order-list-cell.vue | 49 +++++-- .../service-list/commodity-cell.vue | 22 +-- src/components/service-list/service_list.vue | 10 +- src/components/shop-cloud/shop-cloud.vue | 92 ++++++++---- src/pages/user/order/order_detail.vue | 32 ++-- src/pages/user/user_info.vue | 1 + src/pages/workbench/fwgl/cloud-detail.vue | 137 ++++++++++++++---- src/request/api/workbench.js | 6 +- 10 files changed, 275 insertions(+), 104 deletions(-) create mode 100644 src/assets/imgs/img_yunziyuan.png diff --git a/src/assets/imgs/img_yunziyuan.png b/src/assets/imgs/img_yunziyuan.png new file mode 100644 index 0000000000000000000000000000000000000000..5ee2239ae988d863dec2cefddc447f16ab10c6d7 GIT binary patch literal 4392 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 80 - ? "#e15260" - : "#515fe7" - : self.data.data > 75 - ? "#00cfc6" - : self.data.data > 50 - ? "#54cefd" - : self.data.data > 25 - ? "#54cefd" - : "#25bdb1" + color: new graphic.LinearGradient(0, 0, 1, 0, [ + { offset: 0, color: "#fff" }, + { + offset: 1, + color: + self.dangerousValue == "high" + ? self.data.data >= 80 + ? "#e15260" + : "#515fe7" + : self.data.data > 75 + ? "#00cfc6" + : self.data.data > 50 + ? "#54cefd" + : self.data.data > 25 + ? "#54cefd" + : "#25bdb1" + } + ]) } }, barGap: "-100%" diff --git a/src/components/order-list/order-list-cell.vue b/src/components/order-list/order-list-cell.vue index 6dc3577..6925cb3 100644 --- a/src/components/order-list/order-list-cell.vue +++ b/src/components/order-list/order-list-cell.vue @@ -7,18 +7,31 @@ - + +
-
+
{{ cellItem.name }} mapService 共享 受限 敏感
+
+ 云资源申请 +
-
{{ cellItem.sector }}
-
{{ cellItem.src_organization }}
+
{{ cellItem.order_type != 3 ? cellItem.sector : cellItem.namespace }}
+
{{ cellItem.src_organization }}
+
{{ cellItem.apply_type == 0 ? "申请新的工作区域" : "升级现有工作区域" }}
@@ -33,8 +46,13 @@
规格：{{ cellItem.spec_app == 0 ? "申请获取应用镜像部署权限" : "申请获取应用镜像开发权限" }}
-
规格：CPU 2核，内存 4GB，容器组 8个；数据盘 3块，每块数据盘容量 2GB
-
单个容器组：CPU最高 4核，默认 2核；内存最高 8 GB，默认 4GB
+
+ 规格：CPU {{ cellItem.cpu }}核，内存 {{ cellItem.memory }}GB，容器组 {{ cellItem.containers }}个； + {{ cellItem.disk_num }}数据盘 {{ cellItem.disk_num }}块，每块数据盘容量 {{ cellItem.disk_cap }}GB +
+
单个容器组：CPU最高 {{ cellItem.one_cpu_max }}核，默认 {{ cellItem.one_cpu_min }}核；内存最高 {{ cellItem.one_memory_max }}GB，默认 {{ cellItem.one_memory_min }}GB
 @@ -93,7 +111,7 @@ class="cell_option_btn" @click="viewDetail(cellItem.order_id)" >查看详情 -
再次申请
+
再次申请
 @@ -220,6 +238,10 @@ export default { duration: this.cellItem.duration, duration_unit: this.cellItem.duration_unit }; + this.$router.push({ + path: "/shop/shop_car_apply", + query: query + }); } else if (this.cellItem.order_type == 2) { query = { app_id: parseFloat(this.cellItem.app_id), @@ -227,11 +249,15 @@ export default { duration: this.cellItem.duration, duration_unit: this.cellItem.duration_unit }; + this.$router.push({ + path: "/shop/shop_car_apply", + query: query + }); + } else if (this.cellItem.order_type == 2) { + this.$router.push({ + path: "/shop/shop_cloud" + }); } - this.$router.push({ - path: "/shop/shop_car_apply", - query: query - }); }, getMessage() { if (this.cellItem.order_type == 1) { @@ -310,6 +336,7 @@ export default { width: 118px; height: 118px; border-radius: 8px; + border: 3px #f4f7fc solid; } .cell_msg_right { width: calc(100% - 140px); diff --git a/src/components/service-list/commodity-cell.vue b/src/components/service-list/commodity-cell.vue index 51bca55..0a0d03a 100644 --- a/src/components/service-list/commodity-cell.vue +++ b/src/components/service-list/commodity-cell.vue @@ -30,7 +30,7 @@ 服务类型： {{ cellData.data_service_type1_name }}  {{ cellData.data_service_type2_str }}  {{ cellData.data_service_type3_str }} + >{{ cellData.data_service_type1_name }}  {{ cellData.data_service_type2_name }}  {{ cellData.data_service_type3_name }}
更新时间： @@ -89,6 +89,7 @@ export default { height: 166px; border-radius: 12px; overflow: hidden; + border: 4px #f4f7fc solid; } .com_cell_img { width: 100%; @@ -100,12 +101,13 @@ export default { } .com_cell_msg_title { color: #0d1847; - font-size: 22px; + font-size: 18px; + line-height: 30px; font-weight: 700; margin-bottom: 6px; } .com_cell_item { - font-size: 16px; + font-size: 14px; line-height: 26px; margin-top: 1px; color: #8890a7; @@ -124,12 +126,12 @@ export default { white-space: nowrap; } .com_cell_right { - width: 250px; + width: 300px; padding: 25px 0 0 50px; } .com_cell_right_text { - font-size: 14px; - margin-top: 15px; + font-size: 16px; + margin-top: 25px; } .com_cell_right_time_tit { color: #8890a7; @@ -140,10 +142,10 @@ export default { .com_cell_right_btn { background-color: #0f2683; color: #f8f9fd; - width: 160px; + width: 220px; height: 40px; border-radius: 20px; - margin-top: 35px; + margin-top: 25px; } .tags { display: inline-block; @@ -181,10 +183,10 @@ export default { .com_cell_right .el-rate__text { display: inline-block; margin-left: 10px; - font-size: 22px; + font-size: 32px; font-weight: 700; } .com_cell_right .el-rate__icon { - font-size: 20px; + font-size: 28px; } \ No newline at end of file diff --git a/src/components/service-list/service_list.vue b/src/components/service-list/service_list.vue index d949403..01f774c 100644 --- a/src/components/service-list/service_list.vue +++ b/src/components/service-list/service_list.vue @@ -223,7 +223,11 @@ export default { time_app: null, times: null }), - mounted() {}, + mounted() { + window.onresize = () => { + this.judgeHeight(); + }; + }, watch: { urlFilter: { handler(val) { @@ -335,7 +339,7 @@ export default { this.time_app = setInterval(() => { if (this.refresh_app_1 && this.refresh_app_2 && this.refresh_app_3) { this.judgeHeight(); - clearInterval(this.time_app) + clearInterval(this.time_app); } }, 50); } else { @@ -377,7 +381,7 @@ export default { } } } - this.$set((this.filterLists = list)); + this.filterLists = [...list]; }, clickOpen(index) { let list = this.openList; diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index eab3719..d69938b 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -104,30 +104,42 @@
个
+ + +
数据盘（可选）：
+ + + + + -
数据盘（可选）：
块
 -
每块数据盘容量：
GB
 +
单个容器组规格
 @@ -330,24 +342,37 @@ > + + +
增加数据盘：
+ + + + + -
增加数据盘：
块
 -
每块数据盘容量：
GB
 @@ -562,12 +587,16 @@ 容器组： {{ diaForm.containerGroup }}个
-
+
数据盘： {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB
+
+ 数据盘类型： + {{ diaForm.store_type }} +
单个容器组规格：
@@ -753,7 +782,8 @@ export default { appDuration: undefined, durType: 1, apply_file: "", - apply_file_name: "" + apply_file_name: "", + store_type: "nfs-client" }, ruleNew: { namespace: [ @@ -803,6 +833,10 @@ export default { { value: "16", label: "16" }, { value: "32", label: "32" } ], + options_store_type: [ + { value: "nfs-client", label: "nfs-client" }, + { value: "rook-ceph-block", label: "rook-ceph-block" } + ], formShow: false, specArr: [ { title: "CPU", val: "4", src: "ic_CPU" }, @@ -834,23 +868,10 @@ export default { appDuration: undefined, durType: 1, apply_file: "", - apply_file_name: "" - }, - paramsOld: { - cpu: "", - memory: "", - containerGroup: undefined, - dataDisk: undefined, - perDataDisk: undefined, - perCPUs: undefined, - perCPU: undefined, - perRAMs: undefined, - perRAM: undefined, - appDuration: undefined, - durType: 1, - apply_file: "", - apply_file_name: "" + apply_file_name: "", + store_type: "nfs-client" }, + paramsOld: {}, ruleOld: { namespace: [ { required: true, message: "请输入工作区域名称", trigger: "blur" } @@ -944,7 +965,8 @@ export default { this.formOld.perCPU = paramsOld.one_cpu_min; this.formOld.perRAMs = paramsOld.one_memory_max; this.formOld.perRAM = paramsOld.one_memory_min; - this.dataDiskList = paramsOld.disk_list; + this.formOld.store_type = paramsOld.store_type; + this.dataDiskList = paramsOld.disk_list || []; this.formShow = true; } else { this.formShow = false; @@ -999,7 +1021,14 @@ export default { one_cpu_max: this.formNew.perCPUs, one_memory_min: this.formNew.perRAM, one_memory_max: this.formNew.perRAMs - } + }, + disks: [ + { + disk_num: this.formOld.dataDisk, + disk_cap: this.formOld.perDataDisk, + store_type: this.formOld.store_type + } + ] }; this.$api.serviceShop.applicationCloud(query).then(response => { console.log(response); @@ -1016,13 +1045,18 @@ export default { apply_connect_mobile: this.form.phone, memory: Number(this.formOld.memory), containers: this.formOld.containerGroup, - disk_num: this.formOld.dataDisk, - disk_cap: this.formOld.perDataDisk, one_cpu_min: this.formOld.perCPU, one_cpu_max: this.formOld.perCPUs, one_memory_min: this.formOld.perRAM, one_memory_max: this.formOld.perRAMs - } + }, + disks: [ + { + disk_num: this.formOld.dataDisk, + disk_cap: this.formOld.perDataDisk, + store_type: this.formOld.store_type + } + ] }; this.$api.serviceShop.updateCloud(query).then(response => { console.log(response); diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue index 66bc7ff..fdfd177 100644 --- a/src/pages/user/order/order_detail.vue +++ b/src/pages/user/order/order_detail.vue @@ -10,22 +10,22 @@

申请状态

待审核

审核中

审核通过

审核未通过

-

订单已取消

+

订单已取消

订单编号

@@ -118,10 +118,10 @@
- +
- {{ orderDetail.name }} + {{ orderDetail.namespace }}（云资源申请）
@@ -195,7 +195,9 @@
数据盘： - {{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB + {{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB
单个容器组规格： @@ -222,7 +224,7 @@
申请人信息
- + @@ -506,9 +508,18 @@ export default { line-height: 28px; color: #242c43; } -.blue { +.text_blue { color: #515fe7; } +.text_yellow { + color: #ef9433; +} +.text_blackblue { + color: #242c43; +} +.text_red { + color: #e15260; +} .btn_group { position: absolute; right: 20px; @@ -579,6 +590,7 @@ export default { width: 118px; height: 118px; border-radius: 8px; + border: 3px #f4f7fc solid; } .detail_service_msg_right { width: calc(100% - 140px); diff --git a/src/pages/user/user_info.vue b/src/pages/user/user_info.vue index a046df2..2cf05a7 100644 --- a/src/pages/user/user_info.vue +++ b/src/pages/user/user_info.vue @@ -288,6 +288,7 @@ export default { : this.user_data.userType == 3 ? "普通用户" : "普通用户开发者"; + this.imgList = []; this.imgList.push(data.picture_path); this.formBusiness.businessSystemName = data.system_name; this.formBusiness.domainName = data.domain_name; diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index 87c9f45..5fe557b 100644 --- a/src/pages/workbench/fwgl/cloud-detail.vue +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -1,4 +1,11 @@