From 88e076f338f8db23d5bf0d12188a53d2479aaf9e Mon Sep 17 00:00:00 2001 From: xuyiming Date: Mon, 17 Aug 2020 18:01:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8Ffixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/index.css | 2 +- src/assets/imgs/ic_xitong.png | Bin 1144 -> 1799 bytes .../organization-list/organization-card.vue | 14 +++- src/components/service-info/app-info.vue | 21 ++++++ src/components/service-info/service-info.vue | 23 ++++++ .../organization/organizationdetail.vue | 3 - src/pages/authority/user/organizationuser.vue | 3 - src/pages/user/notice/notice.vue | 25 +++++-- .../fwgl/approval_service_detail.vue | 3 - src/pages/workbench/fwgl/fwglList.vue | 69 ++++++++++++------ .../fwgl/organizationCloudResource.vue | 61 ++++++++++------ src/pages/workbench/fwgl/serviceDetail.vue | 3 - src/pages/workbench/fwgl/serviceEdit.vue | 3 - src/pages/workbench/workPlace.vue | 3 - src/pages/workbench/yygl/app_detail.vue | 3 - .../workbench/yygl/approval_app_detail.vue | 3 - .../workbench/yygl/deploy_app_detail.vue | 3 - 17 files changed, 160 insertions(+), 82 deletions(-) diff --git a/src/assets/css/index.css b/src/assets/css/index.css index 53fdf63..debe42d 100644 --- a/src/assets/css/index.css +++ b/src/assets/css/index.css @@ -574,7 +574,7 @@ border-radius:8px; .apaas_button .el-button--warning { background-color: #e56600; border-color: #e56600; - color: #fff; + color: #fcefd6; } .apaas_button .el-button.is-disabled, .apaas_button .el-button.is-disabled:focus, diff --git a/src/assets/imgs/ic_xitong.png b/src/assets/imgs/ic_xitong.png index f03d86264f40198869675c461d733c04de01e637..d96cf22198a5c7bb804d28797897574bcce4ca9d 100644 GIT binary patch delta 950 zcmeyt(atwPT$zW1je&t7tTg61km4-xh%9Dc;1&j9Muu5)Bp4W24^8x%tYD#FZmDNz zW@2D$rlVkFU}&jtV4-hltZQIsWngAyYQFI=BO_-{Ua?hiiECNO~JnOiHsfNJ&hboW*1-0CI(|ua$pMW_o5`Vvft?|4dSodzqwk z6;hI|((;RP6H9EBGIJBtQ}qk-(v=k8{&&e+Wx*zCC^jerC$ z))0f(Rh*wzQl40p>X;6UMO!7ul>DSrg#c*$6(|@1<4i##JTosPzr5H`6J~gFMq*xi zYKpCrzLGxB_4){p=%e^?vI(<8{cN>YOu+Q{+SA1`L}Oy_#r0my0V2mg_80qhm)&8bg=d#Wzp$PzEo=cDb delta 391 zcmV;20eJq04)_R=7c&hA1^@s6ohgq(0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+ zQe|Oed2z{QJOBU#CXqUmAT=O2IW93aGc-9lEFdy4F*q+UI4?0XEipDaG%z|cGO_Ie z0h5jbHIqgI7n5HE2LU#dr2`<7i32s0Fa(g3!v#Hm5!d2L0002!NklGPI=e%Zvz~^`nEP@xU%JM;CR+)mjF7BmE-1-TB6c536=Sl9nv$a{-C4Ylsobn9 z7G)xTgX{#4JNp!O<%BMoPmPy-!;7&cfjkkAeQR9n_$FfqX7+jV)`F06^C$ahtHZdL z9=XeWZ`PzIJou;rU0UH^mmcXZ6c$< diff --git a/src/components/organization-list/organization-card.vue b/src/components/organization-list/organization-card.vue index a95dab7..e088b5c 100644 --- a/src/components/organization-list/organization-card.vue +++ b/src/components/organization-list/organization-card.vue @@ -9,6 +9,7 @@ :size="56" fit="cover" :src="data.picture_path" + style="border: 3px solid #f6f7fb;border-radius: 8px;" />
@@ -20,21 +21,21 @@

- + 业务系统数

- + 组织管理员

- + 创建时间 @@ -107,6 +108,7 @@ export default { } .organization_card-info > .organization_card-name { font-size: 18px; + font-weight: 600; line-height: 32px; color: #0d1847; cursor: pointer; @@ -129,6 +131,12 @@ export default { .organization_card-text > span:nth-child(1) { flex-shrink: 0; color: #8890a7; + display: inline-flex; + justify-content: flex-start; + align-items: center; +} +.organization_card-text > span:nth-child(1) > img { + margin-right: 5px; } diff --git a/src/components/service-info/app-info.vue b/src/components/service-info/app-info.vue index c131e94..e07106e 100644 --- a/src/components/service-info/app-info.vue +++ b/src/components/service-info/app-info.vue @@ -214,6 +214,7 @@ export default { } .commodity_information > .btn_container > .el-button { margin: 0 30px 15px 0; + border-width: 2px; } .commodity_action { margin-top: 50px; @@ -222,6 +223,7 @@ export default { .commodity_action > .el-button { width: 220px; margin-left: 20px; + font-size: 16px; } @@ -231,4 +233,23 @@ export default { background-color: #515fe7; border-color: #515fe7; } +.application_info .el-input-number .el-input-number__decrease { + top: 2px; + left: 2px; + width: 38px; + line-height: 36px; + border-radius: 8px 0 0 8px; + border-right-width: 2px; +} +.application_info .el-input-number .el-input-number__increase { + top: 2px; + right: 2px; + width: 38px; + line-height: 36px; + border-radius: 0 8px 8px 0; + border-left-width: 2px; +} +.application_info .el-input-number .el-input__inner { + border-width: 2px; +} diff --git a/src/components/service-info/service-info.vue b/src/components/service-info/service-info.vue index f93617e..c1ed894 100644 --- a/src/components/service-info/service-info.vue +++ b/src/components/service-info/service-info.vue @@ -386,6 +386,9 @@ export default { .commodity_information > .btn_container { margin-bottom: -15px; } +.commodity_information > .btn_container > .el-button { + border-width: 2px; +} .commodity_information > .btn_container > .el-button, .commodity_information > .btn_container > .el-input-number { margin: 0 20px 15px 0; @@ -397,6 +400,7 @@ export default { .commodity_action > .el-button { width: 220px; margin-left: 20px; + font-size: 16px; } @@ -406,4 +410,23 @@ export default { background-color: #515fe7; border-color: #515fe7; } +.service_info .el-input-number .el-input-number__decrease { + top: 2px; + left: 2px; + width: 38px; + line-height: 36px; + border-radius: 8px 0 0 8px; + border-right-width: 2px; +} +.service_info .el-input-number .el-input-number__increase { + top: 2px; + right: 2px; + width: 38px; + line-height: 36px; + border-radius: 0 8px 8px 0; + border-left-width: 2px; +} +.service_info .el-input-number .el-input__inner { + border-width: 2px; +} diff --git a/src/pages/authority/organization/organizationdetail.vue b/src/pages/authority/organization/organizationdetail.vue index e62df81..f024160 100644 --- a/src/pages/authority/organization/organizationdetail.vue +++ b/src/pages/authority/organization/organizationdetail.vue @@ -120,9 +120,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level } else { diff --git a/src/pages/authority/user/organizationuser.vue b/src/pages/authority/user/organizationuser.vue index bb1061b..dc7f88b 100644 --- a/src/pages/authority/user/organizationuser.vue +++ b/src/pages/authority/user/organizationuser.vue @@ -337,9 +337,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level; console.log(this.level); diff --git a/src/pages/user/notice/notice.vue b/src/pages/user/notice/notice.vue index d020d11..420ba71 100644 --- a/src/pages/user/notice/notice.vue +++ b/src/pages/user/notice/notice.vue @@ -45,6 +45,9 @@

  • @@ -203,11 +206,12 @@ export default { refreshList() { this.initList(); // 刷新列表 - if (!this.unread) { - this.getMessage({ - unread: true, - }); - } + this.getMessage({ + unread: true, + }); + this.getMessage({ + unread: false, + }); }, readAction(ids) { this.$http @@ -306,8 +310,9 @@ export default { } .notice_header a { font-size: 14px; + font-weight: 600; line-height: 24px; - color: #8890a7; + color: #58617a; cursor: pointer; } .notice_header > div > * + * { @@ -387,6 +392,7 @@ export default { color: #242c43; } .notice_item > .notice_detail .notice_type { + font-weight: 600; color: #58617a; margin-bottom: 10px; } @@ -399,6 +405,9 @@ export default { .notice_item:hover { background-color: #f8f9fd; } +.notice_content a { + color: #515fe7; +} .notice_action { position: absolute; top: 0; @@ -423,6 +432,10 @@ export default { .notice_item:hover .notice_action { display: flex; } +.notice_item.gray > .notice_detail .notice_type, +.notice_item.gray > .notice_detail .notice_content { + color: #8890a7; +} .set_notice_btn { position: relative; } diff --git a/src/pages/workbench/fwgl/approval_service_detail.vue b/src/pages/workbench/fwgl/approval_service_detail.vue index 777c8a7..8cf2481 100644 --- a/src/pages/workbench/fwgl/approval_service_detail.vue +++ b/src/pages/workbench/fwgl/approval_service_detail.vue @@ -287,9 +287,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level this.get_service_info() diff --git a/src/pages/workbench/fwgl/fwglList.vue b/src/pages/workbench/fwgl/fwglList.vue index e037ac4..a87b72b 100644 --- a/src/pages/workbench/fwgl/fwglList.vue +++ b/src/pages/workbench/fwgl/fwglList.vue @@ -73,7 +73,12 @@
    - + 工作区域审批（{{ cloud_admin.unapprove }}） span, .cloud_title > span::before { @@ -1876,7 +1887,7 @@ export default { .admin_preview { display: flex; justify-content: space-between; - align-items: center; + align-items: flex-start; } .admin_preview > * { width: calc(50% - 10px); @@ -1896,3 +1907,15 @@ export default { z-index: 9; } + + diff --git a/src/pages/workbench/fwgl/organizationCloudResource.vue b/src/pages/workbench/fwgl/organizationCloudResource.vue index 14115e6..895ae45 100644 --- a/src/pages/workbench/fwgl/organizationCloudResource.vue +++ b/src/pages/workbench/fwgl/organizationCloudResource.vue @@ -110,25 +110,25 @@ export default { name: "CPU使用量", value: cloud.cpu_use, total: cloud.cpu_total, - unit: "（核）", + unit: "核", }, { name: "内存使用量", value: cloud.memory_use, total: cloud.memory_total, - unit: "（GB）", + unit: "GB", }, /* { name: "数据盘使用量", value: cloud.disk_use, total: cloud.disk_total, - unit: "（GB）", + unit: "GB", }, */ { name: "容器组使用量", value: cloud.containers_use, total: cloud.containers_total, - unit: "（个）", + unit: "个", }, ]; }) @@ -164,31 +164,50 @@ export default { let percent = parseFloat( ((item.value / item.total) * 100 || 0).toFixed(1) ); - let colors = ["#515fe7", "#e7ecfd"]; + let colors = []; - if (percent >= 80) { - colors = ["#e3606d", "#f6d0d0"]; + if (this.level == 2) { + if (percent >= 80) { + colors = ["#e3606d", "#f6d0d0"]; + } else { + colors = ["#515fe7", "#e7ecfd"]; + } + } else { + if (percent >= 80) { + colors = ["#e3606d", "#f6d0d0"]; + this.cloud_admin_warn = true; + } else if (percent >= 60) { + colors = ["#ef9535", "#fcefd8"]; + } else { + colors = ["#515fe7", "#e7ecfd"]; + } } return { title: [ { - text: percent + "%", + text: percent + "{a|%}", x: "center", - y: "28%", + y: "30%", textStyle: { - fontSize: 34, - fontWeight: "100", + fontSize: 36, + fontWeight: "lighter", color: ["#0d1847"], + rich: { + a: { + fontSize: 14, + padding: [0, 0, 4, 0], + }, + }, }, }, { text: item.name, x: "center", - y: "55%", + y: "58%", textStyle: { fontSize: 12, - fontWeight: "100", + fontWeight: "normal", color: "#707693", }, }, @@ -255,7 +274,7 @@ export default { barMaxWidth: 10, name: "C", roundCap: true, - color: "#ddd", + color: "#f4f4f5", barGap: "-100%", }, { @@ -272,7 +291,7 @@ export default { axisLine: { show: true, lineStyle: { - width: 0.5, + width: 1, color: [[1, "rgba(0,0,0,0)"]], }, }, //仪表盘轴线 @@ -283,17 +302,16 @@ export default { show: true, splitNumber: 5, lineStyle: { - color: "#e3e4ea", - width: 0.5, + color: "#c9cee0", + width: 1, }, - length: 3, + length: 4, }, //刻度样式 splitLine: { show: true, - length: 4, + length: 6, lineStyle: { - color: "#e3e4ea", - width: 0.5, + color: "#c9cee0", }, }, //分隔线样式 detail: { @@ -317,7 +335,6 @@ export default { color: "#fff", }, }, - data: [, percent], }, ], diff --git a/src/pages/workbench/fwgl/serviceDetail.vue b/src/pages/workbench/fwgl/serviceDetail.vue index 127bd75..f7155ca 100644 --- a/src/pages/workbench/fwgl/serviceDetail.vue +++ b/src/pages/workbench/fwgl/serviceDetail.vue @@ -604,9 +604,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level; console.log(this.level); diff --git a/src/pages/workbench/fwgl/serviceEdit.vue b/src/pages/workbench/fwgl/serviceEdit.vue index bdf6d1f..37f09e2 100644 --- a/src/pages/workbench/fwgl/serviceEdit.vue +++ b/src/pages/workbench/fwgl/serviceEdit.vue @@ -244,9 +244,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level console.log(this.level); diff --git a/src/pages/workbench/workPlace.vue b/src/pages/workbench/workPlace.vue index 5db3efb..d1b1782 100644 --- a/src/pages/workbench/workPlace.vue +++ b/src/pages/workbench/workPlace.vue @@ -1325,9 +1325,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level; this.manage_arr[0].url = data.data.department_id; diff --git a/src/pages/workbench/yygl/app_detail.vue b/src/pages/workbench/yygl/app_detail.vue index 79f83fc..0d02909 100644 --- a/src/pages/workbench/yygl/app_detail.vue +++ b/src/pages/workbench/yygl/app_detail.vue @@ -426,9 +426,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level; this.getServiceInfo(); diff --git a/src/pages/workbench/yygl/approval_app_detail.vue b/src/pages/workbench/yygl/approval_app_detail.vue index cf29e99..b77226b 100644 --- a/src/pages/workbench/yygl/approval_app_detail.vue +++ b/src/pages/workbench/yygl/approval_app_detail.vue @@ -271,9 +271,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level this.getheaderinfo(); diff --git a/src/pages/workbench/yygl/deploy_app_detail.vue b/src/pages/workbench/yygl/deploy_app_detail.vue index b77e93b..efb7da8 100644 --- a/src/pages/workbench/yygl/deploy_app_detail.vue +++ b/src/pages/workbench/yygl/deploy_app_detail.vue @@ -630,9 +630,6 @@ export default { getCurrentUser() { this.$api.user.getNowUser().then(({ data }) => { if (data.success == 1) { - console.log("--- user info ---"); - console.log(data.data); - console.log("--- user info ---"); this.$store.commit("userInfofun", data.data); this.now_user = this.level; console.log(this.level); -- 2.26.0