From 13fc2fd138c26c6070aa793c20f1a12a536f2af0 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期五, 27 十二月 2024 10:51:42 +0800
Subject: [PATCH] 个人信息不跳转bug&&菜单折叠后图标大小以及折叠后图标错乱显示问题
---
Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue | 10 ++++++----
Source/plt-web/plt-web-ui/src/styles/ui.scss | 4 ++++
Source/plt-web/plt-web-ui/src/option/user/info.js | 6 +++---
Source/plt-web/plt-web-ui/src/page/index/top/index.vue | 8 ++++++--
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 2 +-
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/option/user/info.js b/Source/plt-web/plt-web-ui/src/option/user/info.js
index 65bf4f6..4330f76 100644
--- a/Source/plt-web/plt-web-ui/src/option/user/info.js
+++ b/Source/plt-web/plt-web-ui/src/option/user/info.js
@@ -54,7 +54,7 @@
label: '鐧婚檰瀵嗙爜',
prop: 'oldPassword',
span: 24,
- labelWidth: "7%",
+ labelWidth: "8%",
type: 'password',
rules: [
{
@@ -68,7 +68,7 @@
label: '鏂扮櫥闄嗗瘑鐮�',
prop: 'password',
span: 24,
- labelWidth: "7%",
+ labelWidth: "8%",
type: 'password',
rules: [
{
@@ -82,7 +82,7 @@
label: '鏂板瘑鐮佺櫥闄嗙‘璁�',
prop: 'confirmPassword',
span: 24,
- labelWidth: "7%",
+ labelWidth: "8%",
type: 'password',
rules: [
{
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 c9cddc3..b6bdd32 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
@@ -15,7 +15,7 @@
:index="item[pathKey]">
<template slot="title">
<div style="display: flex">
- <icon-show :name="item[iconKey]" class="iconShowSpan"></icon-show>
+ <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>
@@ -27,7 +27,7 @@
:index="child[pathKey],cindex"
@click="open(child)">
<div style="display: flex">
- <icon-show :name="child[iconKey]" class="iconShowSpan"></icon-show>
+ <icon-show :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
<span slot="title">{{ generateTitle(child) }}</span>
</div>
</el-menu-item>
@@ -81,6 +81,9 @@
},
computed: {
...mapGetters(["roles"]),
+ iconSize() {
+ return this.collapse ? '20px' : '16px';
+ },
labelKey() {
return this.props.label || this.config.propsDefault.label;
},
@@ -160,11 +163,10 @@
.iconShowSpan{
display: inline-block;
margin-top: -2px;
- width: 16px !important;
- height: 16px !important;
margin-right: 10px;
color: #eeeeea;
}
+
</style>
diff --git a/Source/plt-web/plt-web-ui/src/page/index/top/index.vue b/Source/plt-web/plt-web-ui/src/page/index/top/index.vue
index 7d9e532..4b22017 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/top/index.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/top/index.vue
@@ -88,8 +88,8 @@
<el-dropdown-item>
<router-link to="/">{{ $t('navbar.dashboard') }}</router-link>
</el-dropdown-item>
- <el-dropdown-item>
- <router-link to="/info/index">{{ $t('navbar.userinfo') }}</router-link>
+ <el-dropdown-item @click.native="gotoInfo">
+ {{ $t('navbar.userinfo') }}
<!-- 淇敼瀵嗙爜-->
</el-dropdown-item>
<el-dropdown-item v-if="this.website.switchMode" @click.native="switchDept"
@@ -226,6 +226,10 @@
setScreen() {
this.$store.commit("SET_FULLSCREN");
},
+ gotoInfo() {
+ console.log('123')
+ this.$router.push({path: '/info'});
+ },
switchDept() {
const userId = this.userInfo.user_id;
const deptColumn = this.findObject(this.userOption.column, "deptId");
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index e7722cb..b267bf5 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -563,6 +563,10 @@
margin-left: 1px;
}
+.el-icon-arrow-right:before {
+ content: "";
+}
+
.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index 78eda45..07d2c1a 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -69,7 +69,7 @@
<el-button icon="el-icon-close" plain size="small" type="danger" @click="deleteOperationClickHandler">鍒犻櫎
</el-button>
</div>
- <el-form ref="form" :model="form" label-width="85px" size="small" style="max-height: calc(100vh - 200px);overflow: auto;">
+ <el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 200px);overflow: auto;">
<span v-if="form.category !== 1">
<el-form-item label="妯″潡鍚嶏細">
<el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユā鍧楀悕"></el-input>
--
Gitblit v1.9.3