From e03b2546f020327bf9fd414d8869a9ccd2270c2d Mon Sep 17 00:00:00 2001
From: 曹睿 <360930172@qq.com>
Date: 星期二, 17 六月 2025 17:31:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/product-inventory-management into dev
---
src/layout/components/Navbar.vue | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 3c70204..1f0d385 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,23 +1,22 @@
<template>
<div class="navbar">
<div>
- <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+ <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"
+ @toggleClick="toggleSideBar" />
<breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
</div>
-<!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
+ <!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
<div class="center-menu">
- <span class="label">{{userStore.currentFactoryName}}</span>
+ <span class="label">{{ userStore.currentFactoryName }}</span>
<el-dropdown @command="handleFactoryChange" class="right-menu-item hover-effect" trigger="click">
<div>
- <el-icon size="20"><Switch /></el-icon>
+ <el-icon size="20">
+ <Switch />
+ </el-icon>
</div>
<template #dropdown>
- <el-dropdown-menu >
- <el-dropdown-item
- v-for="item in factoryList"
- :key="item.deptId"
- :command="item"
- >
+ <el-dropdown-menu>
+ <el-dropdown-item v-for="item in factoryList" :key="item.deptId" :command="item">
{{ item.deptName }}
</el-dropdown-item>
</el-dropdown-menu>
@@ -114,12 +113,12 @@
}
function getUserLoginFacotryList() {
- if(userStore.id){
- userLoginFacotryList({userId:userStore.id}).then(res => {
+ if (userStore.id) {
+ userLoginFacotryList({ userId: userStore.id }).then(res => {
console.log('res', res)
factoryList.value = res.data
})
- }else {
+ } else {
factoryList.value = []
}
}
@@ -129,17 +128,22 @@
handleLogin(command.deptId);
}
-function handleLogin(currentFatoryId){
+function handleLogin(currentFatoryId) {
const loginForm = {
username: Cookies.get("username"),
password: Cookies.get("password") === undefined ? null : decrypt(Cookies.get("password")),
currentFatoryId: currentFatoryId
}
userStore.loginCheckFactory(loginForm).then(res => {
- window.location.reload();
+ 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();
@@ -152,6 +156,7 @@
position: relative;
background: var(--navbar-bg);
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+
.center-menu {
line-height: 50px;
position: absolute;
@@ -159,6 +164,7 @@
transform: translateX(-50%);
display: flex;
align-items: center;
+
.label {
font-weight: bold;
font-size: 18px;
--
Gitblit v1.9.3