From b9d184569376d48697d3c568001a0c4982542f8a Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Fri, 15 Aug 2025 15:39:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=B5=B0=E6=9F=A5?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/site/sitesem.svg | 2 +- src/components/GuipRadio.vue | 4 ++++ src/components/SliderMenu.vue | 19 ++++++++++--------- src/components/Tooltip.vue | 10 ++++++++-- src/components/site/serviceSetting/linkSet.vue | 4 ++-- src/views/agent/siteAdd.vue | 7 ++++++- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/assets/site/sitesem.svg b/src/assets/site/sitesem.svg index 0ff4fe4..1c1b9b1 100644 --- a/src/assets/site/sitesem.svg +++ b/src/assets/site/sitesem.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/GuipRadio.vue b/src/components/GuipRadio.vue index 07702ec..1428f05 100644 --- a/src/components/GuipRadio.vue +++ b/src/components/GuipRadio.vue @@ -173,5 +173,9 @@ export default { /* 自定义样式 */ .el-radio-group { margin: 10px 0; + display: flex; + justify-content: flex-start; + gap: 20px 24px; + flex-wrap: wrap; } \ No newline at end of file diff --git a/src/components/SliderMenu.vue b/src/components/SliderMenu.vue index 1f95bd7..5f8c607 100644 --- a/src/components/SliderMenu.vue +++ b/src/components/SliderMenu.vue @@ -21,7 +21,7 @@
- {{ item.title }} + activeColor="#006AFF" :isActive="item.index == (currentMenuItem && currentMenuItem['index'])" /> + {{ item.title}}
@@ -50,6 +50,7 @@ import SvgIcon1 from '@/components/SvgIcon1.vue'; import GuipToolTip from '@/components/GuipToolTip.vue'; export default { name: 'SliderMenu', + options: { styleIsolation: "shared" }, components: { SvgIcon1, GuipToolTip, @@ -215,22 +216,22 @@ export default { } - .el-menu-item.is-active { - font-weight: bold; - } +} +::v-deep .el-menu-item.is-active .title_text{ + font-weight: bold; + color: #006AFF !important; } .title_img { width: 16px; margin-right: 4px; } - .title_text { margin-left: 4px; font-size: 14px; - font-weight: bold; + font-weight: normal; display: block; - + color: #1E2226; } .el-menu--collapse .title_text { diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue index 15bd51c..edeb8e8 100644 --- a/src/components/Tooltip.vue +++ b/src/components/Tooltip.vue @@ -67,18 +67,24 @@ export default { const targetRect = targetEl.getBoundingClientRect(); const messageWidth = this.$el.offsetWidth; const viewportWidth = window.innerWidth; + const messageHeight = this.$el.offsetHeight; // 默认居中位置 let left = targetRect.left + targetRect.width / 2 - messageWidth / 2; + let top = 0; // 边界检测 if (left < 0) { left = targetRect.left; // 左侧贴边 } else if (left + messageWidth > viewportWidth) { left = viewportWidth - messageWidth - (viewportWidth -targetRect.right); // 右侧贴边 } - + if(this.position == 'top'){ + top =`${targetRect.top + window.scrollY - this.offset - messageHeight}px` + }else{ + top = `${targetRect.top + window.scrollY + this.offset + messageHeight}px` + } this.positionStyle = { - top: `${targetRect.bottom + window.scrollY + this.offset}px`, + top, left: `${left}px`, right: 'auto', // 清除 right 定位 }; diff --git a/src/components/site/serviceSetting/linkSet.vue b/src/components/site/serviceSetting/linkSet.vue index b09415a..4a347af 100644 --- a/src/components/site/serviceSetting/linkSet.vue +++ b/src/components/site/serviceSetting/linkSet.vue @@ -71,10 +71,10 @@ export default { }, methods: { toggleSetSyncHome(){ - this.syncHome = !this.syncHome + // this.syncHome = !this.syncHome }, toggleSetSyncCheck(){ - this.syncCheck = !this.syncCheck + // this.syncCheck = !this.syncCheck }, saveConfirm() { let obj = {} diff --git a/src/views/agent/siteAdd.vue b/src/views/agent/siteAdd.vue index 0ea0e00..0fea349 100644 --- a/src/views/agent/siteAdd.vue +++ b/src/views/agent/siteAdd.vue @@ -162,7 +162,7 @@ export default { display: flex; flex-direction: column; height: 100%; - + overflow-y: auto; .custom-icon { width: 24px; height: 24px; @@ -182,6 +182,11 @@ export default { text-align: left; width: calc(84.75% - 72px); } + .sticky{ + position: sticky; + top: 0px; + z-index: 100; + } } .step-wrap { From 05700b21d4ade0c03c29637ebb1215aefc1ad588 Mon Sep 17 00:00:00 2001 From: zq <136432190602163.com> Date: Tue, 19 Aug 2025 14:18:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E7=B1=BB=E7=BB=84=E4=BB=B6=E6=8F=90=E7=A4=BA=E6=97=B6=E6=92=91?= =?UTF-8?q?=E5=BC=80=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/site/sitesem.svg | 2 +- src/components/GuipInput.vue | 25 ++++++++++++++++-- src/components/GuipSelect.vue | 27 ++++++++++++++++++-- src/components/SliderMenu.vue | 2 +- src/components/Tooltip.vue | 42 +++++++++++++++++++++---------- src/components/site/addSiteStep/step2.vue | 23 +++++++++++++---- 6 files changed, 97 insertions(+), 24 deletions(-) diff --git a/src/assets/site/sitesem.svg b/src/assets/site/sitesem.svg index 1c1b9b1..0352de3 100644 --- a/src/assets/site/sitesem.svg +++ b/src/assets/site/sitesem.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/components/GuipInput.vue b/src/components/GuipInput.vue index 2983dff..eed7f1a 100644 --- a/src/components/GuipInput.vue +++ b/src/components/GuipInput.vue @@ -1,7 +1,8 @@ @@ -147,4 +149,23 @@ export default { pointer-events: none; /* 防止单位文本影响输入框的点击事件 */ } +.custom-form-item { + ::v-deep .el-form-item__content { + display: flex; + flex-direction: column; + align-items: flex-start; + } + + .input-wrapper { + position: relative; + width: 100%; + } + + ::v-deep .el-form-item__error { + position: relative; + margin-top: 4px; + padding-top: 0; + line-height: 1; + } +} \ No newline at end of file diff --git a/src/components/GuipSelect.vue b/src/components/GuipSelect.vue index e43a309..c8387f6 100644 --- a/src/components/GuipSelect.vue +++ b/src/components/GuipSelect.vue @@ -1,7 +1,7 @@ - {{ subItem.title }} diff --git a/src/components/Tooltip.vue b/src/components/Tooltip.vue index edeb8e8..cc7807b 100644 --- a/src/components/Tooltip.vue +++ b/src/components/Tooltip.vue @@ -1,7 +1,8 @@