From a844588f9018974b5aeb6585bc3a7029c013ee08 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Fri, 11 Oct 2024 15:27:52 +0800 Subject: [PATCH] 1 --- src/assets/title.png | Bin 5594 -> 5120 bytes src/layout/mixin/ResizeHandler.js | 2 +- src/styles/element-ui.scss | 41 ++++++++ src/styles/navbar.scss | 3 - src/views/dashboard/index.vue | 8 ++ .../system/DashboardComponents/department.vue | 4 +- src/views/system/DashboardComponents/toDo.vue | 93 ++---------------- 7 files changed, 59 insertions(+), 92 deletions(-) diff --git a/src/assets/title.png b/src/assets/title.png index 900d1434d05cd48859dd93ebe437352e229b5e56..54dd6dc880db1518b469ea42eb95f544c3c680a8 100644 GIT binary patch delta 4552 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 E1FS%5y8r+H delta 5007 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 diff --git a/src/layout/mixin/ResizeHandler.js b/src/layout/mixin/ResizeHandler.js index b13191c..f73ba35 100644 --- a/src/layout/mixin/ResizeHandler.js +++ b/src/layout/mixin/ResizeHandler.js @@ -1,7 +1,7 @@ import store from '@/store' const { body } = document -const WIDTH = 992 // refer to Bootstrap's responsive design +const WIDTH = 768 // refer to Bootstrap's responsive design export default { watch: { diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index bf5f6ec..996aa04 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -51,3 +51,44 @@ .el-submenu.is-active .el-submenu__title { border-bottom: 2px solid; } + +// 时间选择器移动端 适配begin +@media (max-width: 768px) { + .el-date-range-picker .el-picker-panel__body { + min-width: 100%; + } + + .el-date-range-picker__content { + width: 100% !important; + } + + .el-date-range-picker { + width: 80% !important; + } + + .el-date-range-picker__content { + margin: 0px; + padding: 5px; + } + + .el-date-range-picker__content.is-left { + padding-bottom: 0px; + } + + .el-date-range-picker__content.is-right { + padding-top: 0px; + } + + .el-date-table th { + padding: 0px; + } + + .el-date-table td { + padding: 0px; + } +} +@media (max-width: 720px) { + .el-message-box { + width: 320px !important; + } +} diff --git a/src/styles/navbar.scss b/src/styles/navbar.scss index 07ab72d..193dcd4 100644 --- a/src/styles/navbar.scss +++ b/src/styles/navbar.scss @@ -22,7 +22,6 @@ .navbar-brand__img { height: 20px; - filter: drop-shadow(0 2px 4px #00000077); margin-left: 10px; } .navbar-brand__logo { @@ -61,8 +60,6 @@ display: flex; justify-content: center; align-items: center; - min-width: 2rem; - min-height: 2rem; -webkit-box-pack: center; .el-badge__content:not(.is-dot) { diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 1880f52..f09e249 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -83,4 +83,12 @@ export default { diff --git a/src/views/system/DashboardComponents/department.vue b/src/views/system/DashboardComponents/department.vue index f10409d..b7f84f7 100644 --- a/src/views/system/DashboardComponents/department.vue +++ b/src/views/system/DashboardComponents/department.vue @@ -102,7 +102,7 @@ export default { }, series: [ { - barWidth: 20, + barWidth: this.$store.getters.device === 'desktop' ? 20 : 10, type: 'bar', stack: 'a', name: '合计金额(元)', @@ -125,7 +125,7 @@ export default { data: this.list.map(item => (parseFloat(item.money_total_2) ? parseFloat(item.money_total_2) : parseFloat(item.money_total_1) - parseFloat(item.use_money_total))) }, { - barWidth: 20, + barWidth: this.$store.getters.device === 'desktop' ? 20 : 10, type: 'bar', stack: 'a', name: '已使用金额(元)', diff --git a/src/views/system/DashboardComponents/toDo.vue b/src/views/system/DashboardComponents/toDo.vue index dd80856..440c8b1 100644 --- a/src/views/system/DashboardComponents/toDo.vue +++ b/src/views/system/DashboardComponents/toDo.vue @@ -15,10 +15,10 @@ style="width: 100%;" size="mini" :header-cell-style="{ - 'font-weight': '600', - 'background': '#f8f8f9', - 'color': '#515a6e' - }" + 'font-weight': '600', + 'background': '#f8f8f9', + 'color': '#515a6e' + }" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.8)" @@ -39,7 +39,7 @@ :align="item.align" :formatter="item.formatter" /> - +