From f51be3cd3f96e4f8875fad0d6bb13d9ebcca9f93 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期五, 21 三月 2025 14:58:42 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/Andy-Yin/zhitan-ems
---
zhitan-vue/src/assets/styles/page.scss | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/zhitan-vue/src/assets/styles/page.scss b/zhitan-vue/src/assets/styles/page.scss
index c4c8e50..dfbcd09 100644
--- a/zhitan-vue/src/assets/styles/page.scss
+++ b/zhitan-vue/src/assets/styles/page.scss
@@ -5,8 +5,9 @@
.page-container-left {
width: 280px;
- min-height: calc(100vh - 120px);
+ min-height: calc(100vh - 148px);
border-right: 1px solid #1a235d;
+ background: #1F1C49;
.tree {
height: calc(100vh - 170px);
@@ -14,6 +15,7 @@
overflow-y: auto;
}
}
+
.page-container-right {
flex: 1;
@@ -30,10 +32,16 @@
padding: 18px 0 0 15px;
}
+ .table-bg-style {
+ margin-top: 12px;
+ .theme-dark-mt20 {
+ margin-top: 20px;
+ }
+ }
+
.tree {
// padding: 20px;
- margin-top: 25px;
- // margin-left: 20px;
+ margin-top: 2px;
overflow: hidden;
}
}
@@ -41,6 +49,7 @@
.chart-box {
width: 100%;
height: 320px;
+ padding-top: 12px;
div {
width: 100%;
@@ -49,7 +58,7 @@
}
.table-box {
- margin: 20px;
+ margin: 0;
.table-title-box {
font-weight: bold;
@@ -76,6 +85,9 @@
.page-container-left {
width: 280px;
+ min-height: calc(100vh - 148px);
+ border-right: 1px solid #fff;
+ background: #f1f4fa;
// border-right: 1px solid #1a235d;
.tree {
@@ -96,15 +108,21 @@
.form-card {
background: #fff;
+ // background: #F7F8FA;
border-radius: 0px 0px 0px 0px;
// border: 1px solid #000000;
padding: 18px 0 0 15px;
}
+
+ .table-bg-style {
+ background-color: #fff;
+ padding-top: 12px;
+ margin-top: 12px;
+ }
.tree {
// padding: 20px;
- margin-top: 25px;
- // margin-left: 20px;
+ margin-top: 2px;
overflow: hidden;
}
}
@@ -112,6 +130,7 @@
.chart-box {
width: 100%;
height: 320px;
+ padding-top: 12px;
div {
width: 100%;
@@ -120,7 +139,7 @@
}
.table-box {
- margin: 20px;
+ margin: 10px 20px;
.table-title-box {
font-weight: bold;
--
Gitblit v1.9.3