Skip to content

前端外观调整 #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
4linuxfun merged 5 commits into from
Feb 4, 2024
Merged

前端外观调整 #108

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a6b351
前端：微调顶部栏
4linuxfun Feb 2, 2024
aa85ccc
前端：美化菜单
4linuxfun Feb 2, 2024
03f96e2
前端：增加侧边栏折叠显示功能
4linuxfun Feb 4, 2024
74360b6
前端：部分调整
4linuxfun Feb 4, 2024
8f1227a
前端：调整折叠icon显示
4linuxfun Feb 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
前端：部分调整
  • Loading branch information
@4linuxfun
4linuxfun committed Feb 4, 2024
commit 74360b61fbf90c55711a2ed45ca79cd1828d82cf
2 changes: 1 addition & 1 deletion www/src/components/MenuList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@close="handleClose">
<div style="height: 50px;background-color: #1c1919;">
<!-- 菜单折叠只显示图标-->
<div class="header-font" v-if="!collapseStore.collapse">FastAdmin管理平台1212121</div>
<div class="header-font" v-if="!collapseStore.collapse">FastAdmin管理平台</div>
</div>
<el-menu-item index="/dashboard">首页</el-menu-item>
<template v-for="item in menuList" :key="item.name">
Expand Down
8 changes: 2 additions & 6 deletions www/src/views/Layout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<el-header style="--el-header-padding: 0 10px" height="50px">
<header-content></header-content>
</el-header>
<el-main style="padding: 0px">
<el-main style="padding: 0">
<el-tabs style="border-bottom: 0" v-model="currentTab" type="border-card" closable @tab-click="tabClick"
@tab-remove="tabRemove">
<el-tab-pane v-for="tab in allTabs" :key="tab.name" :label="tab.name" :name="tab.name">
</el-tab-pane>
</el-tabs>

<div class="main_style">
<div style="padding: 10px 20px">
<router-view v-slot="{Component}">
<keep-alive :include="cacheTabs">
<component :is="Component"/>
Expand Down Expand Up @@ -47,10 +47,6 @@
</script>

<style>
.main_style {
margin-top: 10px;
margin-left: 5px;
}

.el-tabs--border-card > .el-tabs__content {
padding: 0;
Expand Down
5 changes: 3 additions & 2 deletions www/src/views/system/menus/MenuForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
</el-button>
</template>
</el-input>
<el-alert v-if="selectData.type ==='page'" title="为了防止侧边栏折叠显示效果，一级菜单需要添加图标！" type="warning"/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input-number v-model="selectData.sort" :step="0.1"/>
Expand Down Expand Up @@ -67,7 +68,7 @@
import useMenu from '@/composables/useMenu'
import AutoDict from '@/components/AutoDict'

const props = defineProps(['form', ])
const props = defineProps(['form',])
const emit = defineEmits(['update:form'])
const {form} = toRefs(props)
const dialogVisible = ref(false)
Expand Down Expand Up @@ -107,7 +108,7 @@
Traffic: ['Location', 'LocationInformation', 'DeleteLocation', 'Coordinate', 'Bicycle', 'OfficeBuilding', 'School',
'Guide', 'AddLocation', 'MapLocation', 'Place', 'LocationFilled', 'Van']
}


</script>

Expand Down