From 1fbf7fd8f2dd97ddfcb6cff12fd3fc99ee61f6b1 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 03 七月 2024 19:39:08 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/main.js | 4 +++-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/MenuController.java | 7 +++++++
zy-asrs-admin/src/App.vue | 2 ++
zy-asrs-admin/src/views/IndexView.vue | 24 +++++++++++++++++++++++-
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-admin/src/App.vue b/zy-asrs-admin/src/App.vue
index 616c29e..35965a2 100644
--- a/zy-asrs-admin/src/App.vue
+++ b/zy-asrs-admin/src/App.vue
@@ -15,6 +15,8 @@
zhCN,
enUS,
};
+
+console.log('%c 涓壃绔嬪簱骞冲彴 %c 1.0.0','background-color:rgb(53,73,94);color: #fff;border-radius:2px 0 0 2px;padding:2px 4px;','background-color:rgb(25,190,107);color: #fff;border-radius:0 2px 2px 0;padding:2px 4px;font: 9pt "Apercu Regular", Georgia, "Times New Roman", Times, serif;')
</script>
<template>
diff --git a/zy-asrs-admin/src/main.js b/zy-asrs-admin/src/main.js
index d2d1b27..02a017d 100644
--- a/zy-asrs-admin/src/main.js
+++ b/zy-asrs-admin/src/main.js
@@ -29,7 +29,9 @@
app.use(createPinia())
app.use(router)
app.use(Antd)
- app.mount('#app')
+ router.isReady().then((e) => {
+ app.mount('#app')
+ })
}
boot()
diff --git a/zy-asrs-admin/src/views/IndexView.vue b/zy-asrs-admin/src/views/IndexView.vue
index abf58d4..0c0a1b1 100644
--- a/zy-asrs-admin/src/views/IndexView.vue
+++ b/zy-asrs-admin/src/views/IndexView.vue
@@ -1,5 +1,5 @@
<script setup>
-import { nextTick, ref, inject } from 'vue';
+import { nextTick, ref, inject, onMounted } from 'vue';
import { useRouter } from "vue-router";
import { get, post, postForm } from '@/utils/request.js'
import { logout } from '@/config.js';
@@ -32,6 +32,28 @@
...Icons,
};
+onMounted(() => {
+ let name = router.currentRoute.value.name;
+ let path = router.currentRoute.value.path;
+ if (currentCache.value == null && path != '/') {
+ get('/api/menu/get/route', {
+ route: path
+ }).then((resp) => {
+ let result = resp.data;
+ let data = result.data;
+ if (result.code == 200) {
+ currentCache.value = name;
+ routerCache.value.push(name)
+ routerCacheList.value.push({
+ key: path,
+ languageId: data.languageId,
+ name: name,
+ })
+ }
+ })
+ }
+})
+
getMenu()
function getMenu() {
get('/api/auth/menu', {}).then((result) => {
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/MenuController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/MenuController.java
index 81c5b93..cc6b5f5 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/MenuController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/MenuController.java
@@ -58,6 +58,13 @@
}
@PreAuthorize("hasAuthority('system:menu:list')")
+ @GetMapping("/menu/get/route")
+ public R getByRoute(@RequestParam("route") String route) {
+ Menu menu = menuService.getOne(new LambdaQueryWrapper<Menu>().eq(Menu::getRoute, route).eq(Menu::getStatus, 1).last("limit 1"));
+ return R.ok().add(menu);
+ }
+
+ @PreAuthorize("hasAuthority('system:menu:list')")
@GetMapping("/menu/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(menuService.getById(id));
--
Gitblit v1.9.1