diff --git a/src/api/index.js b/src/api/index.js index 919f540b..45195084 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-07 17:06:45 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-20 17:45:37 + * @LastEditTime: 2022-11-20 18:18:11 * @FilePath: /fe-manage/src/api/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -69,5 +69,8 @@ export const getDiscussDetail = (obj) => http.post('/discuss/getDiscussDetail', //获取模版列表 export const getTemplate = (obj) => http.post('/admin/project/template/list', obj) +//获取模版详细信息 +export const getTemplateDetail = (obj) => http.get('/admin/project/template/detail', { params: obj }) + //获取项目统计 export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } }) \ No newline at end of file diff --git a/src/api/index1.js b/src/api/index1.js index 0b26f574..87fa03e2 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-20 15:39:38 + * @LastEditTime: 2022-11-21 11:51:11 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -33,6 +33,7 @@ import qs from 'qs'; * （request的Header:'Content-Type'= 'application/x-www-form-urlencoded'） * let data = {"code":"1234","name":"yyyy"}; * axios.post(`${this.$url}/test/testRequest`,qs.stringify({data})).then() + * * * 3.'Content-Type'= 'application/json，传参格式为 raw (JSON格式)。 * （全局请求头:'Content-Type'= 'application/x-www-form-urlencoded'） @@ -55,8 +56,7 @@ export const getLearnPath = (obj) => http.post('/admin/router/list', obj); export const handleLearnPath = (obj) => http.post('/admin/router/handle', obj); //获取路径图统计数据 export const getLearnCount = (routerId) => http.get('/admin/router/getCount', { params: { routerId: routerId } }) -//获取关卡 -export const getChapter = (obj) => http.post('/admin/router/detail', { params: obj }); + //新建或编辑关卡 export const editChapter = (obj) => http.post('/admin/router/editChapter', obj); @@ -89,7 +89,8 @@ export const billboard = (obj) => http.post('/admin/project/billboard', obj); // 获取组织结构树 export const orgtree = () => http.get('/org/tree'); - +//获取积分列表 +export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``) // 测试方法 // import * as api from '../../api/index' diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 5f84d414..87f64f4b 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -44,7 +44,7 @@ circle: selectedKeys[0] === 'sub10-1' ? false : true, }" > - 待审核课程 + 待审核课程 - 已审核课程 + 已审核课程 - 待审核项目 + 待审核项目 - 已审核项目 + 已审核项目 @@ -82,7 +82,7 @@ src="../assets/images/navleft/studyPath.png" /> - 学习路径 + 学习路径 @@ -102,7 +102,7 @@ circle: selectedKeys[0] === 'sub2-1' ? false : true, }" > - 项目 + 项目 - 模板库 + 模板库 @@ -132,7 +132,7 @@ circle: selectedKeys[0] === 'sub3-1' ? false : true, }" > - 课件管理 + 课件管理 - 课程管理 + 课程管理 @@ -162,7 +162,7 @@ src="../assets/images/navleft/survey.png" /> - 评估管理 + 评估管理 @@ -193,7 +193,7 @@ /> - 证书中心 + 证书中心
@@ -202,7 +202,7 @@ src="../assets/images/navleft/system.png" />
- 系统管理 + 系统管理 @@ -220,15 +220,15 @@ @click="handleClick" > - 学习 + 学习 - 项目 + 项目 - 课程 + 课程 @@ -295,104 +295,104 @@ export default { keysList: [ { - href: "/coursereviewedn", + href: "/manage/coursereviewedn", openKeys: "sub10", selectedKeys: "sub10-1", pagename: "待审核课程", }, { - href: "/coursereviewed", + href: "/manage/coursereviewed", openKeys: "sub10", selectedKeys: "sub10-2", pagename: "已审核课程", }, { - href: "/projectreviewedn", + href: "/manage/projectreviewedn", openKeys: "sub10", selectedKeys: "sub10-3", pagename: "待审核项目", }, { - href: "/projectrrviewed", + href: "/manage/projectrrviewed", openKeys: "sub10", selectedKeys: "sub10-4", pagename: "已审核项目", }, { - href: "/learningpath", + href: "/manage/learningpath", openKeys: "sub1", selectedKeys: "sub1", pagename: "学习路径", }, { - href: "/leveladd", + href: "/manage/leveladd", openKeys: "sub1", selectedKeys: "sub1", pagename: "关卡", }, { - href: "/levelcheck", + href: "/manage/levelcheck", openKeys: "sub1", selectedKeys: "sub1", pagename: "查看", }, { - href: "/leveladddetail", + href: "/manage/leveladddetail", openKeys: "sub1", selectedKeys: "sub1", pagename: "创建关卡", }, { - href: "/projectmanage", + href: "/manage/projectmanage", openKeys: "sub2", selectedKeys: "sub2-1", pagename: "项目", }, { - href: "/projectadd", + href: "/manage/projectadd", openKeys: "sub2", selectedKeys: "sub2-1", pagename: "创建项目", }, { - href: "/templatelibrary", + href: "/manage/templatelibrary", openKeys: "sub2", selectedKeys: "sub2-2", pagename: "模板库", }, { - href: "/libraryadd", + href: "/manage/libraryadd", openKeys: "sub2", selectedKeys: "sub2-2", pagename: "查看", }, { - href: "/coursemanage", + href: "/manage/coursemanage", openKeys: "sub3", selectedKeys: "sub3-1", pagename: "课件管理", }, { - href: "/coursewaremanage", + href: "/manage/coursewaremanage", openKeys: "sub3", selectedKeys: "sub3-2", pagename: "课程管理", }, { - href: "/certificatecenter", + href: "/manage/certificatecenter", openKeys: "sub8", selectedKeys: "sub8", pagename: "证书中心", }, { - href: "/systemmanage", + href: "/manage/systemmanage", openKeys: "sub9", selectedKeys: "sub9", pagename: "系统管理", }, { - href: "/researchmanage", + href: "/manage/researchmanage", openKeys: "sub5", selectedKeys: "sub5", pagename: "评估管理", @@ -434,7 +434,7 @@ export default { watch( () => route.fullPath, (n) => { - console.log("监听路由", n, store.state.openpages); + console.log("监听路由", n, store.state.openpages, state.keysList); // console.log("new:" + n.toLowerCase() + ",old:" + o); let arr = state.keysList; arr.map((value) => { diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index f8c24091..96fd7655 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -1,25 +1,40 @@ diff --git a/src/router/config.js b/src/router/config.js index 0265e054..27b6f975 100644 --- a/src/router/config.js +++ b/src/router/config.js @@ -1,16 +1,25 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-09 09:26:26 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-21 15:06:51 + * @FilePath: /fe-manage/src/router/config.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ const routes = []; const context = require.context("@/views", true, /\.vue$/, "lazy"); context.keys().forEach((path) => { // console.log('path', path) const componentName = path.replace(/.*\/([^\\.\\/]*)\.vue$/, "$1"); routes.push({ - path: `/${componentName.toLowerCase()}/:id?`, + path: `/manage/${componentName.toLowerCase()}/:id?`, name: componentName, component: () => context(path), meta: { isLink: true, }, }); + // console.log('routes', routes) }); export default routes; diff --git a/src/router/index.js b/src/router/index.js index c2134c99..06d1632f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,26 +2,24 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-09 09:26:26 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-16 09:56:16 + * @LastEditTime: 2022-11-21 14:55:13 * @FilePath: /fe-manage/src/router/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import { createRouter,createWebHistory } from 'vue-router'; +import { createRouter, createWebHistory } from 'vue-router'; import routesConfig from './config'; -console.log('routesConfig', routesConfig) - const routes = [ { path: '/', name: '首页', - redirect: '/learningpath' + redirect: '/manage/learningpath' }, ...routesConfig ] - const router = createRouter({ history: createWebHistory(), - routes -}) + base: '/manage', + routes, +}) export default router \ No newline at end of file diff --git a/src/store/index.js b/src/store/index.js index fbdb9ea0..2e92cedb 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-09 09:26:26 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-20 16:06:52 + * @LastEditTime: 2022-11-21 14:50:47 * @FilePath: /fe-manage/src/store/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -15,7 +15,7 @@ export default createStore({ : [ { pagename: "学习路径", - href: "/learningpath", + href: "/manage/learningpath", active: true, }, ], diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index ec3bd787..72b3903d 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -785,14 +785,14 @@ export default { console.log(`selected ${key}`, classifyList5.value); //获取模版信息 let obj = { - projectId: Number(key), + projectTemplateId: Number(key), }; api - .getProjectDetail(obj) + .getTemplateDetail(obj) .then((res) => { - console.log("获取项目详情", res); + console.log("获取模版详情", res); if (res.status === 200) { - let info = res.data.data.projectInfo; + let info = res.data.data.projectTemplateInfo; console.log(info); // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 * projectName.value = info.name; @@ -852,7 +852,7 @@ export default { // projectId:id?id:'' }; api - .getProjectList(obj) + .getTemplate(obj) .then((res) => { console.log("获取模版列表", res); state.totalPages = Number(res.data.data.pages); @@ -861,7 +861,7 @@ export default { let array = classifyList5.value; arr.map((value) => { let obj = { - value: value.projectId, + value: value.projectTemplateId, label: value.name, }; array.push(obj); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index b1172c7f..29c15a0a 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1047,6 +1047,8 @@ import * as apimove from "../../api/indexMovetask"; import draggable from "vuedraggable"; import { storage } from "../../api/storage"; import UnlockMode from "../../components/drawers/UnlockMode.vue"; +// import * as api1 from "../../api/index1"; + const drawercolumns = [ { title: "项目名称",