From 4833c1e9bd9e5249da390d447986eee82446224b Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Thu, 24 Apr 2025 11:32:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 - src/components/custom-scroll-title/index.vue | 2 +- src/styles/style.scss | 33 ++++++++++++++++---- src/views/home/index.vue | 4 +-- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/App.vue b/src/App.vue index 5495872..328ab5e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,5 +18,4 @@ const size = computed(() => SettingStore.themeConfig.globalComSize); diff --git a/src/components/custom-scroll-title/index.vue b/src/components/custom-scroll-title/index.vue index bf8bc49..50f6cbf 100644 --- a/src/components/custom-scroll-title/index.vue +++ b/src/components/custom-scroll-title/index.vue @@ -119,7 +119,7 @@ function handleTitleClick(val) { box-sizing: border-box; } .header_title { - background-color: #f5f5f5; + background-color: #000; position: relative; padding: 0 68px; display: flex; diff --git a/src/styles/style.scss b/src/styles/style.scss index 514b007..3078313 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -1,5 +1,6 @@ @import 'common/base'; @import 'common/define'; +@import './assets/fonts/font.css'; #app { position: relative; width: 100%; @@ -7,11 +8,31 @@ font-family: Avenir, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - background-color: #ffffff; + background-color: #f5f5f5; +} +.el-dialog__body { + overflow: hidden auto; + height: auto; + max-height: calc(100vh - 130px); +} +.txt-ellipsis { + display: -webkit-inline-box; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + word-break: break-all; + white-space: normal; +} +.clamp1 { + line-clamp: 1; + -webkit-line-clamp: 1; + line-height: 1.5; + max-height: calc(1.5em * 1); } -// .el-dialog__body { -// overflow: hidden auto; -// height: auto; -// max-height: calc(100vh - 130px); -// } +.clamp2 { + line-clamp: 2; + -webkit-line-clamp: 2; + line-height: 1.5; + max-height: calc(1.5em * 2); +} \ No newline at end of file diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 6b6e071..869ea37 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -87,7 +87,7 @@ let rollDataList = reactive([ flex-direction: column; } .left-charts-item { - width: 100%; + width: calc(100% - 5px); height: calc((100% - 30px) / 3); } @@ -98,7 +98,7 @@ let rollDataList = reactive([ flex-direction: column; } .right-charts-item { - width: 100%; + width: calc(100% - 5px); height: calc((100% - 30px) / 3); } } From 5ed2cf5a8e89c1a73ce0662b6da950e58765d281 Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Thu, 24 Apr 2025 11:35:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=83=8C=E6=99=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/style.scss | 2 +- src/views/land/index.vue | 106 +++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 56 deletions(-) diff --git a/src/styles/style.scss b/src/styles/style.scss index 3078313..198967e 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -8,7 +8,7 @@ font-family: Avenir, sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; - background-color: #f5f5f5; + background-color: #000; } .el-dialog__body { overflow: hidden auto; diff --git a/src/views/land/index.vue b/src/views/land/index.vue index 3f6caa1..704a754 100644 --- a/src/views/land/index.vue +++ b/src/views/land/index.vue @@ -1,60 +1,56 @@