From ece2dfeb926d728b10db38038e4d12e9e9851c24 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:38:10 +0800
Subject: [PATCH] 分页修改
---
src/layout/components/Navbar.vue | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2574903..a8e08a9 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -8,8 +8,8 @@
<div class="center-menu">
<span class="label">{{userStore.currentFactoryName}}</span>
<el-dropdown @command="handleFactoryChange" class="right-menu-item hover-effect" trigger="click">
- <div class="avatar-wrapper">
- <el-icon><Switch /></el-icon>
+ <div>
+ <el-icon size="20"><Switch /></el-icon>
</div>
<template #dropdown>
<el-dropdown-menu >
@@ -23,7 +23,6 @@
</el-dropdown-menu>
</template>
</el-dropdown>
-
</div>
<div class="right-menu">
<div class="avatar-container">
@@ -75,6 +74,10 @@
function toggleSideBar() {
appStore.toggleSideBar()
}
+// const redirect = ref(undefined)
+// watch(route, (newRoute) => {
+// redirect.value = newRoute.query && newRoute.query.redirect
+// }, { immediate: true })
function handleCommand(command) {
switch (command) {
@@ -133,16 +136,15 @@
currentFatoryId: currentFatoryId
}
userStore.loginCheckFactory(loginForm).then(res => {
- const query = route.query
- const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
- if (cur !== "redirect") {
- acc[cur] = query[cur]
- }
- return acc
- }, {})
- router.push({ path: redirect.value || "/", query: otherQueryParams })
- }).catch(() => {
+ forceReload();
+ }).catch((err) => {
+ console.log(err)
})
+}
+function forceReload() {
+ const currentUrl = window.location.origin + window.location.pathname;
+ const timestamp = new Date().getTime();
+ window.location.href = `${currentUrl}?reload=${timestamp}`;
}
getUserLoginFacotryList();
@@ -160,10 +162,13 @@
position: absolute;
left: 50%;
transform: translateX(-50%);
+ display: flex;
+ align-items: center;
.label {
font-weight: bold;
font-size: 18px;
color: #333333;
+ margin-right: 10px;
}
}
--
Gitblit v1.9.3