Skip to content

Commit a828cd8

Browse files
committed
modified main menu
1 parent c74ae9d commit a828cd8

File tree

7 files changed

+20
-10
lines changed

7 files changed

+20
-10
lines changed

Vue/src/images/logo-min.jpg

22.1 KB
Loading

Vue/src/images/logo.jpg

34.8 KB
Loading

Vue/src/libs/util.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ util.setCurrentPath = function (vm, name) {
155155
if (currentPathObj.children.length <= 1 && currentPathObj.name === 'home') {
156156
currentPathArr = [
157157
{
158-
title: '首页',
158+
title: this.localize('HomePage'),
159159
path: '',
160160
name: 'home_index'
161161
}
162162
];
163163
} else if (currentPathObj.children.length <= 1 && currentPathObj.name !== 'home') {
164164
currentPathArr = [
165165
{
166-
title: '首页',
166+
title: this.localize('HomePage'),
167167
path: '/home',
168168
name: 'home_index'
169169
},
@@ -179,7 +179,7 @@ util.setCurrentPath = function (vm, name) {
179179
})[0];
180180
currentPathArr = [
181181
{
182-
title: '首页',
182+
title: this.localize('HomePage'),
183183
path: '/home',
184184
name: 'home_index'
185185
},

Vue/src/router/router.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ export const otherRouter = {
5858
// 作为Main组件的子页面展示并且在左侧菜单显示的路由写在appRouter里
5959
export const appRouter = [
6060
{
61-
path: '/permission',
61+
path: '/administration',
6262
icon: 'settings',
63-
title: 'Permission',
64-
name: 'permission',
63+
title: 'Administration',
64+
name: 'administration',
6565
component: Main,
6666
children: [
6767
{ path: 'tenants', title: 'Tenants', name: 'tenants',permission:'Pages.Tenants', component: () => import('@/views/permission/tenants/tenants.vue') },

Vue/src/views/Main.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
:open-names="openedSubmenuArr"
1313
:menu-list="menuList">
1414
<div slot="top" class="logo-con">
15-
<img v-show="!shrink" src="../images/logo.jpg" key="max-logo" />
16-
<img v-show="shrink" src="../images/logo-min.jpg" key="min-logo" />
15+
<img v-show="!shrink" src="../images/logo.jpg" key="max-logo" class="regular-logo" />
16+
<img v-show="shrink" src="../images/logo-min.jpg" key="min-logo" class="small-logo" />
1717
</div>
1818
</shrinkable-menu>
1919
</div>

Vue/src/views/main.less

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,17 @@
208208
.logo-con{
209209
padding: 8px;
210210
text-align: center;
211-
img{
212-
height: 44px;
211+
212+
img {
213213
width: auto;
214+
215+
216+
&.regular-logo{
217+
height: 44px;
218+
}
219+
220+
&.small-logo{
221+
height: 30px;
222+
}
214223
}
215224
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,6 @@
8686
<text name="UnknownTenantId{0}">Unknown tenantId {0}</text>
8787
<text name="ThisFieldIsRequired">This field is required</text>
8888
<text name="PleaseWait">Please wait...</text>
89+
<text name="Administration">Administration</text>
8990
</texts>
9091
</localizationDictionary>

0 commit comments

Comments
 (0)