Merge remote-tracking branch 'origin/master'

This commit is contained in:
GUjiYN 2024-01-18 20:40:05 +08:00
commit df641a502d
4 changed files with 67 additions and 50 deletions

View File

@ -0,0 +1,3 @@
<template>
这是首页
</template>

View File

@ -1,3 +1,4 @@
<template>
<div style="width: 85vw;height:90vh;position: relative">
<div style="padding:20px 10px;">
@ -7,11 +8,16 @@
<span>用户名称</span>
<Input prefix="ios-contact" placeholder="Enter name" style="width: auto" />
<Button type="primary" shape="circle" icon="ios-search">查询</Button>
<Button type="primary" ghost>新增</Button>
<Button type="primary" ghost @click="modal = true">新增</Button>
<Modal v-model="modal" title="Common Modal dialog box title" @on-ok="ok" @on-cancel="cancel">
<p>Content of dialog</p>
<p>Content of dialog</p>
<p>Content of dialog</p>
</Modal>
</Space>
</div>
<div style="width: 85vw; height: 78vh">
<Table border ref="selection" :columns="columns" :data="data" style="height: 75vh">
<Table border ref="selection" :columns="columns" :data="data" style="height: 72vh" :row-class-name="setRowClassName" >
<template #name="{ row }">
<strong>{{ row.name }}</strong>
</template>
@ -20,8 +26,9 @@
<Button type="error" size="small" @click="remove(index)">删除</Button>
</template>
</Table>
<div style="height: 7vh ;text-align: left;padding-top: 10px">
<div style="height: 6vh ;text-align: left;padding-top: 20px">
<Page :total="40" size="small" show-elevator show-sizer />
</div>
</div>
</div>
@ -35,6 +42,9 @@ export default {
data() {
return {
value: "", //
currentPage: 1, //
pageSize: 10, //
modal: false,
columns: [
{
type: "selection",
@ -108,24 +118,17 @@ export default {
age: 26,
address: "Ottawa No. 2 Lake Park",
date: "2016-10-04"
},
{
name: "Jon Snow",
age: 26,
address: "Ottawa No. 2 Lake Park",
date: "2016-10-04"
},
{
name: "Jon Snow",
age: 26,
address: "Ottawa No. 2 Lake Park",
date: "2016-10-04"
}, {
name: "Jon Snow",
age: 26,
address: "Ottawa No. 2 Lake Park",
date: "2016-10-04"
}
},{
name: "Jon Snow",
age: 26,
address: "Ottawa No. 2 Lake Park",
date: "2016-10-04"
},{
name: "Jon Snow",
age: 26,
address: "Ottawa No. 2 Lake Park",
date: "2016-10-04"
}
]
};
},
@ -133,6 +136,9 @@ export default {
handleSelectAll(status) {
this.$refs.selection.selectAll(status);
},
setRowClassName(row, index) {
return 'custom-row';
},
show(index) {
this.$Modal.info({
title: "编辑用户信息",
@ -141,7 +147,16 @@ export default {
},
remove(index) {
this.data.splice(index, 1);
}
}
}, // ... ()
handlePageChange(newPage) {
this.currentPage = newPage; //
},
},
ok () {
this.$Message.info('Clicked ok');
},
cancel () {
this.$Message.info('Clicked cancel');
},
};
</script>

View File

@ -7,6 +7,11 @@
overflow: hidden;
color:red;
}
Submenu>MenuItem{
text-align: center;
left:-10px;
}
</style>
<template>
@ -15,51 +20,41 @@
<Layout>
<Sider hide-trigger :style="{background: '#fff'}">
<Menu active-name="1-2" theme="light" width="auto" :open-names="['1']">
<!-- <Submenu name="0">-->
<!-- <template #title>-->
<!-- <Icon type="ios-cog"></Icon>-->
<!-- <span>首页</span>-->
<Menu active-name="0-1" theme="light" width="auto" :open-names="['1']">
<!-- </template>-->
<!--&lt;!&ndash; <div style="display: flex;flex-direction: row">&ndash;&gt;-->
<!--&lt;!&ndash; <Icon type="ios-cog"></Icon>&ndash;&gt;-->
<!--&lt;!&ndash; </div>&ndash;&gt;-->
<!-- </Submenu>-->
<MenuItem name="0-1" @click="navigateTo('')" style="left: 50px">首页</MenuItem>
<MenuItem name="0-1" @click="navigateTo('/manager')" style="text-align: center;">首页</MenuItem>
<Submenu name="1">
<template #title>
<template #title style="text-align: center;left:50px">
<Icon type="ios-cog"></Icon>
系统管理
</template>
<MenuItem name="1-1" @click="navigateTo('/manager/UserManage')">用户管理</MenuItem>
<MenuItem name="1-2" @click="navigateTo('/manager/RoleManage')">角色管理</MenuItem>
<MenuItem name="1-3" @click="navigateTo('/manager/PermissionsManage')">权限管理</MenuItem>
<MenuItem name="1-4" @click="navigateTo('/manager/LogManage')">日志管理</MenuItem>
<MenuItem name="1-5" @click="navigateTo('/manager/DailyReportManage')">日报管理</MenuItem>
<MenuItem name="1-6" @click="navigateTo('/manager/MessageManage')" >消息管理</MenuItem>
<MenuItem name="1-1" @click="navigateTo('/manager/UserManage')" style="text-align: center;left:-15px">用户管理</MenuItem>
<MenuItem name="1-2" @click="navigateTo('/manager/RoleManage')" style="text-align: center;left:-15px">角色管理</MenuItem>
<MenuItem name="1-3" @click="navigateTo('/manager/PermissionsManage')" style="text-align: center;left:-15px">权限管理</MenuItem>
<MenuItem name="1-4" @click="navigateTo('/manager/LogManage')" style="text-align: center;left:-15px">日志管理</MenuItem>
<MenuItem name="1-5" @click="navigateTo('/manager/DailyReportManage')" style="text-align: center;left:-15px">日报管理</MenuItem>
<MenuItem name="1-6" @click="navigateTo('/manager/MessageManage')" style="text-align: center;left:-15px">消息管理</MenuItem>
</Submenu>
<Submenu name="2">
<template #title>
<Icon type="ios-keypad"></Icon>
首页管理
</template>
<MenuItem name="2-1" @click="navigateTo('/manager/CarouselManagement')">轮播图管理</MenuItem>
<MenuItem name="2-2" @click="navigateTo('/manager/TeamIntroduction')">团队简介</MenuItem>
<MenuItem name="2-3" @click="navigateTo('/manager/ProjectRecommendations')">项目推荐</MenuItem>
<MenuItem name="2-4" @click="navigateTo('/manager/NewsDisplay')">新闻展示</MenuItem>
<MenuItem name="2-5" @click="navigateTo('/manager/UserRecommendations')">用户推荐</MenuItem>
<MenuItem name="2-1" @click="navigateTo('/manager/CarouselManagement')" style="text-align: center;left:-15px">轮播图管理</MenuItem>
<MenuItem name="2-2" @click="navigateTo('/manager/TeamIntroduction')" style="text-align: center;left:-15px">团队简介</MenuItem>
<MenuItem name="2-3" @click="navigateTo('/manager/ProjectRecommendations')" style="text-align: center;left:-15px">项目推荐</MenuItem>
<MenuItem name="2-4" @click="navigateTo('/manager/NewsDisplay')" style="text-align: center;left:-15px">新闻展示</MenuItem>
<MenuItem name="2-5" @click="navigateTo('/manager/UserRecommendations')" style="text-align: center;left:-15px">用户推荐</MenuItem>
</Submenu>
<Submenu name="3">
<template #title>
<Icon type="ios-analytics"></Icon>
信息管理
</template>
<MenuItem name="3-1" @click="navigateTo('/manager/ProjectInformationManagement')">项目信息管理</MenuItem>
<MenuItem name="3-2" @click="navigateTo('/manager/TeamInformationManagement')">团队信息管理</MenuItem>
<MenuItem name="3-3" @click="navigateTo('/manager/NewsInformationManagement')">新闻信息管理</MenuItem>
<MenuItem name="3-1" @click="navigateTo('/manager/ProjectInformationManagement')" style="text-align: center;left:-15px" >项目信息管理</MenuItem>
<MenuItem name="3-2" @click="navigateTo('/manager/TeamInformationManagement')" style="text-align: center;left:-15px">团队信息管理</MenuItem>
<MenuItem name="3-3" @click="navigateTo('/manager/NewsInformationManagement')" style="text-align: center;left:-15px">新闻信息管理</MenuItem>
</Submenu>
</Menu>
</Sider>

View File

@ -29,6 +29,10 @@ const router = createRouter({
name:'manager',
component:()=>import('../manager/manager.vue'),
children:[{
path:'/manager',
component:()=>import('../manager/Data/Index.vue')
},
{
path:'/manager/UserManage',
component:()=>import('../manager/Data/UserManage.vue')
},