From eab0975fae8593fbd5d5eaaf2cf839ba6eade0bb Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Fri, 4 Aug 2023 11:00:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E9=97=B4=E8=B7=9D=20=E6=8C=89=E9=92=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20=20=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 5 ++++- jero-web/src/api/manage.js | 1 + jero-web/src/assets/less/common.less | 4 ++++ jero-web/src/assets/less/index.less | 4 ++++ jero-web/src/components/page/GlobalLayout.vue | 3 +++ jero-web/src/components/page/PageLayout.vue | 3 +++ jero-web/src/components/tools/Logo.vue | 2 +- jero-web/src/views/system/UserAnnouncementList.vue | 3 +++ 8 files changed, 23 insertions(+), 2 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 4b0d939b..dfc51999 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -33,8 +33,11 @@ export default { } } - diff --git a/jero-web/src/api/manage.js b/jero-web/src/api/manage.js index 22d5d068..e24da96f 100644 --- a/jero-web/src/api/manage.js +++ b/jero-web/src/api/manage.js @@ -181,6 +181,7 @@ export function uploadAction (url, parameter) { * @returns {*} */ export function getFileAccessHttpUrl (avatar, subStr) { + if (!subStr) subStr = 'http' try { if (avatar && avatar.startsWith(subStr)) { diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 695a9627..8ed412e6 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -40,6 +40,10 @@ .anty-img-wrap { height: 25px; position: relative; + .ant-avatar{ + width: 24px; + height: 24px; + } } .anty-img-wrap > img { max-height: 100%; diff --git a/jero-web/src/assets/less/index.less b/jero-web/src/assets/less/index.less index f086f5fe..b559ef58 100644 --- a/jero-web/src/assets/less/index.less +++ b/jero-web/src/assets/less/index.less @@ -26,3 +26,7 @@ i { background-color: rgba(255, 192, 203, 0.31); color:red; } + +.ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-tbody > tr > td { + padding: 9px 8px !important; +} diff --git a/jero-web/src/components/page/GlobalLayout.vue b/jero-web/src/components/page/GlobalLayout.vue index e8673f37..3e3a26ae 100644 --- a/jero-web/src/components/page/GlobalLayout.vue +++ b/jero-web/src/components/page/GlobalLayout.vue @@ -727,4 +727,7 @@ export default { } } } + .ant-table-middle > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-tbody > tr > td { + padding: 9px 8px !important; + } diff --git a/jero-web/src/components/page/PageLayout.vue b/jero-web/src/components/page/PageLayout.vue index 9fc7bbd1..24f433af 100644 --- a/jero-web/src/components/page/PageLayout.vue +++ b/jero-web/src/components/page/PageLayout.vue @@ -124,4 +124,7 @@ export default { .page-header[data-v-6740ec88] { margin: 0 24px 0; } + .ant-table-middle > .ant-table-content > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-thead > tr > th, .ant-table-middle > .ant-table-content > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-body > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-header > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-left > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-tbody > tr > td, .ant-table-middle > .ant-table-content > .ant-table-fixed-right > .ant-table-body-outer > .ant-table-body-inner > table > .ant-table-tbody > tr > td { + padding: 9px 8px !important; + } diff --git a/jero-web/src/components/tools/Logo.vue b/jero-web/src/components/tools/Logo.vue index 3d613651..700dfb5b 100644 --- a/jero-web/src/components/tools/Logo.vue +++ b/jero-web/src/components/tools/Logo.vue @@ -48,7 +48,7 @@ export default { line-height: @height !important; box-shadow: none !important; transition: background 300ms; - + border-bottom: 1px solid rgba(255,255,255,0.08); a { color: white; &:hover { diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index 2aa147fd..343a8fc2 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -189,4 +189,7 @@ export default { .ant-modal-cust-warp{height: 100%} .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto} .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden} + .ant-table-thead > tr > th, .ant-table-tbody > tr > td{ + padding: 9px 8px !important; + }