From 5e873f9cb7d211f9df5484faac0336a6ddd2bee0 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 22 Jul 2025 16:53:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/center-two.vue       |  5 +++--
 src/views/home/components/control-deck-new.vue | 18 +++++++++---------
 .../modal-content/add-or-edit-marker-form.vue  |  6 ++++--
 .../components/modal-content/control-deck.vue  |  8 ++++----
 src/views/home/components/right-one.vue        | 10 +++++-----
 src/views/home/components/right-two/index.vue  |  2 +-
 6 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/views/home/components/center-two.vue b/src/views/home/components/center-two.vue
index aded9b8..46995b8 100644
--- a/src/views/home/components/center-two.vue
+++ b/src/views/home/components/center-two.vue
@@ -290,7 +290,7 @@ onMounted(() => {
     nextTick(() => {
         const container = marqueeContainer.value
         imgWidth.value = (container.clientWidth - 40) / 4
-        imgHeight.value = `${container.clientHeight * 0.78}`
+        imgHeight.value = `${container.clientHeight * 0.81}`
     })
 })
 
@@ -347,6 +347,7 @@ onUnmounted(() => {
             display: flex;
             flex-direction: column;
             align-items: center;
+            justify-content: space-between;
             position: relative;
             overflow: hidden;
 
@@ -381,7 +382,7 @@ onUnmounted(() => {
 
             .marquee-item-time {
                 width: 100%;
-                padding: 8px 0;
+                padding: 2px 0;
                 text-align: center;
             }
 
diff --git a/src/views/home/components/control-deck-new.vue b/src/views/home/components/control-deck-new.vue
index 6bdf562..71206d4 100644
--- a/src/views/home/components/control-deck-new.vue
+++ b/src/views/home/components/control-deck-new.vue
@@ -737,15 +737,15 @@ onMounted(async () => {
 }
 .row-1-item,
 .row-2-item {
-    width: 100px;
+    width: 90px;
     margin: 0 auto;
 }
 
 .row-1-item {
-    // height: 28px;
+    height: 24px;
     background: url('@/assets/home-imgs/control-1-bg.png') no-repeat center center;
     background-size: 100% 100%;
-    line-height: 28px;
+    line-height: 24px;
     text-align: center;
 }
 
@@ -757,13 +757,13 @@ onMounted(async () => {
 
     & div:last-child {
         // width: 32px;
-        height: 18px;
+        height: 16px;
         background-color: #005899;
         border-radius: 6px;
         font-size: 12px;
         text-align: center;
-        line-height: 18px;
-        padding: 4px 10px;
+        line-height: 16px;
+        padding: 2px 10px;
     }
 }
 
@@ -949,7 +949,7 @@ onMounted(async () => {
     }
 }
 .row-4 {
-    // margin: 34px 0;
+    margin-top: 10px;
     .row-4-item {
         text-align: center;
     }
@@ -987,8 +987,8 @@ onMounted(async () => {
 .row-6-item-1 {
     text-align: center;
     img {
-        width: 32px;
-        height: 48px;
+        width: 28px;
+        height: 40px;
         object-fit: contain;
         cursor: pointer;
     }
diff --git a/src/views/home/components/modal-content/add-or-edit-marker-form.vue b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
index 8d971ff..8150a58 100644
--- a/src/views/home/components/modal-content/add-or-edit-marker-form.vue
+++ b/src/views/home/components/modal-content/add-or-edit-marker-form.vue
@@ -2,8 +2,8 @@
     <DialogModal
         @onHandleCloseModal="onHandleCloseAddModal"
         :modalTitle="`${markerParams.type}预置点位`"
-        :width="`140vh`"
-        :height="`110vh`"
+        :width="`60vw`"
+        :height="`100vh`"
     >
         <div class="add-or-edit-marker-form">
             <n-form
@@ -396,6 +396,8 @@ onBeforeUnmount(() => {
 
 <style lang="scss" scoped>
 .add-or-edit-marker-form {
+    width: 100%;
+    padding: 0 10px;
     display: flex;
     flex-direction: column;
     height: 100%;
diff --git a/src/views/home/components/modal-content/control-deck.vue b/src/views/home/components/modal-content/control-deck.vue
index 3054fc5..4f0f14e 100644
--- a/src/views/home/components/modal-content/control-deck.vue
+++ b/src/views/home/components/modal-content/control-deck.vue
@@ -256,7 +256,7 @@ onMounted(async () => {})
     background-size: 100% 100%;
 
     > img {
-        width: 18px;
+        width: 16px;
         height: 18px;
         cursor: pointer;
         object-fit: contain;
@@ -362,7 +362,7 @@ onMounted(async () => {})
 
     .add-reduce-btn {
         position: absolute;
-        right: 0;
+        right: -22px;
         top: -100px;
         // height: 100px;
         display: flex;
@@ -388,8 +388,8 @@ onMounted(async () => {})
 
 .row-3-item-3 {
     > img {
-        width: 24px;
-        height: 26px;
+        width: 16px;
+        height: 18px;
         cursor: pointer;
         object-fit: contain;
     }
diff --git a/src/views/home/components/right-one.vue b/src/views/home/components/right-one.vue
index 635ca80..86a03a5 100644
--- a/src/views/home/components/right-one.vue
+++ b/src/views/home/components/right-one.vue
@@ -152,7 +152,7 @@
                 :scroll-x="10"
                 flex-height
                 :columns="tableColumns_1"
-                :style="{ height: `50%` }"
+                :style="{ height: `65%` }"
                 v-if="activeIndex === 0"
             />
 
@@ -220,11 +220,11 @@
                 :scroll-x="10"
                 :data="tableData_2"
                 :columns="tableColumns_2"
-                :style="{ height: `50%` }"
+                :style="{ height: `65%` }"
                 v-if="activeIndex === 1"
             />
 
-            <div style="margin-top: 4px; display: flex; justify-content: flex-end">
+            <div style="margin-top: 8px; display: flex; justify-content: flex-end">
                 <n-pagination
                     show-size-picker
                     v-if="activeIndex === 0"
@@ -237,7 +237,7 @@
                 />
             </div>
 
-            <div style="margin-top: 4px; display: flex; justify-content: flex-end">
+            <div style="margin-top: 8px; display: flex; justify-content: flex-end">
                 <n-pagination
                     show-size-picker
                     v-if="activeIndex === 1"
@@ -1053,7 +1053,7 @@ onUpdated(() => {
 
 .more-panel-card {
     width: 80%;
-    height: 120vh;
+    height: 100vh;
     display: flex;
     flex-direction: column;
     background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;
diff --git a/src/views/home/components/right-two/index.vue b/src/views/home/components/right-two/index.vue
index f51291b..3d0597d 100644
--- a/src/views/home/components/right-two/index.vue
+++ b/src/views/home/components/right-two/index.vue
@@ -247,7 +247,7 @@ const onHandleTabs = (component, index) => {
 
 .more-panel-card {
     width: 80%;
-    height: 120vh;
+    height: 100vh;
     display: flex;
     flex-direction: column;
     background: url('@/assets/home-imgs/modal-bg.png') no-repeat center center;