From bea440900387207041324ae04969036df1521467 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期二, 31 十二月 2024 15:28:24 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue | 15 ++++++++-------
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 3 ++-
Source/plt-web/plt-web-ui/src/config/website.js | 2 +-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/config/website.js b/Source/plt-web/plt-web-ui/src/config/website.js
index c67f150..2d76c5b 100644
--- a/Source/plt-web/plt-web-ui/src/config/website.js
+++ b/Source/plt-web/plt-web-ui/src/config/website.js
@@ -33,7 +33,7 @@
},
//閰嶇疆鑿滃崟鐨勫睘鎬�
menu: {
- iconDefault: 'iconoir:home',
+ iconDefault: 'codicon:gear',
props: {
label: 'name',
path: 'path',
diff --git a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
index e6e5ba1..aa85462 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
@@ -6,17 +6,19 @@
:class="{'is-active':vaildActive(item)}"
:index="item[pathKey]"
@click="open(item)">
- <i :class="item[iconKey]"></i>
- <span slot="title"
- :alt="item[pathKey]">{{ generateTitle(item) }}</span>
+ <div style="display: flex">
+ <icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
+ <span slot="title"
+ :alt="item[pathKey]"
+ :class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
+ </div>
</el-menu-item>
<el-submenu v-else-if="!validatenull(item[childrenKey])&&vaildRoles(item)"
:key="item[labelKey]"
:index="item[pathKey]">
<template slot="title">
<div style="display: flex">
- <icon-show v-if="item[iconKey]" :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <i v-else class="el-icon-setting" :font-size="iconSize"></i>
+ <icon-show :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
<span slot="title"
:class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
</div>
@@ -28,8 +30,7 @@
:index="child[pathKey],cindex"
@click="open(child)">
<div style="display: flex">
- <icon-show v-if="child[iconKey]" :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <i v-else class="el-icon-setting" :font-size="iconSize"></i>
+ <icon-show :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
<span slot="title">{{ generateTitle(child) }}</span>
</div>
</el-menu-item>
diff --git a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
index 2dda3e4..4241691 100644
--- a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
+++ b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
@@ -120,7 +120,7 @@
//瑙掕壊ID
roleId: "",
//鐢ㄦ埛鍚�
- username: "admin",
+ username: "",
//瀵嗙爜
password: "",
selectInput: '',
@@ -158,6 +158,7 @@
},
created() {
// this.getTenant();
+ this.loginForm.username = this.userInfo.userName
},
mounted() {
//鍦╩ounted鑾峰彇棣栭〉涓嬫媺鑿滃崟鏁版嵁
--
Gitblit v1.9.3