From 956aed0c2b674153106042f641011a27adcfad5f Mon Sep 17 00:00:00 2001 From: lyt-Top <1105290566@qq.com> Date: Sat, 27 Feb 2021 12:49:48 +0800 Subject: [PATCH] =?UTF-8?q?'admin-21.02.27:=E6=96=B0=E5=A2=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E3=80=81=E8=A1=A8=E6=A0=BC=E9=80=82?= =?UTF-8?q?=E9=85=8D=E3=80=81=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E4=BC=98=E5=8C=96=E7=AD=89'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/theme/app.scss | 20 ----- src/theme/media/media.scss | 2 + src/theme/media/pagination.scss | 15 ++++ src/theme/media/scrollbar.scss | 56 ++++++++++++ src/views/system/menu/component/addMenu.vue | 16 ++++ src/views/system/menu/component/editMenu.vue | 16 ++++ src/views/system/menu/index.vue | 4 +- src/views/system/user/index.vue | 91 ++++++++++++++++++-- 8 files changed, 192 insertions(+), 28 deletions(-) create mode 100644 src/theme/media/pagination.scss create mode 100644 src/theme/media/scrollbar.scss create mode 100644 src/views/system/menu/component/addMenu.vue create mode 100644 src/views/system/menu/component/editMenu.vue diff --git a/src/theme/app.scss b/src/theme/app.scss index e2c81d74..01465ee6 100644 --- a/src/theme/app.scss +++ b/src/theme/app.scss @@ -24,26 +24,6 @@ body, overflow: hidden; } -::-webkit-scrollbar-track-piece { - background-color: #f8f8f8; -} -// 滚动条的宽度 -::-webkit-scrollbar { - width: 7px; - height: 7px; -} -// 滚动条的设置 -::-webkit-scrollbar-thumb { - background-color: rgba(144, 147, 153, 0.3); - background-clip: padding-box; - min-height: 28px; - border-radius: 5px; - transition: 0.3s background-color; -} -::-webkit-scrollbar-thumb:hover { - background-color: rgba(144, 147, 153, 0.5); -} - /* 主布局样式 ------------------------------- */ .layout-container { diff --git a/src/theme/media/media.scss b/src/theme/media/media.scss index 201f3b10..77f237e6 100644 --- a/src/theme/media/media.scss +++ b/src/theme/media/media.scss @@ -6,3 +6,5 @@ @import './home.scss'; @import './chart.scss'; @import './form.scss'; +@import './scrollbar.scss'; +@import './pagination.scss'; diff --git a/src/theme/media/pagination.scss b/src/theme/media/pagination.scss new file mode 100644 index 00000000..a09a9e6e --- /dev/null +++ b/src/theme/media/pagination.scss @@ -0,0 +1,15 @@ +@import './index.scss'; + +/* 页面宽度小于576px +------------------------------- */ +@media screen and (max-width: $xs) { + .el-pager, + .el-pagination__jump { + display: none !important; + } +} + +// 默认居中对齐 +.el-pagination { + text-align: center !important; +} diff --git a/src/theme/media/scrollbar.scss b/src/theme/media/scrollbar.scss new file mode 100644 index 00000000..d31c7801 --- /dev/null +++ b/src/theme/media/scrollbar.scss @@ -0,0 +1,56 @@ +@import './index.scss'; + +/* 页面宽度小于768px +------------------------------- */ +@media screen and (max-width: $sm) { + // 滚动条的宽度 + ::-webkit-scrollbar { + width: 3px !important; + height: 3px !important; + } + ::-webkit-scrollbar-track-piece { + background-color: #f8f8f8; + } + // 滚动条的设置 + ::-webkit-scrollbar-thumb { + background-color: rgba(144, 147, 153, 0.3); + background-clip: padding-box; + min-height: 28px; + border-radius: 5px; + transition: 0.3s background-color; + } + ::-webkit-scrollbar-thumb:hover { + background-color: rgba(144, 147, 153, 0.5); + } + // element plus scrollbar + .el-scrollbar__bar.is-vertical { + width: 2px !important; + } + .el-scrollbar__bar.is-horizontal { + height: 2px !important; + } +} + +/* 页面宽度大于768px +------------------------------- */ +@media screen and (min-width: 769px) { + // 滚动条的宽度 + ::-webkit-scrollbar { + width: 7px; + height: 7px; + } + ::-webkit-scrollbar-track-piece { + background-color: #f8f8f8; + } + // 滚动条的设置 + ::-webkit-scrollbar-thumb { + background-color: rgba(144, 147, 153, 0.3); + background-clip: padding-box; + min-height: 28px; + border-radius: 5px; + transition: 0.3s background-color; + } + ::-webkit-scrollbar-thumb:hover { + background-color: rgba(144, 147, 153, 0.5); + } +} diff --git a/src/views/system/menu/component/addMenu.vue b/src/views/system/menu/component/addMenu.vue new file mode 100644 index 00000000..6918ad72 --- /dev/null +++ b/src/views/system/menu/component/addMenu.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/menu/component/editMenu.vue b/src/views/system/menu/component/editMenu.vue new file mode 100644 index 00000000..5846c4df --- /dev/null +++ b/src/views/system/menu/component/editMenu.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 0112ac03..b3cd7432 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -3,7 +3,7 @@ - + {{ scope.row.meta.title }} @@ -41,7 +41,7 @@ 否 - + {{ scope.row.meta.auth }} diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 1d666bbf..6fc4e08d 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -1,21 +1,100 @@ - - systemUser - + + + + + 查询 + + + + + + + + + + + + + + + + + 修改 + 删除 + + + + + + \ No newline at end of file + + + \ No newline at end of file