From f18909673de49dbb99f60a34a322f9aa0d9590ac Mon Sep 17 00:00:00 2001 From: lixg Date: Mon, 21 Nov 2022 17:48:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 5 +- src/api/index1.js | 6 +- src/components/BreadCrumb.vue | 101 ++++++++---------- src/components/NavLeft.vue | 64 +++++------ src/components/OpenPages.vue | 4 +- src/components/vote/CreateVote.vue | 2 +- src/router/config.js | 4 +- src/router/index.js | 7 +- src/store/index.js | 4 +- src/views/learningpath/LearningPath.vue | 4 +- src/views/learningpath/LevelAdd.vue | 10 +- src/views/learningpath/LevelAddDetail.vue | 4 +- src/views/learningpath/LevelCheck.vue | 2 +- src/views/projectcenter/ClassAdd.vue | 10 +- src/views/projectcenter/LibraryAdd.vue | 6 +- src/views/projectcenter/ProjectAdd.vue | 112 ++++++++++++-------- src/views/projectcenter/ProjectManage.vue | 36 +++---- src/views/projectcenter/SonProject.vue | 10 +- src/views/projectcenter/TaskAdd.vue | 2 +- src/views/projectcenter/TaskPage.vue | 104 +++++++++--------- src/views/projectcenter/TemplateLibrary.vue | 4 +- src/views/projectcenter/templateAdd.vue | 8 +- src/views/research/ManagePage.vue | 4 +- src/views/research/ResearchAdd copy.vue | 4 +- src/views/research/ResearchAdd.vue | 10 +- src/views/research/ResearchManage.vue | 4 +- src/views/system/SystemManage.vue | 2 +- 27 files changed, 280 insertions(+), 253 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 45195084..c62e1b47 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 18:18:11 + * @LastEditTime: 2022-11-21 16:39:00 * @FilePath: /fe-manage/src/api/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -73,4 +73,5 @@ export const getTemplate = (obj) => http.post('/admin/project/template/list', ob 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 +export const getProjectCount = (projectId) => http.get('/admin/project/projectCount', { params: { projectId: projectId } }) + diff --git a/src/api/index1.js b/src/api/index1.js index 87fa03e2..6e5402e5 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-21 11:51:11 + * @LastEditTime: 2022-11-21 16:39:08 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -85,10 +85,12 @@ export const scoreRank = (obj) => http.post('/admin/project/scoreRank', obj); export const billboard = (obj) => http.post('/admin/project/billboard', obj); //项目基础信息----------------------------------- - +//获取字典信息 +export const getDict = (obj) => http.post('/dict/getList', obj) // 获取组织结构树 export const orgtree = () => http.get('/org/tree'); + //获取积分列表 export const noticeList = (projectId) => http.post(`http://localhost:8080/api/admin/project/noticeList?projectId=` + projectId + ``) diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 93fa3e24..c4cb108c 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -34,8 +34,8 @@ export default { console.log("new:" + n + ",old:" + o); if ( - n.indexOf("/manage/learningpath") !== -1 || - n.indexOf("/manage/LearningPath") !== -1 + n.indexOf("/learningpath") !== -1 || + n.indexOf("/LearningPath") !== -1 ) { state.list = [ { @@ -45,14 +45,11 @@ export default { }, ]; } - if ( - n.indexOf("/manage/leveladd") !== -1 || - n.indexOf("/manage/LevelAdd") !== -1 - ) { + if (n.indexOf("/leveladd") !== -1 || n.indexOf("/LevelAdd") !== -1) { state.list = [ { name: "学习路径", - href: "/manage/learningpath", + href: "/learningpath", }, { name: "管理", @@ -60,17 +57,17 @@ export default { ]; } if ( - n.indexOf("/manage/leveladddetail") !== -1 || - n.indexOf("/manage/LevelAddDetail") !== -1 + n.indexOf("/leveladddetail") !== -1 || + n.indexOf("/LevelAddDetail") !== -1 ) { state.list = [ { name: "学习路径", - href: "/manage/learningpath", + href: "/learningpath", }, { name: "管理", - href: "/manage/leveladd", + href: "/leveladd", }, { name: "创建关卡", @@ -78,17 +75,17 @@ export default { ]; } if ( - n.indexOf("/manage/levelcheck") !== -1 || - n.indexOf("/manage/LevelCheck") !== -1 + n.indexOf("/levelcheck") !== -1 || + n.indexOf("/LevelCheck") !== -1 ) { state.list = [ { name: "学习路径", - href: "/manage/learningpath", + href: "/learningpath", }, { name: "管理", - href: "/manage/leveladd", + href: "/leveladd", }, { name: "查看", @@ -96,8 +93,8 @@ export default { ]; } if ( - n.indexOf("/manage/projectmanage") !== -1 || - n.indexOf("/manage/ProjectManage") !== -1 + n.indexOf("/projectmanage") !== -1 || + n.indexOf("/ProjectManage") !== -1 ) { state.list = [ { @@ -112,23 +109,20 @@ export default { ]; } if ( - n.indexOf("/manage/projectadd") !== -1 || - n.indexOf("/manage/ProjectAdd") !== -1 + n.indexOf("/projectadd") !== -1 || + n.indexOf("/ProjectAdd") !== -1 ) { state.list = [ { name: "项目", - href: "/manage/projectmanage", + href: "/projectmanage", }, { name: "创建项目", }, ]; } - if ( - n.indexOf("/manage/taskpage") !== -1 || - n.indexOf("/manage/TaskPage") !== -1 - ) { + if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) { state.list = [ { name: "项目", @@ -139,10 +133,7 @@ export default { }, ]; } - if ( - n.indexOf("/manage/taskadd") !== -1 || - n.indexOf("/manage/TaskAdd") !== -1 - ) { + if (n.indexOf("/taskadd") !== -1 || n.indexOf("/TaskAdd") !== -1) { state.list = [ { name: "项目", @@ -160,8 +151,8 @@ export default { ]; } if ( - n.indexOf("/manage/templatelibrary") !== -1 || - n.indexOf("/manage/TemplateLibrary") !== -1 + n.indexOf("/templatelibrary") !== -1 || + n.indexOf("/TemplateLibrary") !== -1 ) { state.list = [ { @@ -173,8 +164,8 @@ export default { ]; } if ( - n.indexOf("/manage/libraryadd") !== -1 || - n.indexOf("/manage/LibraryAdd") !== -1 + n.indexOf("/libraryadd") !== -1 || + n.indexOf("/LibraryAdd") !== -1 ) { state.list = [ { @@ -185,13 +176,13 @@ export default { }, { name: "查看", - href: "/manage/libraryadd", + href: "/libraryadd", }, ]; } if ( - n.indexOf("/manage/coursemanage") !== -1 || - n.indexOf("/manage/CourseManage") !== -1 + n.indexOf("/coursemanage") !== -1 || + n.indexOf("/CourseManage") !== -1 ) { state.list = [ { @@ -206,8 +197,8 @@ export default { ]; } if ( - n.indexOf("/manage/coursewaremanage") !== -1 || - n.indexOf("/manage/CoursewareManage") !== -1 + n.indexOf("/coursewaremanage") !== -1 || + n.indexOf("/CoursewareManage") !== -1 ) { state.list = [ { @@ -219,8 +210,8 @@ export default { ]; } if ( - n.indexOf("/manage/researchmanage") !== -1 || - n.indexOf("/manage/ResearchManage") !== -1 + n.indexOf("/researchmanage") !== -1 || + n.indexOf("/ResearchManage") !== -1 ) { state.list = [ { @@ -231,8 +222,8 @@ export default { ]; } if ( - n.indexOf("/manage/managepage") !== -1 || - n.indexOf("/manage/ManagePage") !== -1 + n.indexOf("/managepage") !== -1 || + n.indexOf("/ManagePage") !== -1 ) { state.list = [ { @@ -247,8 +238,8 @@ export default { } if ( - n.indexOf("/manage/researchadd") !== -1 || - n.indexOf("/manage/ResearchAdd") !== -1 + n.indexOf("/researchadd") !== -1 || + n.indexOf("/ResearchAdd") !== -1 ) { state.list = [ { @@ -263,8 +254,8 @@ export default { } if ( - n.indexOf("/manage/certificatecenter") !== -1 || - n.indexOf("/manage/CertificateCenter") !== -1 + n.indexOf("/certificatecenter") !== -1 || + n.indexOf("/CertificateCenter") !== -1 ) { state.list = [ { @@ -273,8 +264,8 @@ export default { ]; } if ( - n.indexOf("/manage/systemmanage") !== -1 || - n.indexOf("/manage/SystemManage") !== -1 + n.indexOf("/systemmanage") !== -1 || + n.indexOf("/SystemManage") !== -1 ) { state.list = [ { @@ -283,8 +274,8 @@ export default { ]; } if ( - n.indexOf("/manage/coursereviewed") !== -1 || - n.indexOf("/manage/CourseReiewed") !== -1 + n.indexOf("/coursereviewed") !== -1 || + n.indexOf("/CourseReiewed") !== -1 ) { state.list = [ { @@ -296,8 +287,8 @@ export default { ]; } if ( - n.indexOf("/manage/coursereviewedn") !== -1 || - n.indexOf("/manage/CourseReiewedN") !== -1 + n.indexOf("/coursereviewedn") !== -1 || + n.indexOf("/CourseReiewedN") !== -1 ) { state.list = [ { @@ -309,8 +300,8 @@ export default { ]; } if ( - n.indexOf("/manage/projectreviewed") !== -1 || - n.indexOf("/manage/ProjectReviewed") !== -1 + n.indexOf("/projectreviewed") !== -1 || + n.indexOf("/ProjectReviewed") !== -1 ) { state.list = [ { @@ -322,8 +313,8 @@ export default { ]; } if ( - n.indexOf("/manage/projectreviewedn") !== -1 || - n.indexOf("/manage/ProjectReviewedN") !== -1 + n.indexOf("/projectreviewedn") !== -1 || + n.indexOf("/ProjectReviewedN") !== -1 ) { state.list = [ { diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 87f64f4b..ce679c18 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: "/manage/coursereviewedn", + href: "/coursereviewedn", openKeys: "sub10", selectedKeys: "sub10-1", pagename: "待审核课程", }, { - href: "/manage/coursereviewed", + href: "/coursereviewed", openKeys: "sub10", selectedKeys: "sub10-2", pagename: "已审核课程", }, { - href: "/manage/projectreviewedn", + href: "/projectreviewedn", openKeys: "sub10", selectedKeys: "sub10-3", pagename: "待审核项目", }, { - href: "/manage/projectrrviewed", + href: "/projectrrviewed", openKeys: "sub10", selectedKeys: "sub10-4", pagename: "已审核项目", }, { - href: "/manage/learningpath", + href: "/learningpath", openKeys: "sub1", selectedKeys: "sub1", pagename: "学习路径", }, { - href: "/manage/leveladd", + href: "/leveladd", openKeys: "sub1", selectedKeys: "sub1", pagename: "关卡", }, { - href: "/manage/levelcheck", + href: "/levelcheck", openKeys: "sub1", selectedKeys: "sub1", pagename: "查看", }, { - href: "/manage/leveladddetail", + href: "/leveladddetail", openKeys: "sub1", selectedKeys: "sub1", pagename: "创建关卡", }, { - href: "/manage/projectmanage", + href: "/projectmanage", openKeys: "sub2", selectedKeys: "sub2-1", pagename: "项目", }, { - href: "/manage/projectadd", + href: "/projectadd", openKeys: "sub2", selectedKeys: "sub2-1", pagename: "创建项目", }, { - href: "/manage/templatelibrary", + href: "/templatelibrary", openKeys: "sub2", selectedKeys: "sub2-2", pagename: "模板库", }, { - href: "/manage/libraryadd", + href: "/libraryadd", openKeys: "sub2", selectedKeys: "sub2-2", pagename: "查看", }, { - href: "/manage/coursemanage", + href: "/coursemanage", openKeys: "sub3", selectedKeys: "sub3-1", pagename: "课件管理", }, { - href: "/manage/coursewaremanage", + href: "/coursewaremanage", openKeys: "sub3", selectedKeys: "sub3-2", pagename: "课程管理", }, { - href: "/manage/certificatecenter", + href: "/certificatecenter", openKeys: "sub8", selectedKeys: "sub8", pagename: "证书中心", }, { - href: "/manage/systemmanage", + href: "/systemmanage", openKeys: "sub9", selectedKeys: "sub9", pagename: "系统管理", }, { - href: "/manage/researchmanage", + href: "/researchmanage", openKeys: "sub5", selectedKeys: "sub5", pagename: "评估管理", diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index 96fd7655..721b819b 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -58,10 +58,10 @@ export default { state.openList.map((item, key) => { if (item.href === value.href) { if (state.openList.length === 1) { - if (state.openList[0].href !== "/manage/learningpath") { + if (state.openList[0].href !== "/learningpath") { state.openList.splice(key, 1); } - $router.push({ path: "/manage/learningpath" }); + $router.push({ path: "/learningpath" }); } else { if (value.active) { if (key === state.openList.length - 1) { diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue index 3cf72955..bc862db1 100644 --- a/src/components/vote/CreateVote.vue +++ b/src/components/vote/CreateVote.vue @@ -366,7 +366,7 @@ export default { if (res.data.code === 200) { message.success("编辑成功"); router.push({ - path: "/manage/researchmanage", + path: "/researchmanage", }); } }); diff --git a/src/router/config.js b/src/router/config.js index 27b6f975..27b1e0cb 100644 --- a/src/router/config.js +++ b/src/router/config.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-21 15:06:51 + * @LastEditTime: 2022-11-21 17:42:50 * @FilePath: /fe-manage/src/router/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -12,7 +12,7 @@ context.keys().forEach((path) => { // console.log('path', path) const componentName = path.replace(/.*\/([^\\.\\/]*)\.vue$/, "$1"); routes.push({ - path: `/manage/${componentName.toLowerCase()}/:id?`, + path: `/${componentName.toLowerCase()}/:id?`, name: componentName, component: () => context(path), meta: { diff --git a/src/router/index.js b/src/router/index.js index 06d1632f..75da5b5a 100644 --- a/src/router/index.js +++ b/src/router/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-21 14:55:13 + * @LastEditTime: 2022-11-21 17:42:59 * @FilePath: /fe-manage/src/router/index.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -12,13 +12,12 @@ const routes = [ { path: '/', name: '首页', - redirect: '/manage/learningpath' + redirect: '/learningpath' }, ...routesConfig ] const router = createRouter({ - history: createWebHistory(), - base: '/manage', + history: createWebHistory("/manage/"), routes, }) diff --git a/src/store/index.js b/src/store/index.js index 2e92cedb..9056d61c 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-21 14:50:47 + * @LastEditTime: 2022-11-21 17:43:07 * @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: "/manage/learningpath", + href: "/learningpath", active: true, }, ], diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 5cc8b378..7e7a1fed 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -49,7 +49,7 @@
-
- +
- +
- +
- +
返回
diff --git a/src/views/projectcenter/ClassAdd.vue b/src/views/projectcenter/ClassAdd.vue index 0b5c8b12..57526254 100644 --- a/src/views/projectcenter/ClassAdd.vue +++ b/src/views/projectcenter/ClassAdd.vue @@ -6,7 +6,7 @@
返回 @@ -408,7 +408,7 @@ export default { if (routers.query.name == undefined) { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); } @@ -481,7 +481,7 @@ export default { const backPage = () => { setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 400); }; @@ -800,7 +800,7 @@ export default { message.success("编辑成功"); setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 1000); } else { @@ -855,7 +855,7 @@ export default { message.success("创建成功"); setTimeout(() => { router.push({ - path: "/manage/taskpage", + path: "/taskpage", query: { id: res.data.data.projectId }, }); }, 1000); diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 851e7e8e..aa9a37f3 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -33,7 +33,7 @@
-
返回
@@ -55,7 +55,7 @@
任务大纲
- + { routered.push({ - path: "/manage/templateAdd", + path: "/templateAdd", query: { projectId: state.projectId, name: state.name, diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 900c780c..9958aeb4 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -6,7 +6,7 @@
返回 @@ -48,13 +48,17 @@ } " v-model:value="classifySelect" - placeholder="四个养成" + placeholder="请选择分类" style="width: 100%" :options="classifyList" @change="classificationChange" allowClear showSearch :disabled="viewDetail ? true : false" + :fieldNames="{ + label: 'dictName', + value: 'dictCode', + }" >
@@ -79,7 +83,18 @@ overflow: hidden; " > - + -
-
- + -->
@@ -263,9 +275,14 @@ " v-model:value="classifySelect3" :options="classifyList3" + style="width: 100%" @change="classificationChange3" - placeholder="集团级/组织级/现地级/部门级" + placeholder="请选择项目级别" :disabled="viewDetail ? true : false" + :fieldNames="{ + label: 'dictName', + value: 'dictCode', + }" />
@@ -286,8 +303,9 @@ " v-model:value="classifySelect4" :options="classifyList4" + style="width: 100%" @change="classificationChange4" - placeholder="集团级/组织级/现地级/部门级" + placeholder="请选择培训分类" :disabled="viewDetail ? true : false" /> @@ -392,7 +410,7 @@ import { message } from "ant-design-vue"; import { useRouter, useRoute } from "vue-router"; import dayjs from "dayjs"; import * as api from "../../api/index"; -// import * as api1 from "../../api/index1"; +import * as api1 from "../../api/index1"; import { storage } from "../../api/storage"; import { toDate } from "../../api/method"; import { useStore } from "vuex"; @@ -530,7 +548,7 @@ export default { storage.remove("projectAddId"); setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 400); }; @@ -558,15 +576,41 @@ export default { }); const projectName = ref(""); - - const classifyList = ref([ - { value: 1, label: "管理者" }, - { value: 2, label: "领军者" }, - { value: 3, label: "产业人" }, - ]); + //分类 + const classifyList = ref([]); + const getDictList = (param) => { + let obj = { + pageNo: 1, + pageSize: 20, + setCode: param, + }; + api1 + .getDict(obj) + .then((res) => { + console.log("获取字典成功", res); + if (res.status === 200) { + if (param === "projectClass") { + classifyList.value = res.data.data.rows; + } + if (param === "projectPic") { + if (res.data.data.rows.length > 0) { + imageUrl.value = res.data.data.rows[0].dictValue; + } + } + if (param === "projectLevel") { + classifyList3.value = res.data.data.rows; + } + } + }) + .catch((err) => { + console.log("获取字典失败", err); + }); + }; + getDictList("projectClass"); + getDictList("projectPic"); + getDictList("projectLevel"); let projectType = ""; - const classificationChange = (value) => { console.log(`selected ${value}`); projectType = value; @@ -721,25 +765,9 @@ export default { // 资源归属 sourceBelongId 后续给接口 const classifyList2 = computed(() => { - return store.state.orgtreeList ? store.state.orgtreeList : ref(null); + return store.state.orgtreeList ? store.state.orgtreeList : ref([]); }); - // //获取资源归属 - // const orgTree = () => { - // api1 - // .orgtree() - // .then((res) => { - // console.log("获取集团组织成功", res); - // if (res.status === 200) { - // classifyList2.value = res.data.data; - // } - // }) - // .catch((err) => { - // console.log("获取集团组织失败", err); - // }); - // }; - // orgTree(); - let sourceBelongIdC = ""; const classificationChange2 = (key) => { console.log(`selected ${key}`, classifyList2); @@ -748,10 +776,10 @@ export default { // 项目级别 const classifyList3 = ref([ - { value: 1, label: "集团级" }, - { value: 2, label: "组织级" }, - { value: 3, label: "现地级" }, - { value: 4, label: "部门级" }, + // { value: 1, label: "集团级" }, + // { value: 2, label: "组织级" }, + // { value: 3, label: "现地级" }, + // { value: 4, label: "部门级" }, ]); let levels = ""; @@ -874,7 +902,7 @@ export default { }); }; getTemplate(); - //模版滚动加载信息 + //模版滚动加载模板信息 const templateScroll = (e) => { // console.log("滚动", e, b); const { target } = e; @@ -993,7 +1021,7 @@ export default { message.success("编辑成功"); setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 1000); } else { @@ -1048,7 +1076,7 @@ export default { message.success("创建成功"); setTimeout(() => { router.push({ - path: "/manage/taskpage", + path: "/taskpage", query: { id: res.data.data.projectId }, }); }, 1000); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 2544ae97..950929d5 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -259,7 +259,7 @@
- +
{/* - 基础信息 + 基础信息
{/* - 基础信息 + 基础信息
{/* - 基础信息 + 基础信息
{ router.push({ - path: "/manage/classadd", + path: "/classadd", query: { projectId: value.record.projectId, name: value.record.name, @@ -2482,7 +2482,7 @@ export default { }); }} style={{ cursor: "pointer" }} - to="/manage/classadd" + to="/classadd" class="operation3" > 创建班级 @@ -2566,7 +2566,7 @@ export default {
- + 创建班级
@@ -2683,7 +2683,7 @@ export default { } if (value.record.parentId == "0") { router.push({ - path: "/manage/projectadd", + path: "/projectadd", query: { projectId: value.record.projectId, name: value.record.name, @@ -2692,7 +2692,7 @@ export default { } else { if (value.record.isbj) { router.push({ - path: "/manage/classadd", + path: "/classadd", query: { projectId: value.record.projectId, name: value.record.paraentName, @@ -2701,7 +2701,7 @@ export default { }); } else { router.push({ - path: "/manage/sonproject", + path: "/sonproject", query: { projectId: value.record.projectId, name: value.record.paraentName, @@ -2728,7 +2728,7 @@ export default { // } // if (value.record.parentId == "0") { // router.push({ - // path: "/manage/projectadd", + // path: "/projectadd", // query: { // projectId: value.record.projectId, // name: value.record.name, @@ -2738,7 +2738,7 @@ export default { // } else { // if (value.record.isbj) { // router.push({ - // path: "/manage/classadd", + // path: "/classadd", // query: { // projectId: value.record.projectId, // name: value.record.paraentName, @@ -2748,7 +2748,7 @@ export default { // }); // } else { // router.push({ - // path: "/manage/sonproject", + // path: "/sonproject", // query: { // projectId: value.record.projectId, // name: value.record.paraentName, @@ -2878,7 +2878,7 @@ export default {
{ router.push({ - path: "/manage/taskpage", + path: "/taskpage", }); storage.set("projectId", value.record.projectId); }} @@ -2937,7 +2937,7 @@ export default {
{ router.push({ - path: "/manage/taskpage", + path: "/taskpage", }); storage.set("projectId", value.record.projectId); }} @@ -2984,7 +2984,7 @@ export default {
{ router.push({ - path: "/manage/taskpage", + path: "/taskpage", }); storage.set("projectId", value.record.projectId); }} @@ -2992,7 +2992,7 @@ export default { 基础信息
{/** - 基础信息 + 基础信息 */} diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue index 7b1dfa20..d09e7be9 100644 --- a/src/views/projectcenter/SonProject.vue +++ b/src/views/projectcenter/SonProject.vue @@ -6,7 +6,7 @@
返回 @@ -408,7 +408,7 @@ export default { if (routers.query.name == undefined) { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); } @@ -481,7 +481,7 @@ export default { const backPage = () => { setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 400); }; @@ -800,7 +800,7 @@ export default { message.success("编辑成功"); setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 1000); } else { @@ -855,7 +855,7 @@ export default { message.success("创建成功"); setTimeout(() => { router.push({ - path: "/manage/taskpage", + path: "/taskpage", query: { id: res.data.data.projectId }, }); }, 1000); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 831dad0c..9ee429ee 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -149,7 +149,7 @@ - +
- +
返回
@@ -321,8 +321,8 @@ - -
@@ -3260,7 +3264,7 @@ export default { let luj = info.attach; console.log("lulj", luj); console.log("赚回来", JSON.parse(luj)); - state.fileList = JSON.parse(luj) + state.fileList = JSON.parse(luj); // state.fileList = luj } }); @@ -3379,9 +3383,9 @@ export default { // // list.push(JSON.stringify(item)) // state.fileList.push(item) // }); - - state.fileList.push(info.file) - list = state.fileList + + state.fileList.push(info.file); + list = state.fileList; console.log("list", list); // let str = list.join(","); let str = JSON.stringify(list); @@ -3431,7 +3435,7 @@ export default { const toEdit = () => { if (state.parentId == "0") { routered.push({ - path: "/manage/projectadd", + path: "/projectadd", query: { projectId: state.projectId, name: state.name, @@ -3440,7 +3444,7 @@ export default { } else { if (state.isbj !== null) { routered.push({ - path: "/manage/classadd", + path: "/classadd", query: { projectId: state.projectId, // name: state.paraentName, @@ -3450,7 +3454,7 @@ export default { }); } else { routered.push({ - path: "/manage/sonproject", + path: "/sonproject", query: { projectId: state.projectId, name: state.name, @@ -3608,45 +3612,47 @@ export default { }); }; //删除文件 - const deFile=(id)=>{ - console.log(id) - let index = state.fileList.findIndex(item=>{item.uid==id}) - state.fileList.splice(index,1) - let str = JSON.stringify(state.fileList) + const deFile = (id) => { + console.log(id); + let index = state.fileList.findIndex((item) => { + item.uid == id; + }); + state.fileList.splice(index, 1); + let str = JSON.stringify(state.fileList); editProj({ - attach: str, - beginTime: state.tstartTime.slice(0, 10), - // beginTime:1668643200, - boeFlag: state.boeFlag, - category: state.category, - courseSyncFlag: state.courseSyncFlag, - endTime: state.tendTime.slice(0, 10), - // endTime: 1668816000, - level: state.tlevel, - manager: state.manager, - managerId: state.managerId, - name: state.name, - notice: state.notice, - noticeFlag: state.noticeFlag, - parentId: state.parentId, - picUrl: state.picUrl, - projectId: state.projectId, - remark: state.remark, - sourceBelongId: Number(state.tsourceBelong), - status: state.status, - systemId: state.tsystemId, - templateId: state.templateId || 0, - type: state.type, + attach: str, + beginTime: state.tstartTime.slice(0, 10), + // beginTime:1668643200, + boeFlag: state.boeFlag, + category: state.category, + courseSyncFlag: state.courseSyncFlag, + endTime: state.tendTime.slice(0, 10), + // endTime: 1668816000, + level: state.tlevel, + manager: state.manager, + managerId: state.managerId, + name: state.name, + notice: state.notice, + noticeFlag: state.noticeFlag, + parentId: state.parentId, + picUrl: state.picUrl, + projectId: state.projectId, + remark: state.remark, + sourceBelongId: Number(state.tsourceBelong), + status: state.status, + systemId: state.tsystemId, + templateId: state.templateId || 0, + type: state.type, + }) + .then((res) => { + console.log("上传成功", res); + message.destroy(); + return message.success("删除成功"); }) - .then((res) => { - console.log("上传成功", res); - message.destroy() - return message.success("删除成功") - }) - .catch((err) => { - console.log("上传失败了", err); - }); - } + .catch((err) => { + console.log("上传失败了", err); + }); + }; onMounted(() => { getStu(); getTaskList(); diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index a809d8ee..840388e6 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -138,7 +138,7 @@ export default defineComponent({ {value.status === "已发布" ? (
- +
查看{" "} | @@ -179,7 +179,7 @@ export default defineComponent({
- +
查看 | diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index a7201aea..60bc59ee 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -6,7 +6,7 @@
返回 @@ -501,7 +501,7 @@ export default { storage.remove("projectAddId"); setTimeout(() => { router.push({ - path: "/manage/libraryAdd", + path: "/libraryAdd", }); }, 400); }; @@ -950,7 +950,7 @@ export default { message.success("编辑成功"); setTimeout(() => { router.push({ - path: "/manage/projectmanage", + path: "/projectmanage", }); }, 1000); } else { @@ -1005,7 +1005,7 @@ export default { message.success("创建成功"); setTimeout(() => { router.push({ - path: "/manage/taskpage", + path: "/taskpage", query: { id: res.data.data.projectId }, }); }, 1000); diff --git a/src/views/research/ManagePage.vue b/src/views/research/ManagePage.vue index 3008b51f..dd7aec0e 100644 --- a/src/views/research/ManagePage.vue +++ b/src/views/research/ManagePage.vue @@ -10,9 +10,9 @@ 导出信息
- + - + 返回 diff --git a/src/views/research/ResearchAdd copy.vue b/src/views/research/ResearchAdd copy.vue index a8593eed..a9a6c462 100644 --- a/src/views/research/ResearchAdd copy.vue +++ b/src/views/research/ResearchAdd copy.vue @@ -3,9 +3,9 @@
创建评估 - + - + 返回 diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index d7562fb0..3a97ca47 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -3,9 +3,9 @@
创建评估 - + - + 返回 @@ -499,7 +499,7 @@ export default { if (res.data.code === 200) { message.success("编辑成功"); router.push({ - path: "/manage/researchmanage", + path: "/researchmanage", }); } }); @@ -517,7 +517,7 @@ export default { if (res.data.code === 200) { message.success("创建成功"); router.push({ - path: "/manage/researchmanage", + path: "/researchmanage", }); } }); @@ -526,7 +526,7 @@ export default { const handleAllCancel = () => { state.allFormsData = []; router.push({ - path: "/manage/researchmanage", + path: "/researchmanage", }); }; const checkVal = (filterData) => { diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 3e972ffd..6e56bc80 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -428,7 +428,7 @@ export default {
{ - handleToManagepage(value, "/manage/managepage"); + handleToManagepage(value, "/managepage"); }} > 管理 @@ -474,7 +474,7 @@ export default {
{ - handleToResearchadd(value, "/manage/researchadd"); + handleToResearchadd(value, "/researchadd"); }} > 基础信息 diff --git a/src/views/system/SystemManage.vue b/src/views/system/SystemManage.vue index 187f212b..347c9d8b 100644 --- a/src/views/system/SystemManage.vue +++ b/src/views/system/SystemManage.vue @@ -327,7 +327,7 @@ export default { }; const router = useRouter(); const golearningpath = () => { - router.push({ path: "/manage/learningpath", params: { id: 1 } }); + router.push({ path: "/learningpath", params: { id: 1 } }); }; //下载二维码图片 From 6bc5991774ba0d1824506ec15ded9d6e8bdd698e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Mon, 21 Nov 2022 18:17:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=A8=A1=E6=9D=BF=E7=BC=96?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=A4=A7=E7=BA=B2=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A8=A1=E6=9D=BF=E4=BB=BB=E5=8A=A1=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexTemplate.js | 2 +- src/views/projectcenter/LibraryAdd.vue | 776 +++--- src/views/projectcenter/temTask.vue | 3200 +++++++++++++++++++++++ src/views/projectcenter/templateAdd.vue | 547 +--- 4 files changed, 3674 insertions(+), 851 deletions(-) create mode 100644 src/views/projectcenter/temTask.vue diff --git a/src/api/indexTemplate.js b/src/api/indexTemplate.js index a9837852..212aafee 100644 --- a/src/api/indexTemplate.js +++ b/src/api/indexTemplate.js @@ -4,7 +4,7 @@ import http from "./config"; //编辑项目模板 export const templateEdit = (obj) => http.post('/admin/project/template/edit',obj); // 模板详情 -export const templateDetail = (id) => http.get(`/admin/project/template/edit?projectTemplateId=${id}`); +export const templateDetail = (id) => http.get(`/admin/project/template/detail?projectTemplateId=${id}`); // 删除阶段 export const deleteStage = (id) => http.delete(`/admin/project/template/deleteStage`,{stageId:id}); //删除任务 diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 9b6a10ff..f44e4414 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -5,12 +5,11 @@
-
{{ projectInfo.name || "-" }}
+
{{projectInfo.name || '-'}}
-
项目经理:{{ projectInfo.manager || "-" }}
+
项目经理:{{projectInfo.manager || '-'}}
- 起止时间:{{ projectInfo.beginTime || "-" }} 至 - {{ projectInfo.endTime || "-" }} + 起止时间:{{projectInfo.beginTime || '-'}} 至 {{projectInfo.endTime || '-'}}
@@ -34,7 +33,7 @@
-
返回
@@ -56,7 +55,7 @@
任务大纲
- + - +
- +
公告内容
+
当前设计下,学员可以获得
-
-
- 基本信息 - 编辑 -
-
+
+ + +
+ +
+
+
编辑
+
-
模板名称:
+
项目名称:
- + {{ projectInfo.name }}
封面图:
- - - +
-
模板时间:
+
项目时间:
- + {{ projectInfo.beginTime }} ~ {{ projectInfo.endTime }}
项目经理:
- + {{ projectInfo.manager }}
资源归属:
- + {{ projectInfo.sourceBelong }}
-
模板说明:
+
项目说明:
- + {{ projectInfo.remark }}
同步学习记录:
-
- + 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程)
项目级别:
- + {{ projectInfo.level }}
-
培训分类:
+
培训体系:
- + {{ projectInfo.systemId }}
是否BOEU实施:
-
- + BOEU实施
-
- 取消 - 保存 -
-
-
-
-
-
-
上传共享文档
-
- -
-
-
- - 上传 - - -
- - 支持:pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip - -
-
- - {{ - item.name - }} - 删除 -
+
+
+
+
+
+
上传共享文档
+
+
+
+ + 上传 + + +
+ + 支持:pdf.ppt.pptx.doc.docx.xls.xlsx.jpeg.png.gif.zip + +
+
+ + {{item.name}} + 删除 +
+
+
@@ -640,10 +559,11 @@
+ \ No newline at end of file + diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue new file mode 100644 index 00000000..df5be070 --- /dev/null +++ b/src/views/projectcenter/temTask.vue @@ -0,0 +1,3200 @@ + + + + + + \ No newline at end of file diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue index 60bc59ee..05959e27 100644 --- a/src/views/projectcenter/templateAdd.vue +++ b/src/views/projectcenter/templateAdd.vue @@ -6,7 +6,7 @@
返回 @@ -24,11 +24,10 @@
@@ -47,14 +46,13 @@ return triggerNode.parentNode || document.body; } " - v-model:value="classifySelect" - placeholder="四个养成" + v-model:value="projectInfo.category" + placeholder="管理者" style="width: 100%" :options="classifyList" @change="classificationChange" allowClear showSearch - :disabled="viewDetail ? true : false" >
@@ -88,7 +86,6 @@ action="/api/file/upload" :before-upload="beforeUpload" @change="handleChange" - :disabled="viewDetail ? true : false" >
@@ -146,7 +141,7 @@ return triggerNode.parentNode || document.body; } " - :value="classifySelect1" + :value="projectInfo.manager" mode="multiple" placeholder="请选择项目经理" style="width: 100%" @@ -154,7 +149,6 @@ @change="classificationChange1" allowClear showSearch - :disabled="viewDetail ? true : false" >
@@ -175,11 +169,10 @@ return triggerNode.parentNode || document.body; } " - v-model:value="classifySelect2" - placeholder="自动带出 可修改" + v-model:value="projectInfo.sourceBelongId" + placeholder="项目一" :options="classifyList2" @change="classificationChange2" - :disabled="viewDetail ? true : false" />
@@ -189,12 +182,11 @@
@@ -205,8 +197,7 @@
-
-
模版
-
- - - - -
-
-