diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 977d6ce0740f23792539dcde0815254ad955936a..134cd773556d5f9613b865c5f0ba14c3a31d8036 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -67,7 +67,8 @@ html { } body { margin: 0; - font-family: PingFangSC-Regular, sans-serif; + font-family: Microsoft YaHei, sans-serif; + /* font-size: 17px; */ } ul { list-style: none; diff --git a/src/assets/i18n/language-zh.js b/src/assets/i18n/language-zh.js index eedef54686b6476b26f8c33e3906c0e818510d7a..4ce6cd1b2572cb28d82c96841f09287178f8c20e 100644 --- a/src/assets/i18n/language-zh.js +++ b/src/assets/i18n/language-zh.js @@ -17,6 +17,9 @@ export const lang = { // work bench workBench: "工作台", + cloudResourcesService: "云资源服务", + cloudResourcesManagement: "云资源管理", + cloudResourcesDetail: "云资源详情", // data analysis dataAnalysis: "数据分析中心", diff --git a/src/components/menu.vue b/src/components/menu.vue index 21ed8ec869939a352eba2c31d3b210d632508c2e..584b3d1fbb7ea7ca48168c7e70808fb6a8054667 100644 --- a/src/components/menu.vue +++ b/src/components/menu.vue @@ -2,37 +2,54 @@
- {{ userInfo.user_name }} + {{ userInfo.user_name }} 请登录 - + " + />
-
- {{ item.name }} -
+
{{ item.name }}
-
+
最近加入的服务：
-
- +
+
-

- {{ item.service_id == 0 ? item.application.app_name : item.service.name }} -

-

- {{ item.service_id == 0 ? item.application.ywly : item.service.sectors_name }} -

-

- {{ item.service_id == 0 ? item.application.org : item.service.organization_name }} -

+

{{ item.service_id == 0 ? item.application.app_name : item.service.name }}

+

{{ item.service_id == 0 ? item.application.ywly_name : item.service.sectors_name }}

+

{{ item.service_id == 0 ? item.application.org_name : item.service.organization_name }}

@@ -46,12 +63,20 @@
-
+
{{ item.menu_name }}
-
- {{ v.menu_name }} -
+
{{ v.menu_name }}
@@ -140,7 +165,6 @@ export default { this.now_menu = parent; window.sessionStorage.setItem("menuVisitUrl", parent); } - }, getList() { this.$api.serviceShop.getShoppingCart().then(response => { diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue index 2dee6bd3cd3804d3d8d00c9aefe67d3a1ed8aac9..962498095a30c9aa9b746b69791beab6dc5c1ad4 100644 --- a/src/components/shop-cloud/shop-cloud.vue +++ b/src/components/shop-cloud/shop-cloud.vue @@ -53,48 +53,78 @@
描述信息：
- +
工作区域申请规格
 - +
CPU：
- +
核
 - +
内存：
- +
GB
 - +
容器组：
- +
个
数据盘（可选）：
- +
块
每块数据盘容量：
- +
GB
 @@ -105,16 +135,28 @@
CPU：
- +
最高
- +
核
 - +
默认
- +
核
 @@ -122,16 +164,28 @@
内存：
- +
最高
- +
核
 - +
默认
- +
核
 @@ -139,11 +193,24 @@
其他信息
- +
申请时长：
- - - + + + @@ -151,7 +218,14 @@
申请文件：
- + @@ -165,15 +239,20 @@
选择要进行调整的工作区域：
- +
-
+
- +
工作区域规格调整
@@ -181,55 +260,95 @@
当前规格：
-
- +
+ {{ item.title }} - {{ item.val + " " + (item.title == "CPU" ? "核" : item.title == "内存" ? "GB" : "个") }} + {{ item.val + " " + (item.title == "CPU" ? "核" : item.title == "内存" ? "GB" : "个") }}
- +
申请CPU调整为：
- +
核
 - +
申请内存调整为：
- +
GB
 - +
申请容器组调整为：
- +
个
调整数据盘：
- +
增加数据盘：
- +
块
每块数据盘容量：
- +
GB
 @@ -239,13 +358,24 @@
当前规格：
-
- +
+ {{ item.title }}
- 最高 {{ item.max }} {{ item.title == "CPU" ? "核" : "GB" }} + 最高 {{ item.max }} {{ item.title == "CPU" ? "核" : "GB" }}
- 默认 {{ item.default }} {{ item.title == "CPU" ? "核" : "GB" }} + 默认 {{ item.default }} {{ item.title == "CPU" ? "核" : "GB" }}
@@ -254,16 +384,28 @@
CPU：
- +
最高
- +
核
 - +
默认
- +
核
 @@ -271,16 +413,28 @@
内存：
- +
最高
- +
核
 - +
默认
- +
核
 @@ -290,7 +444,10 @@
当前规格：
- + 当前工作区域到期时间 2020-05-05 08:00:00
@@ -298,11 +455,24 @@ - +
申请续期：
- - - + + + @@ -310,7 +480,14 @@
申请文件：
- + @@ -387,7 +564,9 @@
数据盘： - {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB + {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB
单个容器组规格： @@ -411,7 +590,9 @@
申请时长 - {{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }} + {{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }}
@@ -474,13 +655,17 @@ 容器组： {{ diaForm.containerGroup }}个
-
+
新增数据盘： - {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB + {{ diaForm.dataDisk }}块，每块{{ diaForm.perDataDisk }}GB
-
+
删除数据盘： - {{ dataDiskList.join(",") }} + {{ delDataDiskList.map(item => {return item.app_name}).join("、") }}
单个容器组规格： @@ -504,11 +689,18 @@
是否续期： - {{ diaForm.appDuration && diaForm.appDuration != 0 ? "是": "否" }} + {{ diaForm.appDuration && diaForm.appDuration != 0 ? "是": "否" }}
-
+
续期时长： - {{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }} + {{ diaForm.appDuration }}{{ diaForm.durType == 1 ? "个月" : "年" }}
@@ -559,28 +751,59 @@ export default { perRAMs: undefined, perRAM: undefined, appDuration: undefined, - durType: "", + durType: 1, apply_file: "", apply_file_name: "" }, ruleNew: { namespace: [ - { required: true, message: "请输入联系电话", trigger: "blur" } + { required: true, message: "请输入工作区域名称", trigger: "blur" } ], workplace: [ - { required: true, message: "请输入联系电话", trigger: "blur" } + { required: true, message: "请输入中文名称", trigger: "blur" } + ], + workplacedesc: [ + { required: true, message: "请输入描述信息", trigger: "blur" } + ], + cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }], + memory: [ + { required: true, message: "请选择内存使用量", trigger: "blur" } + ], + containerGroup: [ + { required: true, message: "请输入容器组规格", trigger: "blur" } + ], + perCPUs: [ + { required: true, message: "请输入CPU最大使用量", trigger: "blur" } + ], + perCPU: [ + { required: true, message: "请输入CPU默认使用量", trigger: "blur" } + ], + perRAMs: [ + { required: true, message: "请输入内存最大使用量", trigger: "blur" } + ], + perRAM: [ + { required: true, message: "请输入内存默认使用量", trigger: "blur" } + ], + appDuration: [ + { required: true, message: "请输入申请时长", trigger: "blur" } ] }, - durationOptions: [{ value: "1", label: "月" }, { value: "2", label: "年" }], + durationOptions: [ + { value: 1, label: "月" }, + { value: 2, label: "年" } + ], workSpace: "", workSpaceOptions: [], - optionsCPU: [{ value: "8", label: "8" }, { value: "16", label: "16" }], + optionsCPU: [ + { value: "8", label: "8" }, + { value: "16", label: "16" } + ], optionsRAM: [ { value: "8", label: "8" }, { value: "16", label: "16" }, { value: "32", label: "32" } ], - formShow: true, + formShow: false, specArr: [ { title: "CPU", val: "4", src: "ic_CPU" }, { title: "内存", val: "4", src: "ic_neicun" }, @@ -599,9 +822,6 @@ export default { } ], formOld: { - namespace: "", - workplace: "", - workplacedesc: "", cpu: "", memory: "", containerGroup: undefined, @@ -612,14 +832,11 @@ export default { perRAMs: undefined, perRAM: undefined, appDuration: undefined, - durType: "", + durType: 1, apply_file: "", apply_file_name: "" }, paramsOld: { - namespace: "", - workplace: "", - workplacedesc: "", cpu: "", memory: "", containerGroup: undefined, @@ -630,22 +847,54 @@ export default { perRAMs: undefined, perRAM: undefined, appDuration: undefined, - durType: "", + durType: 1, apply_file: "", apply_file_name: "" }, - ruleOld: [], + ruleOld: { + namespace: [ + { required: true, message: "请输入工作区域名称", trigger: "blur" } + ], + workplace: [ + { required: true, message: "请输入中文名称", trigger: "blur" } + ], + workplacedesc: [ + { required: true, message: "请输入描述信息", trigger: "blur" } + ], + cpu: [{ required: true, message: "请选择CPU使用量", trigger: "blur" }], + memory: [ + { required: true, message: "请选择内存使用量", trigger: "blur" } + ], + containerGroup: [ + { required: true, message: "请输入容器组规格", trigger: "blur" } + ], + perCPUs: [ + { required: true, message: "请输入CPU最大使用量", trigger: "blur" } + ], + perCPU: [ + { required: true, message: "请输入CPU默认使用量", trigger: "blur" } + ], + perRAMs: [ + { required: true, message: "请输入内存最大使用量", trigger: "blur" } + ], + perRAM: [ + { required: true, message: "请输入内存默认使用量", trigger: "blur" } + ], + appDuration: [ + { required: true, message: "请输入申请时长", trigger: "blur" } + ] + }, dialogVisible: false, diaForm: {}, dataDiskHeaders: [ { label: "数据盘容量", - prop: "capacity", + prop: "disk_cap", align: "center" }, { label: "部署的应用", - prop: "app", + prop: "app_name", align: "center" }, { @@ -660,20 +909,7 @@ export default { ] } ], - dataDiskList: [ - { - capacity: "www", - app: "wewaewa" - }, - { - capacity: "www", - app: "wewaewa" - }, - { - capacity: "www", - app: "wewaewa" - } - ], + dataDiskList: [], delDataDiskList: [] }), mounted() { @@ -702,12 +938,13 @@ export default { this.formOld.cpu = paramsOld.cpu; this.formOld.memory = paramsOld.memory; this.formOld.containerGroup = paramsOld.containers; - this.formOld.dataDisk = paramsOld.dataDisk; - this.formOld.perDataDisk = paramsOld.perDataDisk; + this.formOld.dataDisk = ""; + this.formOld.perDataDisk = ""; this.formOld.perCPUs = paramsOld.one_cpu_max; 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.formShow = true; } else { this.formShow = false; @@ -716,13 +953,28 @@ export default { submitApp() { let formParams = {}; if (this.activeName == 0) { - formParams = this.formNew; + this.$refs["formNew"].validate(valid => { + if (valid) { + formParams = this.formNew; + this.dialogVisible = true; + this.diaForm = Object.assign(formParams, this.form); + } else { + console.log("error submit!!"); + return false; + } + }); } else if (this.activeName == 1) { - formParams = this.formOld; + this.$refs["formOld"].validate(valid => { + if (valid) { + formParams = this.formOld; + this.dialogVisible = true; + this.diaForm = Object.assign(formParams, this.form); + } else { + console.log("error submit!!"); + return false; + } + }); } - this.dialogVisible = true; - this.diaForm = Object.assign(formParams, this.form); - console.log(formParams, this.diaForm); }, determineSubmit() { if (this.activeName == 0) { @@ -795,11 +1047,9 @@ export default { }); }, delItem(val) { - this.delDataDiskList.push(val.app); - let delItem = this.dataDiskList.findIndex(v => v.app === val.app); - if (delItem) { - console.log(delItem); - } + let delIndex = this.dataDiskList.findIndex(v => v.id === val.id); + this.dataDiskList.splice(delIndex, 1); + this.delDataDiskList.push(val); } } }; @@ -1041,7 +1291,7 @@ export default { color: #242c43; } .cloud_form .input_right_top { - top: 41px; + top: 40px; } .cloud_form .el-select { width: 100%; diff --git a/src/components/shopping-cart/shopping-cart-cell.vue b/src/components/shopping-cart/shopping-cart-cell.vue index 74917251919fb690ee71f2fe89080cc3c7558b25..379e35375f6d20553b06d19fc04fd4ad3f9a4480 100644 --- a/src/components/shopping-cart/shopping-cart-cell.vue +++ b/src/components/shopping-cart/shopping-cart-cell.vue @@ -35,10 +35,10 @@ v-if="cellIsService" class="shopping_cell_type" >{{ cellItems.service.sectors_name }}
-
{{ cellItems.application.ywly }}
+
{{ cellItems.application.ywly_name }}
{{ cellIsService ? cellItems.service.organization_name:cellItems.application.org }}
+ >{{ cellIsService ? cellItems.service.organization_name:cellItems.application.org_name }}
@@ -119,13 +119,15 @@
- +
+ +
diff --git a/src/pages/user/order/order_detail.vue b/src/pages/user/order/order_detail.vue index 960ee8da1a706332d72f09dd77cd7cf9ecb89805..66bc7ffe1b4f9b79215465c944b81e7bf28a8186 100644 --- a/src/pages/user/order/order_detail.vue +++ b/src/pages/user/order/order_detail.vue @@ -177,26 +177,25 @@
工作区域描述：
-
{{ orderDetail.scene }}
申请规格：
CPU： - 2核 + {{ orderDetail.cpu }}核
内存： - 4GB + {{ orderDetail.memory }}GB
容器组： - 2核 + {{ orderDetail.memory }}核
数据盘： - 2核 + {{ orderDetail.disk_num}}块，每块{{orderDetail.disk_cap }}GB
单个容器组规格： @@ -204,15 +203,15 @@
CPU：

- 最高 2核 - 默认 2核 + 最高 {{ orderDetail.one_cpu_max }}核 + 默认 {{ orderDetail.one_cpu_min }}核

CPU：

- 最高 2核 - 默认 2核 + 最高 {{ orderDetail.one_memory_max }}核 + 默认 {{ orderDetail.one_memory_min }}核

@@ -706,7 +705,7 @@ export default { line-height: 22px; } .params_block_title { - padding-left: 10px; + padding-left: 5px; color: #242c43; } .params_block_item { @@ -719,12 +718,12 @@ export default { } .params_block_item_title { color: #8890a7; - width: 120px; + width: 80px; text-align: right; } .params_block_item_val { color: #242c43; - width: calc(100% - 130px); + width: calc(100% - 82px); } .val_has_2 { margin-right: 20px; diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue new file mode 100644 index 0000000000000000000000000000000000000000..240f7d699e8ed3ec31e5681d95a2e6de7c507d6e --- /dev/null +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -0,0 +1,235 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index a70d2b6fbd92609ff02b88cc7299045c076864c0..8d5101bab761df343ec608c01df52d446a4fbbdd 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -68,6 +68,11 @@ export default new Router({ component: () => import("@/pages/workbench/fwgl/approval_service_detail"), }, // 审批的服务 - 详情 + { + path: "/fwgl/:level/:type/cloud_detail/:id", + name: "servicedetail", + component: () => import("@/pages/workbench/fwgl/cloud-detail"), + }, // 云资源 - 详情 ], }, // 工作台 - 服务管理模块 { diff --git a/yarn.lock b/yarn.lock index d1c236474c05e32bf6d8e179cf7073ba677cc690..a54741ff02285cd41f990c1166c7eaf7fba629cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6074,6 +6074,11 @@ resize-detector@^0.1.10: resolved "https://registry.yarnpkg.com/resize-detector/-/resize-detector-0.1.10.tgz#1da3f961aa5f914ccbcfd3752d52fd45beeb692c" integrity sha512-iLcXC8A6Fb0DfA+TRiywrK/0A22bFqkhntjMJMEzXDA4XkcEkfwpNbv7W8iewUiD0xYIaeiXOfiEehTqGKsUFw== +resize-detector@^0.2.2: + version "0.2.2" + resolved "https://registry.npm.taobao.org/resize-detector/download/resize-detector-0.2.2.tgz#b207e72912bef0bda9fb825fe894ed9686ca965e" + integrity sha1-sgfnKRK+8L2p+4Jf6JTtlobKll4= + resize-observer-polyfill@^1.5.0: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" @@ -7207,6 +7212,13 @@ vue-router@^3.0.2: resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.1.6.tgz#45f5a3a3843e31702c061dd829393554e4328f89" integrity sha512-GYhn2ynaZlysZMkFE5oCHRUTqE8BWs/a9YbKpNLi0i7xD6KG1EzDqpHQmv1F5gXjr8kL5iIVS8EOtRaVUEXTqA== +vue-sparklines@^0.2.1: + version "0.2.1" + resolved "https://registry.npm.taobao.org/vue-sparklines/download/vue-sparklines-0.2.1.tgz#2c754b49af5d86a62308930f72bad8fc376d3beb" + integrity sha1-LHVLSa9dhqYjCJMPcrrY/DdtO+s= + dependencies: + vue "^2.2.1" + vue-style-loader@^4.1.0, vue-style-loader@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.2.tgz#dedf349806f25ceb4e64f3ad7c0a44fba735fcf8" @@ -7228,7 +7240,7 @@ vue-template-es2015-compiler@^1.9.0: resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825" integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw== -vue@^2.6.10: +vue@^2.2.1, vue@^2.6.10: version "2.6.11" resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.11.tgz#76594d877d4b12234406e84e35275c6d514125c5" integrity sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==