From 2797978a280cd8681c3c2e1f621c8113fedebaf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=93=E6=B4=81?= <209192278@qq.com> Date: Fri, 10 Nov 2023 21:41:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=93=E6=B4=81=20:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 19 +++++++++++++++---- src/assets/styles/sidebar.scss | 7 +++++++ src/components/Tag.vue | 2 +- src/layout/siderbar/MenuItem.vue | 25 ++++++++++++++++++++++--- src/layout/siderbar/index.vue | 19 +++++++++---------- src/layout/tagsview/index.vue | 4 ++++ src/views/monitor/logininfor/index.vue | 1 + src/views/monitor/operlog/index.vue | 1 + src/views/system/role/index.vue | 1 + src/views/system/user/index.vue | 1 + src/views/tool/dict/index.vue | 3 ++- 11 files changed, 64 insertions(+), 19 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index d2e65d2..efac9c2 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -115,7 +115,7 @@ html, body, #app, .el-container, .el-aside, .el-main { .table { - margin-top: 15px; + //margin-top: 15px; .el-tag { .el-tag__content { @@ -264,6 +264,7 @@ html, body, #app, .el-container, .el-aside, .el-main { height: 84vh; .scrollbar-dict { + border: 1px solid #ebeef5; height: 68vh; overflow-y: auto; overflow-x: hidden; @@ -279,7 +280,7 @@ html, body, #app, .el-container, .el-aside, .el-main { .layout-left { width: 30%; - border: 1px solid #ebeef5; + //border: 1px solid #ebeef5; padding: 10px; @@ -301,7 +302,7 @@ html, body, #app, .el-container, .el-aside, .el-main { .layout-right { width: 70%; - border: 1px solid #ebeef5; + //border: 1px solid #ebeef5; margin-left: 10px; padding: 10px } @@ -356,7 +357,17 @@ html, body, #app, .el-container, .el-aside, .el-main { margin-left: 5px; vertical-align: -0.21em; } - +.tag:hover { + color:#418DFF; + .close-icon{ + fill: #418DFF; + } +} +.active{ + .close-icon{ + fill: #418DFF; + } +} .svg-icon:hover { cursor: pointer; //border: 1px solid #E9E9E9; diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index aefa32f..478bec1 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -8,6 +8,13 @@ justify-content: center; align-items: center; } +.port-link{ + display: block; + width: 200px; + height: 50px; + margin-left: -40px; + padding-left: 40px; +} .el-menu { border: none !important; .el-sub-menu { diff --git a/src/components/Tag.vue b/src/components/Tag.vue index cc42886..d956bd4 100644 --- a/src/components/Tag.vue +++ b/src/components/Tag.vue @@ -33,7 +33,7 @@ const getDicList=async ()=>{ } onMounted(async ()=>{ await getDicList() - await dictFormat(); + dictFormat(); }) const dictFormat = () => { if (dictList.value === undefined) return; diff --git a/src/layout/siderbar/MenuItem.vue b/src/layout/siderbar/MenuItem.vue index 6558685..09dab9c 100644 --- a/src/layout/siderbar/MenuItem.vue +++ b/src/layout/siderbar/MenuItem.vue @@ -8,10 +8,18 @@ - + @@ -20,12 +28,23 @@ diff --git a/src/layout/siderbar/index.vue b/src/layout/siderbar/index.vue index 4e56fe6..c711284 100644 --- a/src/layout/siderbar/index.vue +++ b/src/layout/siderbar/index.vue @@ -15,12 +15,12 @@ > -
  • - - - {{ title }} - -
    • + + + + + + @@ -43,7 +43,6 @@ const getLogoH = () => { } const activeMenu = computed(() => { - console.log(route); const {path} = route return path }) @@ -69,8 +68,8 @@ window.addEventListener('resize', () => { selectFarme() -const handleGo = (path) => { - window.open(path) -} +// const handleGo = (path) => { +// window.open(path) +// } diff --git a/src/layout/tagsview/index.vue b/src/layout/tagsview/index.vue index f6a9d91..f00be95 100644 --- a/src/layout/tagsview/index.vue +++ b/src/layout/tagsview/index.vue @@ -82,6 +82,10 @@ init() background-color: #E9F4FF; border: 1px solid #418DFF; color: #333333; + >span:first-child{ + color:#418DFF; + } + } .contextmenu { diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue index 37f3748..db53e3a 100644 --- a/src/views/monitor/logininfor/index.vue +++ b/src/views/monitor/logininfor/index.vue @@ -47,6 +47,7 @@ ref="singleTable" v-loading="loading" @select="handleSelect" + v-tabh > diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index ac4e05f..1218b12 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -57,6 +57,7 @@ ref="singleTable" v-loading="loading" @select="handleSelect" + v-tabh > diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 763d51c..0616600 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -58,6 +58,7 @@ row-key="roleId" :lazy="true" v-loading="loading" + v-tabh > diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index aafdd27..4a2c9d1 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -73,6 +73,7 @@ :lazy="true" v-loading="loading" :header-cell-style="{'background':'#f5f5f8'}" + v-tabh > diff --git a/src/views/tool/dict/index.vue b/src/views/tool/dict/index.vue index 485fb0e..30e749e 100644 --- a/src/views/tool/dict/index.vue +++ b/src/views/tool/dict/index.vue @@ -55,10 +55,11 @@ :data="list" row-key="dictId" border - height="60vh" + height="62vh" ref="singleTable" v-loading="loading" :header-cell-style="{'background':'#f5f7fa'}" + >