Skip to content

Commit

Permalink
Merge pull request GeekQiaQia#42 from GeekQiaQia/feature/project-board
Browse files Browse the repository at this point in the history
项目看板
  • Loading branch information
Gavin-yh authored Oct 21, 2021
2 parents 6372010 + e9d5f09 commit 297304c
Show file tree
Hide file tree
Showing 6 changed files with 751 additions and 8 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"@types/vue-cropperjs": "^4.1.1",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"@vue/compiler-sfc": "^3.0.5",
"@vue/compiler-sfc": "^3.2.0",
"commitizen": "^4.2.3",
"cz-conventional-changelog": "^3.3.0",
"cz-customizable": "^6.3.0",
Expand All @@ -108,8 +108,8 @@
"lint-staged": "^10.5.4",
"prettier": "^2.2.1",
"stylus": "^0.54.8",
"typescript": "^4.1.3",
"vue-tsc": "^0.0.24"
"typescript": "^4.3.2",
"vue-tsc": "^0.2.2"
},
"config": {
"commitizen": {
Expand Down
95 changes: 94 additions & 1 deletion src/mock/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,98 @@ const getSwiperInfo=()=>({
message:'成功'
})

const getProjectInfo = {
status: 0,
message:'成功',
data:[{
projectId: '1',
projectName: '后台管理系统',
principal: '张三',
timeConsuming: '20小时',
status: '开发中',
taskList: [{
taskName: '导航栏开发',
developTime: '3工时',
developMember: '李四',
taskStatus: 1 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '内容页开发',
developTime: '8工时',
developMember: '王五',
taskStatus: 2 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 3 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 3 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 4 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 5 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
}]
},{
projectId: '2',
projectName: '学生管理系统',
principal: '老王',
timeConsuming: '27小时',
status: '开发中',
taskList: [{
taskName: '导航栏开发',
developTime: '10工时',
developMember: '李四',
taskStatus: 1 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '内容页开发',
developTime: '8工时',
developMember: '王五',
taskStatus: 2 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 2 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 4 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
}]
},{
projectId: '3',
projectName: '成绩管理系统',
principal: '王五',
timeConsuming: '40小时',
status: '开发中',
taskList: [{
taskName: '导航栏开发',
developTime: '13工时',
developMember: '李四',
taskStatus: 1 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '内容页开发',
developTime: '18工时',
developMember: '王五',
taskStatus: 2 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
},{
taskName: '侧边栏开发',
developTime: '9工时',
developMember: '赵六',
taskStatus: 3 // 1: 准备阶段,2: 开发中, 3: 开发完成, 4:测试阶段,5: 待发布
}]
}],
}

Mock.mock('/api/auth/user/login','post',(option) => {
const {email,password} = JSON.parse(option.body);
console.log(email,password);
Expand Down Expand Up @@ -118,7 +210,7 @@ Mock.mock('/api/auth/user/register','post',() => ({
return {
status: 0,
data:{
authedRoutes:['/dashboard','/guide', '/copy','/zip','/role','/menu','/excel','/table','/form','/qrcode','/dragable','/editor','/upload','/cropper','/personal']
authedRoutes:['/dashboard','/guide', '/copy','/zip','/role','/menu','/excel','/table','/form','/qrcode','/dragable','/editor','/upload','/cropper','/personal', '/projectboard']
},
success: true,
message:'成功'
Expand Down Expand Up @@ -300,3 +392,4 @@ Mock.mock('/api/auth/roles','get',genRoles);
Mock.mock('/api/home/swiperInfo','get',getSwiperInfo);


Mock.mock('/api/project/list', 'get', getProjectInfo);
30 changes: 26 additions & 4 deletions src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,6 @@ export const asyncRoutes:Array<RouteRecordRaw> = [
'/en-US': 'PersonalCenter'
},
icon: 'el-icon-user-solid',

},
},
{
Expand All @@ -568,13 +567,36 @@ export const asyncRoutes:Array<RouteRecordRaw> = [
'/en-US': 'PersonalSetting'
},
icon: 'el-icon-user-solid',

},
},
],
},


{
path: '/projectboard',
component: layout,
redirect: '/projectboard/manage',
meta: {
title:{
'/zh-CN': '项目看板',
'/en-US': 'Project Board'
},
icon: 'el-icon-folder-opened',
},
children: [
{
path: '/projectboard/manage',
name: 'roleManage',
component: () => import(/* webpackChunkName: "projectBoard" */ '@/views/projectBoard/index.vue'),
meta: {
title:{
'/zh-CN': '项目看板',
'/en-US': 'Project Board'
},
icon: 'el-icon-folder-opened',
},
},
]
},
];

const router = createRouter({
Expand Down
Loading

0 comments on commit 297304c

Please sign in to comment.