diff --git a/components.d.ts b/components.d.ts index 7e176cd..f44ce52 100644 --- a/components.d.ts +++ b/components.d.ts @@ -20,7 +20,6 @@ declare module '@vue/runtime-core' { ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] - ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] @@ -38,24 +37,15 @@ declare module '@vue/runtime-core' { ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElProgress: typeof import('element-plus/es')['ElProgress'] - ElRadio: typeof import('element-plus/es')['ElRadio'] - ElRadioButton: typeof import('element-plus/es')['ElRadioButton'] - ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] - ElRate: typeof import('element-plus/es')['ElRate'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSlider: typeof import('element-plus/es')['ElSlider'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] - ElTabPane: typeof import('element-plus/es')['ElTabPane'] - ElTabs: typeof import('element-plus/es')['ElTabs'] ElTag: typeof import('element-plus/es')['ElTag'] ElTooltip: typeof import('element-plus/es')['ElTooltip'] - ElTree: typeof import('element-plus/es')['ElTree'] - ElUpload: typeof import('element-plus/es')['ElUpload'] ErrorLog: typeof import('./src/components/ErrorLog/index.vue')['default'] GithubCorner: typeof import('./src/components/GithubCorner/index.vue')['default'] Hamburger: typeof import('./src/components/Hamburger/index.vue')['default'] @@ -82,7 +72,4 @@ declare module '@vue/runtime-core' { UploadExcel: typeof import('./src/components/UploadExcel/index.vue')['default'] VueCountTo: typeof import('./src/components/vue-count-to/vue-countTo.vue')['default'] } - export interface ComponentCustomProperties { - vLoading: typeof import('element-plus/es')['ElLoadingDirective'] - } } diff --git a/src/api/charge.js b/src/api/charge.js new file mode 100644 index 0000000..4032ace --- /dev/null +++ b/src/api/charge.js @@ -0,0 +1,24 @@ +import axios from "axios"; + +function getCurrentTimestamp() { + return new Date().getTime(); +} + +const api = 'http://nbxt.oa.x-lf.cn' + +/** + * 获取我参与的项目列表 + * + * @param token 访问令牌 + * @returns {Promise> | *} + */ +const getChargeProjectList = (token)=> { + return axios({ + method: 'get', + url: `${api}/project/participate/get`, + headers: { + 'Authorization': `Bearer ${token}`, + 'Timestamp':getCurrentTimestamp() + } + }) +} \ No newline at end of file diff --git a/src/api/manage.js b/src/api/manage.js index 49f238c..d89dfa0 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -48,14 +48,14 @@ export const getproject = (projectId, token) => { /** - * 获取项目信息 - * @param projectId 项目id + * 获取我管理页面的项目列表(接口有问题) + * * @param token 访问令牌 * @returns {Promise> | *} */ -export const searchModel = (projectId ,token) => { +export const getManageList = (token) => { return axios({ - url: api +"/module/get?projectId=" + projectId , + url: api +"/project/child/get" , method: "get", headers: { 'Authorization': 'Bearer ' + token, @@ -69,3 +69,71 @@ export const searchModel = (projectId ,token) => { }) } +// 我管理的所有接口 + + +/** + * 获取我管理的页面的搜索 + * + * @param projectId 项目id + * @param token 访问令牌 + * @returns {Promise> | *} + */ +export const getManageListById = (projectId, token) => { + return axios({ + url: api +'/project/get/' + projectId, + method: "get", + headers: { + 'Authorization': 'Bearer ' + token, + 'Timestamp': getCurrentTimestamp() + } + + }) + +} +/** + * 获取我管理的页面的项目列表 + * + * @param projectId 项目id + * @param token 访问令牌 + * @returns {Promise> | *} + */ +export const getManageProjectList = (token) => { + return axios({ + url: api +'/project/child/get' , + method: "get", + headers: { + 'Authorization': 'Bearer ' + token, + 'Timestamp': getCurrentTimestamp() + } + + }) + +} + + + + + + +/** + * 获取我管理的页面的子模块项目列表(接口没数据) + * + * @param token 访问令牌 + * @returns {Promise> | *} + */ +export const getProjectList = (token) => { + return axios({ + url: api +"/project/module/get" , + method: "get", + headers: { + 'Authorization': 'Bearer ' + token, + 'Timestamp': getCurrentTimestamp() + } + + + }) +} + + + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 88c2bf4..022fa79 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,7 +2,7 @@
- +
diff --git a/src/router/index.ts b/src/router/index.ts index 0796433..666ab92 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -11,6 +11,7 @@ const Layout = ():RouteComponent => import('@/layout/index.vue'); // import chartsRouter from './modules/charts'; // import nestedRouter from './modules/nested'; // import tableRouter from './modules/table'; + import manageRouter from './modules/manage'; /** * constantRoutes @@ -113,110 +114,10 @@ export const constantRoutes:RouteRecordRaw[] = [ * 注意：hidden、alwaysShow 属性配置移动到了meta中！！！ */ export const asyncRoutes:RouteRecordRaw[] = [ - // { - // path: '/permission', - // component: Layout, - // redirect: '/permission/page', - // name: 'Permission', - // meta: { - // alwaysShow: true, // will always show the root menu - // title: 'Permission', - // icon: 'lock', - // roles: ['admin', 'editor','teacher_user'] // you can set roles in root nav - // }, - // children: [ - // { - // path: 'page', - // component: () => import('@/views/permission/page.vue'), - // name: 'PagePermission', - // meta: { - // title: 'Page Permission', - // roles: ['admin','teacher_user'] // or you can only set roles in sub nav - // } - // }, - // { - // path: 'directive', - // component: () => import('@/views/permission/directive.vue'), - // name: 'DirectivePermission', - // meta: { - // title: 'Directive Permission' - // // if do not set roles, means: this page does not require permission - // } - // }, - // { - // path: 'role', - // component: () => import('@/views/permission/role.vue'), - // name: 'RolePermission', - // meta: { - // title: 'Role Permission', - // roles: ['admin','teacher'] - // } - // } - // ] - // }, - // 个人项目 - { - path: '/myself', - component: Layout, - redirect: 'noRedirect', - meta: { - alwaysShow: false, // 始终显示根菜单 - title: '个人项目', - icon: 'nested', - roles: ['admin', 'teacher_user'] - }, - children: [ - { - path: 'participate', - component: () => import('@/views/personal/project/participate.vue'), - name: 'participate', - meta: { title: '我负责的', icon: 'user', affix: true } - }, - //我管理的以及子页面 - { - path: 'manage', - component: () => import('@/views/personal/project/manage.vue'), - name: 'Manage', - meta: { title: '我管理的', icon: 'user', affix: true, }, - - }, - { - path: 'childSysManage', - component: () => import('@/views/personal/project/childSystem/manage.vue'), - name: 'ChildSysManage', - meta: { title: '子系统', breadcrumb: true , hidden: true }, - - }, - { - path: 'childModManage', - component: () => import('@/views/personal/project/childModel/manage.vue'), - name: 'ChildModManage', - meta: { title: '子模块', breadcrumb: true , hidden: true } - }, - //我参与的以及子界面 - { - path: 'charge', - component: () => import('@/views/personal/project/charge.vue'), - name: 'Charge', - meta: { title: '我参与的', icon: 'user', affix: true } - }, - { - path: 'childSysCharge', - component: () => import('@/views/personal/project/childSystem/manage.vue'), - name: 'ChildSysCharge', - meta: { title: '子系统', breadcrumb: true , hidden: true }, - - }, - { - path: 'childModCharge', - component: () => import('@/views/personal/project/childModel/manage.vue'), - name: 'ChildModCharge', - meta: { title: '子模块', breadcrumb: true , hidden: true } - }, - ] - } - , + + + manageRouter, // { diff --git a/src/router/modules/manage.ts b/src/router/modules/manage.ts new file mode 100644 index 0000000..ace0dc2 --- /dev/null +++ b/src/router/modules/manage.ts @@ -0,0 +1,81 @@ + + +const Layout = () => import('@/layout/index.vue') + +const manageRouter = { + path: '/myslef', + component: Layout, + + + meta: { + alwaysShow: false, // 始终显示根菜单 + title: '个人项目', + icon: 'nested', + roles: ['admin', 'teacher_user'] + }, + children: [ + { + path: 'participate', + component: () => import('@/views/personal/project/participate.vue'), + name: 'participate', + meta: { title: '我负责的', icon: 'user', affix: true } + }, + //我管理的以及子页面 + + { + path: 'manage', + component: () => import('@/views/personal/project/manage.vue'), + name: 'Manage', + meta: { title: '我管理的', icon: 'user', affix: true, }, + + }, + { + path: 'childSysManage', + component: () => import('@/views/personal/project/childSystem/manage.vue'), + name: 'ChildSysManage', + meta: { title: '我管理的 / 子系统', breadcrumb: true , hidden: true }, + + }, + { + path: 'childModManage', + component: () => import('@/views/personal/project/childModel/manage.vue'), + name: 'ChildModManage', + meta: { title: '我管理的 / 子系统 / 子模块', breadcrumb: true , hidden: true } + }, + { + path:'manageDetail', + component:()=>import('@/views/personal/project/detail/manage.vue'), + name: 'ManageDetail', + meta: { title: '我管理的 / 子系统 / 子模块 / 详情', breadcrumb: true , hidden: true } + }, + //我参与的以及子界面 + { + path: 'charge', + component: () => import('@/views/personal/project/charge.vue'), + name: 'Charge', + meta: { title: '我参与的', icon: 'user', affix: true } + }, + { + path: 'childSysCharge', + component: () => import('@/views/personal/project/childSystem/charge.vue'), + name: 'ChildSysCharge', + meta: { title: '我参与的 / 子系统', breadcrumb: true , hidden: true ,affix:false}, + + }, + { + path: 'childModCharge', + component: () => import('@/views/personal/project/childModel/charge.vue'), + name: 'ChildModCharge', + meta: { title: '我参与的 / 子系统 / 子模块', breadcrumb: true , hidden: true } + }, + { + path: 'chargeDetail', + component:()=>import('@/views/personal/project/detail/charge.vue'), + name: 'ChargeDetail', + meta: { title: '我参与的 / 子系统 / 子模块 /详情', breadcrumb: true , hidden: true } + } + ] + } + + +export default manageRouter \ No newline at end of file diff --git a/src/views/personal/project/charge.vue b/src/views/personal/project/charge.vue index 85827ce..5d9af37 100644 --- a/src/views/personal/project/charge.vue +++ b/src/views/personal/project/charge.vue @@ -1,136 +1,173 @@ - - - \ No newline at end of file +}) +.catch(err => { + console.log(err); + }); + + + + \ No newline at end of file diff --git a/src/views/personal/project/childSystem/manage.vue b/src/views/personal/project/childSystem/manage.vue index e177ac1..73637c9 100644 --- a/src/views/personal/project/childSystem/manage.vue +++ b/src/views/personal/project/childSystem/manage.vue @@ -41,7 +41,9 @@ - + + +
@@ -49,8 +51,8 @@ import { ref } from 'vue'; import { ElTable } from 'element-plus'; import { useRouter } from 'vue-router'; -import { searchModel } from '@/api/manage.js'; -import { getToken } from '@/utils/auth'; +// import { searchModel } from '@/api/manage.js'; +// import { getToken } from '@/utils/auth'; //跳转到子模块 const router = useRouter(); @@ -84,36 +86,50 @@ const handleSelectionChange = (val: User[]) => { //搜索子系统 //获取数据 -const searchSys = searchModel(1, getToken()); -console.log(searchSys); -const tableData = ref([]); +// console.log(searchSys); + +const tableData = ref([ + { + id: 1, + cycle: 1, + description: '子系统1', + isDelete: 0, + isFinish: 1, + name: '子系统1', + principalId: 1, + projectId: 1, + status: true, + type: 1, + workLoad: 1 + } +]); //处理数据 -searchSys.then(res => { - const data = res.data.data; - console.log(data); +// searchSys.then(res => { +// const data = res.data.data; +// console.log(data); - if (data) { - tableData.value = data.map(item =>{ - const addproject: User = { - id: item.id, - cycle: item.cycle, - description: item.description, - isDelete: item.isDelete, - isFinish: item.isFinish, - name: item.name, - principalId: item.principalId, - projectId: item.projectId, - status: item.status, - type: item.type, - workLoad: item.workLoad - }; +// if (data) { +// tableData.value = data.map(item =>{ +// const addproject: User = { +// id: item.id, +// cycle: item.cycle, +// description: item.description, +// isDelete: item.isDelete, +// isFinish: item.isFinish, +// name: item.name, +// principalId: item.principalId, +// projectId: item.projectId, +// status: item.status, +// type: item.type, +// workLoad: item.workLoad +// }; - tableData.value.push(addproject); +// tableData.value.push(addproject); - }) +// }) @@ -121,16 +137,16 @@ searchSys.then(res => { - }else{ - console.log("没有数据"); +// }else{ +// console.log("没有数据"); - } +// } - console.log(tableData.value); +// console.log(tableData.value); -}).catch(err => { - console.log(err); -}); +// }).catch(err => { +// console.log(err); +// }); diff --git a/src/views/personal/project/childmodel/charge.vue b/src/views/personal/project/childmodel/charge.vue index e69de29..6365ec6 100644 --- a/src/views/personal/project/childmodel/charge.vue +++ b/src/views/personal/project/childmodel/charge.vue @@ -0,0 +1,143 @@ + + + + \ No newline at end of file diff --git a/src/views/personal/project/childmodel/manage.vue b/src/views/personal/project/childmodel/manage.vue index 47a23ae..d66b716 100644 --- a/src/views/personal/project/childmodel/manage.vue +++ b/src/views/personal/project/childmodel/manage.vue @@ -51,7 +51,7 @@ 查看详情 @@ -65,7 +65,7 @@ style="display: flex;flex-direction: row;justify-content: center;margin-top:5vh" /> - +
@@ -73,8 +73,16 @@ import { ref } from 'vue'; import { ElTable } from 'element-plus'; + import { useRouter } from 'vue-router'; + const router = useRouter(); + + // 路由跳转 + const toDetail = () => { + router.push({ name: 'ManageDetail' }); // 跳转到子系统详情页面 + }; + interface User { date: string name: string diff --git a/src/views/personal/project/detail/charge.vue b/src/views/personal/project/detail/charge.vue new file mode 100644 index 0000000..a0b911e --- /dev/null +++ b/src/views/personal/project/detail/charge.vue @@ -0,0 +1,101 @@ + + + + \ No newline at end of file diff --git a/src/views/personal/project/detail/manage.vue b/src/views/personal/project/detail/manage.vue new file mode 100644 index 0000000..32976ff --- /dev/null +++ b/src/views/personal/project/detail/manage.vue @@ -0,0 +1,103 @@ + + + + \ No newline at end of file diff --git a/src/views/personal/project/manage.vue b/src/views/personal/project/manage.vue index 6b8f7f6..bb3fd1b 100644 --- a/src/views/personal/project/manage.vue +++ b/src/views/personal/project/manage.vue @@ -5,14 +5,14 @@
名称 - +
状态 - +
- 查询 + 查询 重置
@@ -25,52 +25,102 @@ @selection-change="handleSelectionChange"> - + - - + + + + 接口文档 + 需求文档 + + + + + + + + 查看详情 - - + + + +