From 45ef6b6bda5c8e269b432a7fdcf211e61b3f129c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Tue, 7 Nov 2023 01:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=B7=AF=E7=94=B1=E8=AE=BE=E7=BD=AE=E5=B8=A6=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=89=93=E5=BC=80=E9=80=89=E4=B8=AD=E4=B8=94=E4=B8=8D?=
 =?UTF-8?q?=E5=A4=9A=E6=89=93=E5=BC=80=E6=A0=87=E7=AD=BE=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E7=AA=84=E5=B1=8F=E5=B9=95=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layout/components/moduleMenu.vue      |  7 ++++--
 .../src/layout/components/tags.vue            |  2 +-
 snowy-admin-web/src/layout/index.vue          |  4 +++-
 snowy-admin-web/src/store/viewTags.js         |  9 +++++++-
 .../src/views/exm/nestRoutor/index.vue        |  1 -
 .../src/views/index/components/shortcut.vue   |  4 ++--
 .../src/views/index/components/userInfo.vue   | 10 +++++++-
 snowy-admin-web/src/views/index/index.vue     | 23 +++++++++----------
 snowy-admin-web/src/views/sys/user/index.vue  |  6 ++---
 .../src/views/sys/user/userCenter.vue         |  7 +++---
 10 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/snowy-admin-web/src/layout/components/moduleMenu.vue b/snowy-admin-web/src/layout/components/moduleMenu.vue
index 2553b437..e7ae0fc6 100644
--- a/snowy-admin-web/src/layout/components/moduleMenu.vue
+++ b/snowy-admin-web/src/layout/components/moduleMenu.vue
@@ -3,7 +3,7 @@
 		<a-menu
 			v-model:selectedKeys="selectedKeys"
 			mode="horizontal"
-			v-if="menu && menu.length > 1"
+			v-if="menu && menu.length > 1 && !isMobile"
 			class="module-menu"
 			id="moduleMenu"
 		>
@@ -22,7 +22,7 @@
 		</a-menu>
 	</div>
 	<div v-else>
-		<a-popover v-if="menu.length > 1" placement="bottomLeft">
+		<a-popover v-if="menu.length > 1 && !isMobile" placement="bottomLeft">
 			<template #content>
 				<a-row :gutter="[0, 5]" class="module-row">
 					<div v-for="item in menu" :key="item.id">
@@ -56,6 +56,9 @@
 	const module = computed(() => {
 		return store.module
 	})
+	const isMobile = computed(() => {
+		return store.isMobile
+	})
 	// 监听目录是否折叠
 	watch(moduleUnfoldOpen, (newValue) => {
 		nextTick(() => {
diff --git a/snowy-admin-web/src/layout/components/tags.vue b/snowy-admin-web/src/layout/components/tags.vue
index 3ef7333e..9c9790f5 100644
--- a/snowy-admin-web/src/layout/components/tags.vue
+++ b/snowy-admin-web/src/layout/components/tags.vue
@@ -190,7 +190,7 @@
 			},
 			// 高亮tag
 			isActive(route) {
-				return route.fullPath === this.$route.fullPath
+				return route.path === this.$route.path
 			},
 			// 关闭tag
 			closeSelectedTag(tag, autoPushLatestView = true) {
diff --git a/snowy-admin-web/src/layout/index.vue b/snowy-admin-web/src/layout/index.vue
index b2554faa..4e2d690b 100644
--- a/snowy-admin-web/src/layout/index.vue
+++ b/snowy-admin-web/src/layout/index.vue
@@ -272,7 +272,7 @@
 		// 展开的
 		nextTick(() => {
 			// 取得默认路由地址并设置展开
-			const active = route.meta.active || route.fullPath
+			const active = route.meta.active || route.path
 			selectedKeys.value = new Array(active)
 			const pidKey = getParentKeys(pMenu.value.children, active)
 			const nextTickMenu = pMenu.value.children
@@ -316,6 +316,8 @@
 	showThis()
 
 	onMounted(() => {
+		onLayoutResize()
+		window.addEventListener('resize', onLayoutResize)
 		switchoverTopHeaderThemeColor()
 	})
 	watch(route, (newValue) => {
diff --git a/snowy-admin-web/src/store/viewTags.js b/snowy-admin-web/src/store/viewTags.js
index 2fcf58be..de86937c 100644
--- a/snowy-admin-web/src/store/viewTags.js
+++ b/snowy-admin-web/src/store/viewTags.js
@@ -18,11 +18,18 @@ export const viewTagsStore = defineStore({
 	getters: {},
 	actions: {
 		pushViewTags(route) {
-			const target = this.viewTags.find((item) => item.fullPath === route.fullPath)
+			const target = this.viewTags.find((item) => item.path === route.path)
 			const isName = route.name
 			if (!target && isName) {
 				this.viewTags.push(route)
 			}
+			if (target) {
+				this.viewTags.forEach((item) => {
+					if (item.path === route.path) {
+						Object.assign(item, route)
+					}
+				})
+			}
 		},
 		removeViewTags(route) {
 			this.viewTags.forEach((item, index) => {
diff --git a/snowy-admin-web/src/views/exm/nestRoutor/index.vue b/snowy-admin-web/src/views/exm/nestRoutor/index.vue
index 2a13b5f0..61da89e7 100644
--- a/snowy-admin-web/src/views/exm/nestRoutor/index.vue
+++ b/snowy-admin-web/src/views/exm/nestRoutor/index.vue
@@ -7,7 +7,6 @@
 
 <script setup name="exmNestRoutor">
 	import { useRouter, useRoute } from 'vue-router'
-	import { defineComponent, ref } from 'vue'
 
 	const router = useRouter()
 	const route = useRoute()
diff --git a/snowy-admin-web/src/views/index/components/shortcut.vue b/snowy-admin-web/src/views/index/components/shortcut.vue
index 52c92d05..b50148ab 100644
--- a/snowy-admin-web/src/views/index/components/shortcut.vue
+++ b/snowy-admin-web/src/views/index/components/shortcut.vue
@@ -2,7 +2,7 @@
 	<a-card :bordered="false">
 		<template #title> 快捷方式 </template>
 		<a-row :gutter="10">
-			<a-col :span="6" :key="shortcut.id" v-for="shortcut in shortcutList">
+			<a-col :span="6" :key="shortcut.id" v-for="shortcut in shortcutList" :xs="12" :sm="8" :md="6" :lg="8" :xl="6">
 				<shortcutCard
 					:icon="shortcut.icon ? shortcut.icon : 'menu-outlined'"
 					:label="shortcut.title"
@@ -16,7 +16,7 @@
 <script setup name="shortcut">
 	import router from '@/router'
 	import userCenterApi from '@/api/sys/userCenterApi'
-	import shortcutCard from '@/components/ShortcutCard/index.vue'
+	import ShortcutCard from '@/components/ShortcutCard/index.vue'
 	import { onMounted } from 'vue'
 	const shortcutList = ref([])
 
diff --git a/snowy-admin-web/src/views/index/components/userInfo.vue b/snowy-admin-web/src/views/index/components/userInfo.vue
index 8163b08f..a8835f7b 100644
--- a/snowy-admin-web/src/views/index/components/userInfo.vue
+++ b/snowy-admin-web/src/views/index/components/userInfo.vue
@@ -12,7 +12,7 @@
 					<span style="color: #6d737b; margin: 2px">{{ userInfo.orgName }} | {{ userInfo.positionName }}</span>
 				</div>
 			</div>
-			<span style="margin: 2px">
+			<span class="snowy-index-userinfo-time">
 				{{ currentTime }}
 			</span>
 		</div>
@@ -43,4 +43,12 @@
 		flex-direction: column;
 		justify-content: center;
 	}
+	.snowy-index-userinfo-time {
+		margin: 2px
+	}
+	@media (max-width: 992px) {
+		.snowy-index-userinfo-time {
+			display: none;
+		}
+	}
 </style>
diff --git a/snowy-admin-web/src/views/index/index.vue b/snowy-admin-web/src/views/index/index.vue
index aced998e..eec2b5b0 100644
--- a/snowy-admin-web/src/views/index/index.vue
+++ b/snowy-admin-web/src/views/index/index.vue
@@ -1,18 +1,18 @@
 <template>
 	<a-row :gutter="10">
-		<a-col :span="16">
+		<a-col :span="16" :xs="24" :sm="24" :md="24" :lg="16" :xl="16">
 			<userInfo class="mb-2" />
 			<shortcut class="mb-2" />
 			<a-row :gutter="10">
-				<a-col :span="12">
+				<a-col :span="12" :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<visLog class="mb-2" />
 				</a-col>
-				<a-col :span="12">
+				<a-col :span="12" :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
 					<opLog class="mb-2" />
 				</a-col>
 			</a-row>
 		</a-col>
-		<a-col :span="8">
+		<a-col :span="8" :xs="24" :sm="24" :md="24" :lg="8" :xl="8">
 			<carousel class="mb-2" />
 			<schedule class="mb-2" />
 			<miniMessage class="mb-2" />
@@ -21,12 +21,11 @@
 </template>
 
 <script setup name="indexHome">
-	import shortcutCard from '@/components/ShortcutCard/index.vue'
-	import userInfo from './components/userInfo.vue'
-	import shortcut from './components/shortcut.vue'
-	import schedule from './components/schedule.vue'
-	import miniMessage from './components/miniMessage.vue'
-	import carousel from './components/carousel.vue'
-	import visLog from './components/visLog.vue'
-	import opLog from './components/opLog.vue'
+	import UserInfo from './components/userInfo.vue'
+	import Shortcut from './components/shortcut.vue'
+	import Schedule from './components/schedule.vue'
+	import MiniMessage from './components/miniMessage.vue'
+	import Carousel from './components/carousel.vue'
+	import VisLog from './components/visLog.vue'
+	import OpLog from './components/opLog.vue'
 </script>
diff --git a/snowy-admin-web/src/views/sys/user/index.vue b/snowy-admin-web/src/views/sys/user/index.vue
index 3a25044c..36d862f2 100644
--- a/snowy-admin-web/src/views/sys/user/index.vue
+++ b/snowy-admin-web/src/views/sys/user/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<a-row>
-		<a-col :span="5">
-			<a-card class="cardImp" :bordered="false" :loading="cardLoading">
+		<a-col :xs="24" :sm="24" :md="24" :lg="5" :xl="5">
+			<a-card class="cardImp mb-3" :bordered="false" :loading="cardLoading">
 				<a-tree
 					v-if="treeData.length > 0"
 					v-model:expandedKeys="defaultExpandedKeys"
@@ -13,7 +13,7 @@
 				<a-empty v-else :image="Empty.PRESENTED_IMAGE_SIMPLE" />
 			</a-card>
 		</a-col>
-		<a-col :span="19">
+		<a-col :xs="24" :sm="24" :md="24" :lg="19" :xl="19">
 			<a-card :bordered="false" style="margin-bottom: 10px">
 				<a-form ref="searchFormRef" name="advanced_search" class="ant-advanced-search-form" :model="searchFormState">
 					<a-row :gutter="24">
diff --git a/snowy-admin-web/src/views/sys/user/userCenter.vue b/snowy-admin-web/src/views/sys/user/userCenter.vue
index 5e0db9d8..c859a371 100644
--- a/snowy-admin-web/src/views/sys/user/userCenter.vue
+++ b/snowy-admin-web/src/views/sys/user/userCenter.vue
@@ -1,6 +1,6 @@
 <template>
-	<a-row :gutter="24">
-		<a-col :md="24" :lg="7" style="padding-right: 0px">
+	<a-row :gutter="10">
+		<a-col :xs="24" :sm="24" :md="7" :lg="7" :xl="7" class="mb-3">
 			<a-card :bordered="false">
 				<div class="account-center-avatarHolder">
 					<div class="avatar">
@@ -32,8 +32,7 @@
 				</div>
 			</a-card>
 		</a-col>
-
-		<a-col :md="24" :lg="17">
+		<a-col :xs="24" :sm="24" :md="17" :lg="17" :xl="17">
 			<a-card
 				:bordered="false"
 				style="width: 100%"