From 1db5b6c461279ca997e19bdc73339a1e198ee169 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 02 七月 2024 17:14:15 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/IndexView.vue | 57 +++++++++++++++++-----------
zy-asrs-admin/src/locales/zh_CN.js | 8 ++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java | 6 +++
zy-asrs-admin/src/views/system/menu/index.vue | 1
zy-asrs-admin/src/locales/en_US.js | 9 ++++
zy-asrs-admin/src/views/system/menu/edit.vue | 3 +
6 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-admin/src/locales/en_US.js b/zy-asrs-admin/src/locales/en_US.js
index 3cf6b4f..c413ba3 100644
--- a/zy-asrs-admin/src/locales/en_US.js
+++ b/zy-asrs-admin/src/locales/en_US.js
@@ -119,8 +119,14 @@
'':'',
'':'',
'':'',
- 'system.dept':'Department',
+ 'system.system':'System',
+ 'system.user':'User',
'system.role':'Role',
+ 'system.menu':'Menu',
+ 'system.host':'Host',
+ 'system.dept':'Dept',
+ 'system.userLogin':'UserLogin',
+ 'system.operationRecord':'OperationRecord',
'':'',
'':'',
'':'',
@@ -162,6 +168,7 @@
'db.sys_menu.authority':'Authority',
'db.sys_menu.icon':'Icon',
'db.sys_menu.sort':'Sort',
+ 'db.sys_menu.language_id':'LanguageId',
'':'',
'':'',
'':'',
diff --git a/zy-asrs-admin/src/locales/zh_CN.js b/zy-asrs-admin/src/locales/zh_CN.js
index a535a18..ac87556 100644
--- a/zy-asrs-admin/src/locales/zh_CN.js
+++ b/zy-asrs-admin/src/locales/zh_CN.js
@@ -1,4 +1,12 @@
export default {
'message.hello': '浣犲ソ',
'message.language': '璇█',
+ 'system.system':'绯荤粺绠＄悊',
+ 'system.user':'鐢ㄦ埛绠＄悊',
+ 'system.role':'瑙掕壊绠＄悊',
+ 'system.menu':'鑿滃崟绠＄悊',
+ 'system.host':'鏈烘瀯绠＄悊',
+ 'system.dept':'閮ㄩ棬绠＄悊',
+ 'system.userLogin':'鐧诲綍鏃ュ織',
+ 'system.operationRecord':'鎿嶄綔鏃ュ織',
};
\ No newline at end of file
diff --git a/zy-asrs-admin/src/views/IndexView.vue b/zy-asrs-admin/src/views/IndexView.vue
index 73729c8..e5aa0ae 100644
--- a/zy-asrs-admin/src/views/IndexView.vue
+++ b/zy-asrs-admin/src/views/IndexView.vue
@@ -21,7 +21,7 @@
const collapsed = ref(false);
const router = useRouter();
let routerCache = ref([]);
-let routerCacheMap = ref(new Map());
+let routerCacheList = ref([]);
let currentCache = ref(null);
let isRouterAlive = ref(true);
const menuCache = ref([]);
@@ -38,40 +38,57 @@
}
function menuSelect(item) {
- console.log(item.key);
router.push({
path: item.key
})
let name = item.item.name;
currentCache.value = name;
- // console.log(routerCache.value);
if (name != undefined && routerCache.value.indexOf(name) == -1) {
routerCache.value.push(item.item.name)
- routerCacheMap.value.set(name, item.key)
+ routerCacheList.value.push({
+ key: item.key,
+ languageId: item.item.languageId,
+ name: item.item.name,
+ })
}
}
-function closeTabs(name) {
+function closeTabs(param) {
+ let name = param.name;
let tmp = []
+ let tmpList = [];
routerCache.value.forEach((item) => {
if (item != name) {
tmp.push(item);
}
})
+ routerCacheList.value.forEach((item) => {
+ if (item.name != name) {
+ tmpList.push(item);
+ }
+ })
+
+ console.log(tmpList);
+
if (tmp == 0) {
router.push({
path: '/'
})
routerCache.value.push('home')
- routerCacheMap.value.set('home', '/')
+ routerCacheList.value.push({
+ key: '/',
+ languageId: 'common.home',
+ name: '涓婚〉',
+ })
selectedKeys.value = ['/']
} else {
- switchTabs(tmp[0]);
+ switchTabs(tmpList[0]);
}
routerCache.value = tmp;
+ routerCacheList.value = tmpList;
}
function reloadTabs() {
@@ -89,23 +106,19 @@
}
}
-function switchTabs(name) {
+function switchTabs(item) {
router.push({
- path: routerCacheMap.value.get(name)
+ path: item.key
})
- currentCache.value = name;
- selectedKeys.value = [routerCacheMap.value.get(name)]
-
- // console.log(routerCacheMap, name, routerCacheMap.value.get(name));
-
+ currentCache.value = item.name;
+ selectedKeys.value = [item.key]
}
const switchLocale = (locale) => {
globalState.locale = locale;
localStorage.setItem('locale', locale)
reloadTabs()
- console.log(locale);
}
</script>
@@ -126,12 +139,12 @@
<template #title>
<span>
<component :is="components[ref(item.icon).value]" />
- {{ item.name }}
+ {{ formatMessage(item.languageId, item.name) }}
</span>
</template>
<div v-for="(child, idx) in item.children">
- <a-menu-item v-if="child.status == 1" :key="child.route" :name="child.name">
- {{ child.name }}
+ <a-menu-item v-if="child.status == 1" :key="child.route" :name="child.name" :languageId="child.languageId">
+ {{ formatMessage(child.languageId, child.name) }}
</a-menu-item>
</div>
</a-sub-menu>
@@ -177,12 +190,12 @@
</a-layout-header>
<a-layout-content class="content-view">
<div class="tabs-fixed">
- <div v-for="(item, index) in routerCache" :key="index" @click="switchTabs(item)" class="tabs-item"
- :class="currentCache == item ? 'tabs-item-active' : ''">
- <div :class="currentCache == item ? '' : 'tabs-item-reload-none'" @click="reloadTabs" @click.stop>
+ <div v-for="(item, index) in routerCacheList" :key="index" @click="switchTabs(item)" class="tabs-item"
+ :class="currentCache == item.name ? 'tabs-item-active' : ''">
+ <div :class="currentCache == item.name ? '' : 'tabs-item-reload-none'" @click="reloadTabs" @click.stop>
<RedoOutlined />
</div>
- <div>{{ item }}</div>
+ <div>{{ formatMessage(item.languageId, item.name) }}</div>
<div @click="closeTabs(item)" @click.stop>
<CloseOutlined />
</div>
diff --git a/zy-asrs-admin/src/views/system/menu/edit.vue b/zy-asrs-admin/src/views/system/menu/edit.vue
index 628c9a9..7530ce6 100644
--- a/zy-asrs-admin/src/views/system/menu/edit.vue
+++ b/zy-asrs-admin/src/views/system/menu/edit.vue
@@ -104,6 +104,9 @@
<a-form-item label="鑿滃崟鍥炬爣" name="icon" style="width: 250px;">
<a-input v-model:value="formData.icon" />
</a-form-item>
+ <a-form-item label="鍥介檯鍖朓D" name="icon" style="width: 250px;">
+ <a-input v-model:value="formData.languageId" />
+ </a-form-item>
<a-form-item label="鎺掑簭" name="sort" style="width: 250px;">
<a-input v-model:value="formData.sort" />
</a-form-item>
diff --git a/zy-asrs-admin/src/views/system/menu/index.vue b/zy-asrs-admin/src/views/system/menu/index.vue
index f2054c7..130104d 100644
--- a/zy-asrs-admin/src/views/system/menu/index.vue
+++ b/zy-asrs-admin/src/views/system/menu/index.vue
@@ -149,6 +149,7 @@
<component :is="components[ref(record.icon).value]" />
</template>
</a-table-column>
+ <a-table-column :title="formatMessage('db.sys_menu.language_id', '鍥介檯鍖朓D')" key="languageId" data-index="languageId" />
<a-table-column :title="formatMessage('db.sys_menu.sort', '鎺掑簭')" key="sort" data-index="sort" />
<a-table-column :title="formatMessage('db.sys_menu.status', '鐘舵��')" key="status$" data-index="status$" />
<a-table-column :title="formatMessage('db.sys_menu.update_time', '淇敼鏃堕棿')" key="updateTime$" data-index="updateTime$" />
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java
index e25a0ff..5d3d600 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/entity/Menu.java
@@ -166,6 +166,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍥介檯鍖朓D
+ */
+ @ApiModelProperty(value= "鍥介檯鍖朓D")
+ private String languageId;
+
@TableField(exist = false)
private List<Menu> children;
--
Gitblit v1.9.1