From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-vue/src/assets/styles/index.scss | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/zhitan-vue/src/assets/styles/index.scss b/zhitan-vue/src/assets/styles/index.scss
index a99aaef..1117766 100644
--- a/zhitan-vue/src/assets/styles/index.scss
+++ b/zhitan-vue/src/assets/styles/index.scss
@@ -9,10 +9,12 @@
body {
height: 100%;
margin: 0;
+ padding: 0;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+ overflow-x: hidden; /* 闃叉姘村钩婊氬姩鏉� */
}
label {
@@ -22,10 +24,17 @@
html {
height: 100%;
box-sizing: border-box;
+ margin: 0;
+ padding: 0;
+ overflow-x: hidden; /* 闃叉姘村钩婊氬姩鏉� */
}
#app {
height: 100%;
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ overflow-x: hidden; /* 闃叉姘村钩婊氬姩鏉� */
}
*,
@@ -135,7 +144,8 @@
//main-container鍏ㄥ眬鏍峰紡
.app-container {
- padding: 20px;
+ // padding: 0 12px;
+ padding-right: 12px;
}
.components-container {
@@ -204,4 +214,41 @@
// ::v-deep(.el-range-separator) {
color: #999 !important;
}
+}
+
+/* 鎶樺彔鑿滃崟鏍峰紡璋冩暣锛岀‘淇濆湪鎵�鏈夋儏鍐典笅鑿滃崟椤瑰眳涓� */
+.el-menu--collapse {
+ width: 54px !important;
+
+ .el-sub-menu, .el-menu-item {
+ width: 36px !important;
+ min-width: 36px !important;
+ margin-left: 9px !important; /* 鍏抽敭锛氳缃浐瀹氱殑宸﹁竟璺�9px浣胯彍鍗曢」灞呬腑 */
+ margin-right: 9px !important;
+ }
+
+ .el-menu-item, .el-sub-menu__title {
+ display: flex !important;
+ justify-content: center !important;
+ align-items: center !important;
+ padding: 0 !important;
+
+ .svg-icon, .el-icon {
+ margin: 0 !important; /* 閲嶈锛氱Щ闄ゅ浘鏍囩殑鎵�鏈夎竟璺� */
+ }
+
+ .el-sub-menu__icon-arrow {
+ display: none !important;
+ }
+
+ > span {
+ display: none !important;
+ }
+ }
+
+ /* 閫変腑鐘舵�佹牱寮� */
+ .el-menu-item.is-active, .el-sub-menu.is-active > .el-sub-menu__title {
+ background-color: #3883FA !important;
+ color: #fff !important;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3