From 8fc4f2c3e3c9ce2576b58c2c7b63d7389e064c05 Mon Sep 17 00:00:00 2001 From: liudianxin Date: Wed, 29 Jul 2020 11:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=B0=83=E6=95=B4=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/workbench/fwgl/cloud-detail.vue | 160 ++++++++++++---------- 1 file changed, 89 insertions(+), 71 deletions(-) diff --git a/src/pages/workbench/fwgl/cloud-detail.vue b/src/pages/workbench/fwgl/cloud-detail.vue index 0b5313e..93fe7f3 100644 --- a/src/pages/workbench/fwgl/cloud-detail.vue +++ b/src/pages/workbench/fwgl/cloud-detail.vue @@ -165,7 +165,10 @@
{{ desc }}
- {{ resourceOverview }} +
+ 当您觉得使用空间不足时，可以选择至服务超市- + 云资源服务页面的升级现有工作区域来完成配置扩容操作。 +
@@ -245,7 +248,7 @@ @click="pass" >提交资源申请 资源调整 @@ -264,7 +267,11 @@ class="adjustment" @click="pass" >通过 - 删除 + 删除
@@ -285,7 +292,7 @@ export default { InfoList, Dashboard, TableUm, - AllotInfoConfirm + AllotInfoConfirm, }, data() { return { @@ -296,120 +303,117 @@ export default { list_arr: [ { title: "云资源详情：", - prop: "title" + prop: "title", }, { title: "工作区域申请规格：", type: "solt", - solt_name: "ApplyParams" + solt_name: "ApplyParams", }, { title: "审批通过后工作区域规格：", type: "solt", - solt_name: "ApplyBeforeParams" + solt_name: "ApplyBeforeParams", }, { title: "资源申请文件：", info: "2222222222222222222222.docs", url: "", - type: "down" + type: "down", }, { title: "工作区域描述：", type: "solt", - solt_name: "ApplyDesc" + solt_name: "ApplyDesc", }, { title: "资源使用情况：", - prop: "title" + prop: "title", }, { title: "获取时间：", - info: "2020-06-02 15:54:21" + info: "2020-06-02 15:54:21", }, { title: "剩余使用天数：", - info: "1000天" + info: "1000天", }, { title: "到期时间：", - info: "2020-06-02 15:54:21" + info: "2020-06-02 15:54:21", }, { title: "资源使用概况：", type: "solt", - solt_name: "ResourceOverview" + solt_name: "ResourceOverview", }, { title: "已部署应用列表：", - prop: "title" + prop: "title", }, { title: "", type: "solt", - solt_name: "AppList" - } + solt_name: "AppList", + }, ], list_arr_my: [ { title: "提交申请时间：", - info: "2020-06-02 15:54:21" + info: "2020-06-02 15:54:21", }, { title: "获取时间：", - info: "2020-06-02 15:54:21" + info: "2020-06-02 15:54:21", }, { title: "申请状态：", type: "solt", - solt_name: "ApplicationStatus" - } + solt_name: "ApplicationStatus", + }, ], super_status: 0, - desc: - "工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：工作区域描述：", - resourceOverview: - "当您觉得使用空间不足时，可以选择至服务超市-云资源服务页面的升级现有工作区域来完成配置扩容操作。", + desc: "", data1: { data: 0, text: "CPU已使用", total: 0, - remaining: 0 + remaining: 0, }, data2: { data: 0, text: "内存已使用", total: 0, - remaining: 0 + remaining: 0, }, data3: { data: 0, text: "容器组已使用", total: 0, - remaining: 0 + remaining: 0, }, appListHeaders: [ { label: "应用名称", prop: "deploy_name", align: "center", - type: "href" + type: "href", }, { label: "应用类型", prop: "type_name", - align: "center" + align: "center", }, { label: "应用版本号", prop: "app_version", - align: "center" + align: "center", }, { label: "应用部署时间", prop: "created", - align: "center" - } + align: "center", + }, ], appList: [], now_user: "", @@ -421,7 +425,7 @@ export default { user_name: "", phone: "", apply_time: "", - system_name: "" + system_name: "", }, cloudDteail: { containers: "", @@ -432,7 +436,7 @@ export default { one_cpu_max: "", one_cpu_min: "", one_memory_max: "", - one_memory_min: "" + one_memory_min: "", }, cloudDetailNew: { adjust_containers: "", @@ -443,18 +447,18 @@ export default { adjust_one_cpu_max: "", adjust_one_cpu_min: "", adjust_one_memory_max: "", - adjust_one_memory_min: "" + adjust_one_memory_min: "", }, apply_type: 0, approve_state: 1, approve_update_state: 1, apploy_msg: { first_level: null, - second_level: null + second_level: null, }, use_uid: "", could_delete: false, - apply_id: "" + apply_id: "", }; }, watch: {}, @@ -463,7 +467,7 @@ export default { ...mapState(["userInfo"]), isApprove() { return this.$route.query.isApprove == 1; - } + }, }, created() { if (this.userInfo) { @@ -490,7 +494,7 @@ export default { getCloudApplication() { this.$api.workbench .getCloudApplication({ namespace: this.cloudData.namespace }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.appList = response.data.data; } else { @@ -511,19 +515,19 @@ export default { applyState: -1, applyType: this.apply_type, applyCloudId: this.id, - namespace: this.cloudData.namespace + namespace: this.cloudData.namespace, }; - this.$api.workbench.setCloudApproval(query).then(response => { + this.$api.workbench.setCloudApproval(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "申请已拒绝", - type: "success" + type: "success", }); this.$router.push(this.getUrl()); } else { this.$message({ message: "申请拒绝失败", - type: "error" + type: "error", }); } }); @@ -534,19 +538,19 @@ export default { applyState: 1, applyType: this.apply_type, applyCloudId: this.id, - namespace: this.cloudData.namespace + namespace: this.cloudData.namespace, }; - this.$api.workbench.setCloudApproval(query).then(response => { + this.$api.workbench.setCloudApproval(query).then((response) => { if (response.data.success == 1) { this.$message({ message: "申请已通过", - type: "success" + type: "success", }); this.$router.push(this.getUrl()); } else { this.$message({ message: "申请通过失败", - type: "error" + type: "error", }); } }); @@ -556,19 +560,19 @@ export default { .deleteCloud({ id: this.id, namespace: this.cloudData.namespace, - useUid: this.use_uid + useUid: this.use_uid, }) - .then(response => { + .then((response) => { if (response.data.success == 1) { this.$message({ message: "该资源已删除", - type: "success" + type: "success", }); this.$router.push(this.getUrl()); } else { this.$message({ message: "资源删除失败", - type: "error" + type: "error", }); } }); @@ -591,7 +595,7 @@ export default { if (this.use_uid == "") { // 没分配 let index = this.list_arr.findIndex( - item => item.title == "资源使用情况：" + (item) => item.title == "资源使用情况：" ); this.list_arr.splice(index); } @@ -608,7 +612,7 @@ export default { if (this.use_uid == "") { // 没分配 let index = this.list_arr.findIndex( - item => item.title == "资源使用情况：" + (item) => item.title == "资源使用情况：" ); this.list_arr.splice(index); } @@ -630,7 +634,7 @@ export default { if (this.use_uid == "") { // 没分配 let index = this.list_arr.findIndex( - item => item.title == "资源使用情况：" + (item) => item.title == "资源使用情况：" ); this.list_arr.splice(index); } @@ -646,24 +650,28 @@ export default { /** * 资源调整通过后，"工作区域申请规格"会同步"审批通过后工作区域规格"信息，届时需要隐藏掉"审批通过后工作区域规格" * add by xuym - * */ - if (this.apploy_msg.first_level == 1 && this.apploy_msg.second_level == 1) { - let index = this.list_arr.findIndex( - item => item.title == "审批通过后工作区域规格：" - ); - - if (index > -1) { - this.list_arr.splice(index, 1); - } + * */ + + if ( + this.apploy_msg.first_level == 1 && + this.apploy_msg.second_level == 1 + ) { + let index = this.list_arr.findIndex( + (item) => item.title == "审批通过后工作区域规格：" + ); + + if (index > -1) { + this.list_arr.splice(index, 1); + } } }, getCloudDetail() { let query = { type: this.apply_type, applyId: this.apply_id, - id: this.id + id: this.id, }; - this.$api.workbench.getCloudDetail(query).then(response => { + this.$api.workbench.getCloudDetail(query).then((response) => { let data = response.data.data; if (data) { this.list_arr[3].info = helper.downloadFileFormat( @@ -712,7 +720,7 @@ export default { } } else { let index = this.list_arr.findIndex( - item => item.title == "资源使用概况：" + (item) => item.title == "资源使用概况：" ); this.list_arr.splice(index, 1); } @@ -734,8 +742,10 @@ export default { this.cloudDetailNew.adjust_duration_time = data.adjust_duration_time; this.cloudDetailNew.adjust_one_cpu_max = data.adjust_one_cpu_max; this.cloudDetailNew.adjust_one_cpu_min = data.adjust_one_cpu_min; - this.cloudDetailNew.adjust_one_memory_max = data.adjust_one_memory_max; - this.cloudDetailNew.adjust_one_memory_min = data.adjust_one_memory_min; + this.cloudDetailNew.adjust_one_memory_max = + data.adjust_one_memory_max; + this.cloudDetailNew.adjust_one_memory_min = + data.adjust_one_memory_min; this.apploy_msg.first_level = data.first_level; this.apploy_msg.second_level = data.second_level; @@ -753,8 +763,11 @@ export default { } this.setListWithRole(); }); - } - } + }, + goto(path) { + this.$router.push(path); + }, + }, };