From 865e425cdf7395fece0a53a6def75e2c84d6dbf0 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期二, 15 十月 2024 09:56:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UI-Project/src/layout/MainErpView.vue | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue index e999560..dbbb8f9 100644 --- a/UI-Project/src/layout/MainErpView.vue +++ b/UI-Project/src/layout/MainErpView.vue @@ -5,7 +5,8 @@ import {ElMessage} from 'element-plus' import {ref, watch, onMounted } from 'vue' import deepClone from '@/utils/deepClone' -import { useRouter } from 'vue-router'; +import { useRouter } from 'vue-router'; + import { useI18n } from 'vue-i18n' const userData = ref(null) let menuList = $ref([]) @@ -130,6 +131,7 @@ @click="quit" round> <el-icon size="large"> + <CirclePlus /> <SwitchButton size=""/>{{ $t('main.quit') }} </el-icon> </el-button> @@ -147,7 +149,7 @@ <el-row :span="20"> <el-menu :default-active="activePath" class="el-menu-vertical-demo" > <div class="menu"> - <div v-for="items in menuList"> + <div v-for="items in menuList" :key="items"> <div class='menu_title' v-show="!isCollapse" @click="openMenu(items.menu_id)"> <span>鈽�</span> @@ -155,7 +157,7 @@ </div> <ul class='enter-x-left' v-show="openFlag==items.menu_id"> - <li v-for="page in items.pages" + <li v-for="page in items.pages" :key="page" style="margin-bottom:2px"> <router-link :to="{path:page.page_url}"> {{ page.page_name }} -- Gitblit v1.8.0