From 06f4b7a0e7fbd9fab646ac4f816099a4ec084755 Mon Sep 17 00:00:00 2001 From: shi <936384804@qq.com> Date: Sat, 15 Nov 2025 19:26:27 +0800 Subject: [PATCH] 1 --- .../ueimg/1.png => public/assets/ue1.png | Bin .../ueimg/2.png => public/assets/ue2.png | Bin .../ueimg/3.png => public/assets/ue3.png | Bin .../ueimg/4.png => public/assets/ue4.png | Bin .../ueimg/5.png => public/assets/ue5.png | Bin src/views/ueScreen/components/date.vue | 2 +- src/views/ueScreen/components/leftPage.vue | 10 +++---- src/views/ueScreen/components/project.vue | 27 ++++++++++++------ src/views/ueScreen/index.vue | 8 ++---- 9 files changed, 26 insertions(+), 21 deletions(-) rename src/assets/ueimg/1.png => public/assets/ue1.png (100%) rename src/assets/ueimg/2.png => public/assets/ue2.png (100%) rename src/assets/ueimg/3.png => public/assets/ue3.png (100%) rename src/assets/ueimg/4.png => public/assets/ue4.png (100%) rename src/assets/ueimg/5.png => public/assets/ue5.png (100%) diff --git a/src/assets/ueimg/1.png b/public/assets/ue1.png similarity index 100% rename from src/assets/ueimg/1.png rename to public/assets/ue1.png diff --git a/src/assets/ueimg/2.png b/public/assets/ue2.png similarity index 100% rename from src/assets/ueimg/2.png rename to public/assets/ue2.png diff --git a/src/assets/ueimg/3.png b/public/assets/ue3.png similarity index 100% rename from src/assets/ueimg/3.png rename to public/assets/ue3.png diff --git a/src/assets/ueimg/4.png b/public/assets/ue4.png similarity index 100% rename from src/assets/ueimg/4.png rename to public/assets/ue4.png diff --git a/src/assets/ueimg/5.png b/public/assets/ue5.png similarity index 100% rename from src/assets/ueimg/5.png rename to public/assets/ue5.png diff --git a/src/views/ueScreen/components/date.vue b/src/views/ueScreen/components/date.vue index d104b4d..af931a5 100644 --- a/src/views/ueScreen/components/date.vue +++ b/src/views/ueScreen/components/date.vue @@ -228,7 +228,7 @@ $vh_base: 1080; } .options li.selected { - // background-color: #e6f7ff; + background-color: #e6f7ff; color: #1890ff; font-weight: 500; } diff --git a/src/views/ueScreen/components/leftPage.vue b/src/views/ueScreen/components/leftPage.vue index b7e2723..1264f50 100644 --- a/src/views/ueScreen/components/leftPage.vue +++ b/src/views/ueScreen/components/leftPage.vue @@ -117,31 +117,31 @@ const infoList = ref([ name: '变压器220KV', value: 564, unit: '（台）', - icon: 'src/assets/ueimg/1.png', + icon: 'public/assets/ue1.png', }, { name: '开关柜220KV', value: 100, unit: '（台）', - icon: 'src/assets/ueimg/2.png', + icon: 'public/assets/ue2.png', }, { name: '接地变110v', value: 564, unit: '（台）', - icon: 'src/assets/ueimg/3.png', + icon: 'public/assets/ue3.png', }, { name: '电缆110v', value: 768, unit: '（回）', - icon: 'src/assets/ueimg/4.png', + icon: 'public/assets/ue4.png', }, { name: 'GIS', value: 100, unit: '（个）', - icon: 'src/assets/ueimg/5.png', + icon: 'public/assets/ue5.png', }, ]) diff --git a/src/views/ueScreen/components/project.vue b/src/views/ueScreen/components/project.vue index 7300d13..6203c0e 100644 --- a/src/views/ueScreen/components/project.vue +++ b/src/views/ueScreen/components/project.vue @@ -114,8 +114,9 @@ $vh_base: 1080; .picker-input { // 关键修改：设置一个最大宽度，防止文本过长导致容器被撑破 // 你可以根据需要调整这个值，vw(300) 表示在1920px宽的屏幕下，最大宽度是300px - max-width: 12vw; - width: 100%; /* 让输入框尽可能利用可用空间，但不超过max-width */ + max-width: 12vw; + width: 100%; + /* 让输入框尽可能利用可用空间，但不超过max-width */ display: flex; gap: vw(8); justify-content: space-between; @@ -123,16 +124,21 @@ $vh_base: 1080; padding: vh(8) vw(16); cursor: pointer; user-select: none; - box-sizing: border-box; /* 确保padding不会增加元素总宽度 */ + box-sizing: border-box; + /* 确保padding不会增加元素总宽度 */ } .picker-input .value { color: #fff; // 关键修改：添加文本省略样式 - white-space: nowrap; /* 强制文本在一行显示 */ - overflow: hidden; /* 隐藏溢出的文本 */ - text-overflow: ellipsis; /* 显示省略号 */ - flex-grow: 1; /* 让 .value 元素占据可用空间，将箭头推到最右边 */ + white-space: nowrap; + /* 强制文本在一行显示 */ + overflow: hidden; + /* 隐藏溢出的文本 */ + text-overflow: ellipsis; + /* 显示省略号 */ + flex-grow: 1; + /* 让 .value 元素占据可用空间，将箭头推到最右边 */ } .picker-input.open .arrow { @@ -155,11 +161,13 @@ $vh_base: 1080; top: 110%; left: 0; right: 0; - max-height: vh(200); /* 限制最大高度并可滚动 */ + max-height: vh(200); + /* 限制最大高度并可滚动 */ overflow-y: auto; background-color: rgba(0, 0, 0, 0.3); border-radius: vw(4); - box-shadow: 0 vh(4) vh(12) rgba(0, 0, 0, 0.15); /* 更明显的阴影 */ + box-shadow: 0 vh(4) vh(12) rgba(0, 0, 0, 0.15); + /* 更明显的阴影 */ list-style: none; z-index: 10; padding: vh(4) 0; @@ -181,6 +189,7 @@ $vh_base: 1080; } .options li.selected { + background-color: #e6f7ff; color: #1890ff; font-weight: 500; } diff --git a/src/views/ueScreen/index.vue b/src/views/ueScreen/index.vue index 9690f5a..ea90dd0 100644 --- a/src/views/ueScreen/index.vue +++ b/src/views/ueScreen/index.vue @@ -20,7 +20,6 @@ import usePermissionStore from '@/store/modules/permission'; import to from 'await-to-js'; const userStore = useUserStoreHook(); -const initDone = ref(false); // ✅ 控制页面是否渲染 const isHideOther = ref(false); const isFull = ref(false); @@ -38,12 +37,12 @@ const handleChangePage = () => { } }; +// 调用静默登录接口 const silentLogin = async (isExpired = false) => { const token = getToken(); if (token && !isExpired) return true; try { - // 调用静默登录接口 await to( userStore.login({ username: 'admin', @@ -62,12 +61,9 @@ const silentLogin = async (isExpired = false) => { return true; }; -// ✅ 页面初始化逻辑 const initPage = async () => { const logged = await silentLogin(); if (!logged) return; - - initDone.value = true; // ✅ 准备完成 }; onMounted(() => { @@ -93,7 +89,7 @@ $vh_base: 1080; .ueScreen { width: 100vw; height: 100vh; - background-image: url('@/assets/ueimg/bj.png'); + // background-image: url('@/assets/ueimg/bj.png'); background-size: cover; background-repeat: no-repeat; background-position: center center;