From bc6146abaf4176a5dc1df2ef613c5a024913ff01 Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 3 Jun 2024 14:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/mountain-icon.png | Bin 3527 -> 3512 bytes .../commandCenter/centerBottom.vue | 17 ++++++++++++----- .../commandScreen/commandCenter/index.vue | 7 ++++--- .../commandCenter/leftBottom.vue | 6 +++--- .../commandScreen/commandCenter/rightAll.vue | 16 +++++++++++----- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/src/assets/images/mountain-icon.png b/src/assets/images/mountain-icon.png index 7dadabe1ccf317b21bab86ad609147e378e2b1c6..b02640fd31e024f20760557b229969531d6ba16f 100644 GIT binary patch literal 3512 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 BQ{n&s literal 3527 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 { color: white !important; > div { - padding: 2px 0; + // padding: 2px 0; height: 13%; - font-size: 16px; - width: 200px; + // font-size: 16px; + font-size: 13px; + font-weight: normal; + line-height: 25px; + width: 140px; text-align: center; - background-color: #315296; + // background-color: #315296; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,0.8) 0%, rgba(40,88,184,0.3) 96%); cursor: pointer; } .title-color { - background-color: #1449b6; + // background-color: #1449b6; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,1) 0%, rgba(40,88,184,1) 96%); } } .notoDta { diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index 0213fca..9fce026 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -49,7 +49,7 @@ const openPeopleCountDialog = (index:any) => { height: 24.5%; } .leftBottom { - height: 65%; + height: 75.5%; margin: 3% 0 3% 0; } } @@ -62,13 +62,14 @@ const openPeopleCountDialog = (index:any) => { // margin-bottom: 3%; } .centerBottom { - height: 44.2%; + height: 45.85%; margin: 2% 0 0 0; } } .right { width: 26%; - height: 100%; + height: 109.2%; + transform: translateY(-70px); // .rightAll { // height: 32%; // } diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index ffb2483..6b6fa42 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -166,7 +166,7 @@ function drawBar() { top: "8%", right: "0", left:"5%", - bottom: "12%", + bottom: "10%", }, series: [{ @@ -249,7 +249,7 @@ onMounted(async () => { height: 92.5%; .contentTop { padding: 0 10px; - height: 40%; + height: 50%; // background-color: #fff; font-size: 13px; .line1{ @@ -309,7 +309,7 @@ onMounted(async () => { } .centerBottom { - height: 60%; + height: 50%; position: relative; .cbTop { diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 526e2c5..4c658d7 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -1265,16 +1265,22 @@ onMounted(async () => { color: white !important; > div { - padding: 2px 0; - font-size: 16px; + // padding: 2px 0; + font-size: 13px; + line-height: 25px; width: 200px; + width: 140px; text-align: center; - background-color: #315296; + // background-color: #315296; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,0.8) 0%, rgba(40,88,184,0.3) 96%); cursor: pointer; } .title-color { - background-color: #1449b6; + // background-color: #1449b6; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,1) 0%, rgba(40,88,184,1) 96%); } } @@ -1362,7 +1368,7 @@ onMounted(async () => { } .ctContent { - height: 72%; + height: 80%; // background-color: darkred; } }