From 132381cc881c0bf62bd6a4684e63db93f69091c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Thu, 17 Nov 2022 18:53:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=8A=95=E7=A5=A8=E9=A2=98?= =?UTF-8?q?=E5=B9=B2=E8=8E=B7=E5=8F=96=EF=BC=8C=E6=88=90=E5=91=98=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=EF=BC=8C=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=EF=BC=8C=E6=90=9C=E7=B4=A2=EF=BC=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexVote.js | 4 +- src/components/vote/AddVote.vue | 21 +- src/components/vote/queryStem.vue | 86 ++ src/views/learningpath/LevelAdd.vue | 94 +- src/views/projectcenter/LibraryAdd.vue | 21 +- src/views/projectcenter/templateAdd.vue | 1359 +++++++++++++++++++++++ 6 files changed, 1557 insertions(+), 28 deletions(-) create mode 100644 src/components/vote/queryStem.vue create mode 100644 src/views/projectcenter/templateAdd.vue diff --git a/src/api/indexVote.js b/src/api/indexVote.js index fd1a7437..11b05e52 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -63,7 +63,9 @@ export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOpti export const editVote = (obj) => http.post('/vote/editVote', obj) //根据题干ID获取题干信息 -export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', { params: obj }) +export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{ + headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'} +}) //修改题干信息接口 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index ed6c398f..2b187118 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -56,6 +56,7 @@ > 创建投票 + 查看投票
+ + + + + +
{ @@ -366,6 +376,12 @@ export default { } } + const queryStem = () => { + state.addStemVisible = true; + }; + const closeStem = () => { + state.addStemVisible = false; + }; return { ...toRefs(state), showDrawerCreVote, @@ -376,7 +392,8 @@ export default { dleVoteStem, updateVoteInfo, delBox, - + queryStem, + closeStem, }; }, }; diff --git a/src/components/vote/queryStem.vue b/src/components/vote/queryStem.vue new file mode 100644 index 00000000..e3be6c23 --- /dev/null +++ b/src/components/vote/queryStem.vue @@ -0,0 +1,86 @@ + + + + + \ No newline at end of file diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index b363e8c2..83c1647d 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -98,10 +98,12 @@
快速创建项目详情
+
+
@@ -116,8 +118,9 @@
快速添加任务/关卡
+
@@ -129,7 +132,9 @@
-
+
添加学员
快速添加学员
@@ -155,7 +160,6 @@
-
关卡概览
@@ -215,16 +219,16 @@ stage2: item.stageId != choosedStageId, }" :key="item.stageId" - @click="choosedStageId = item.stageId" + @click="stageChange(item.name,item.stageId)" > - {{ item.stage }} + 关卡{{ item.stageId }}
关卡名称：
-
管理者进阶-腾飞班1第一关卡
+
{{stateName}}
@@ -578,8 +582,8 @@
@@ -588,12 +592,12 @@
已选择
- 3 + {{selectedRowKeys.length}}
项 列表选项总数： - 5 - 条 + {{tableData.length}} + 条
@@ -1203,6 +1207,7 @@ export default { CheckStuvisible: false, //学员管理的查看抽屉 addLoading: false, // 加载动画 choosedStageId: 1, // 选择的阶段id + selectedRowKeys:[], twobtn: true, number: true, twobtnn: false, @@ -1214,6 +1219,20 @@ export default { styTitle: null, cretime: null, picUrl: null, + projectNameList:[ + { + value: '1', + label: '导出信息', + }, + { + value: '2', + label: '批量调整关卡', + }, + { + value: '3', + label: '批量删除', + } + ], // 共享文档列表 docList: [ { @@ -1262,7 +1281,7 @@ export default { pageSize: 10, visiblene: false, sh: false, - nodata: false, + nodata: true, closeDeleteAll: false, curLevel: "", taskSyllabusActive: 0, @@ -1279,6 +1298,7 @@ export default { visible: false, //时间管理 TMvisible: false, //考试管理 FaceVisivle: false, //面授管理 + stateName:null, // 关卡名称 //关卡的数据 level: [ // { @@ -1330,11 +1350,11 @@ export default { // 阶段列表 { stageId: 1, - stage: "关卡一", + name: "关卡一xx", }, { stageId: 2, - stage: "关卡二", + name: "关卡二xx", }, ], }); @@ -1542,7 +1562,10 @@ export default { const closehuodModal = () => { state.huodModal = false; }; - + const stageChange = (name,id) => { + state.choosedStageId = id; + state.stateName = name; + } const changeTabs = (e) => { console.log("切换tabs", e, state.routerId); if (e == 2) { @@ -1567,12 +1590,12 @@ export default { .then((res) => { console.log("获取学员列表", res); let data = res.data.data.rows || null; - state.tableData = []; + // state.tableData = []; if (data.length) { for (let i in data) { let _time = new Date(data[i].beginStudyTime * 1000); state.tableData.push({ - key: i + 1, + key: data[i].studentId, com: data[i].userInfoBo.deptName, name: data[i].userInfoBo.userName, gang: data[i].userInfoBo.jobName, @@ -1620,6 +1643,7 @@ export default { onMounted(() => { state.addLoading = true; getOverview(); + myGetRouterDetail(); reget(); }); const closePub = () => { @@ -1807,8 +1831,10 @@ export default { const myGetRouterDetail = () => { GetRouterDetail(state.routerId) .then((res) => { + if(res.data.data.routerInfo.status == 1) { + state.nodata = false; + } let data = res.data.data.chapterList; - state.taskSyllabus = data; // for(let i in data) { // state.taskSyllabus[i].name = data[i].name @@ -1819,8 +1845,13 @@ export default { // }) // } // } - - // } + levelList.stageList = []; + for(let i in data) { + if(i==0) {state.stateName = data[0].name} + levelList.stageList.push({ + stageId:Number(i)+1, + name:data[i].name + }) } }) .catch((err) => { console.log(err); @@ -1869,6 +1900,27 @@ export default { state.gatenamee = ''; getStudent(); }; + const handleStuChange = (value) => { + console.log(value); + if(value == 2) {state.visiblene = true} + if(value == 3 ) { deleteStu() } + }; + const deleteStu = () => { + if(state.selectedRowKeys.length == 0) { + message.warning("请选择成员"); + return } + let obj = { + routerId:100, + studentIds:state.selectedRowKeys, + } + api.delStudent(obj).then((res) => { + console.log(res); + message.success("批量删除成功") + }).catch(err => { + message.error("批量删除失败"+err); + console.log(err) + }) + }; return { ...toRefs(state), ...toRefs(levelList), @@ -1898,6 +1950,7 @@ export default { changeTabs, checkType, handleChange, + handleStuChange, delConfirm, searchLevel, resetLevel, @@ -1914,6 +1967,7 @@ export default { stopLearnPath, showStop, reget, + stageChange, }; }, }; diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 87f27829..d2738cac 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -200,7 +200,7 @@ : 'none', }" > - 考勤 +
- 二维码 +
- 管理 +
@@ -388,7 +388,7 @@
基本信息 - 编辑 + 编辑
@@ -593,6 +593,7 @@ import { ref, reactive, defineComponent, toRefs, onMounted} from "vue"; import { message } from "ant-design-vue"; import * as api from "@/api/indexTemplate" +import { useRouter } from "vue-router"; export default defineComponent({ name: "LibraryAdd", setup() { @@ -790,6 +791,7 @@ export default defineComponent({ const value = ref(""); const value2 = ref(""); const textnum = "150"; + const routered = useRouter(); const changeopclo = () => { state.hideshow = !state.hideshow; }; @@ -907,7 +909,15 @@ export default defineComponent({ console.log(err) }) } - + const toEdit = () => { + routered.push({ + path: "/templateAdd", + query: { + projectId: state.projectId, + name: state.name, + }, + }); + } // 新建或编辑阶段 const stateEdit = () => { let obj={ @@ -959,6 +969,7 @@ export default defineComponent({ taskDel, stateEdit, taskEdit, + toEdit, }; }, computed: { diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue new file mode 100644 index 00000000..a5cc20ae --- /dev/null +++ b/src/views/projectcenter/templateAdd.vue @@ -0,0 +1,1359 @@ + + + + + \ No newline at end of file From 97a8e6f4c681821df1ad4e4ce83074977609ae67 Mon Sep 17 00:00:00 2001 From: lixg Date: Thu, 17 Nov 2022 21:25:09 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E5=8D=A1=E5=8F=8A=E9=98=B6=E6=AE=B5?= =?UTF-8?q?=E5=B9=B6=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index1.js | 2 +- src/api/indexStage.js | 12 +- src/assets/images/leveladd/edit1.png | Bin 0 -> 410 bytes src/assets/scss/common.scss | 11 + src/components/BreadCrumb.vue | 52 + src/components/Modals/projSet.vue | 2 +- src/components/NavLeft.vue | 8 +- src/views/courselibrary/CourseManage.vue | 551 +------ src/views/courselibrary/CoursewareManage.vue | 8 +- src/views/learningpath/LevelAddDetail.vue | 1548 ++++++++++-------- src/views/projectcenter/ClassAdd.vue | 6 +- src/views/projectcenter/LibraryAdd.vue | 4 +- src/views/projectcenter/ProjectAdd.vue | 9 +- src/views/projectcenter/ProjectManage.vue | 46 +- src/views/projectcenter/SonProject.vue | 6 +- src/views/projectcenter/TaskAdd.vue | 1501 ++++++++++------- src/views/projectcenter/TaskPage.vue | 159 +- 17 files changed, 1977 insertions(+), 1948 deletions(-) create mode 100644 src/assets/images/leveladd/edit1.png diff --git a/src/api/index1.js b/src/api/index1.js index b8f120f7..d7517673 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-10 11:41:52 + * @LastEditTime: 2022-11-17 15:41:45 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ diff --git a/src/api/indexStage.js b/src/api/indexStage.js index 1e6a2587..a39355b9 100644 --- a/src/api/indexStage.js +++ b/src/api/indexStage.js @@ -1,4 +1,14 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-09 09:26:26 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-17 21:20:05 + * @FilePath: /fe-manage/src/api/indexStage.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import http from "./config"; //添加阶段 -export const editStage = (obj) => http.post('/admin/project/editStage', obj); \ No newline at end of file +export const editStage = (obj) => http.post('/admin/project/editStage', obj); +// 删除阶段 +export const deleteStage = (obj) => http.delete('/admin/project/deleteStage',{params:obj}); \ No newline at end of file diff --git a/src/assets/images/leveladd/edit1.png b/src/assets/images/leveladd/edit1.png new file mode 100644 index 0000000000000000000000000000000000000000..e319e324dc5f650105a482cb7eb0825a02335f3b GIT binary patch literal 410 zcmV;L0cHM)P)Px$R7pfZR5(wilD$d;Q4odCvG5HP3tzy_!crf=U3UW_f}K_h7AlE~f6-tf{$Pl~ zLeq$yV0Tw{t$h(IOAE0K=14X%*({q7$W)hm?|gI4%n$-qAX9KdV>>l>qEBb=&K zqi+h_TL|m444VK~06qae0=4?N5ghu$&v2QG&%ggy3fyA|Cjg#knWZQoL(5$Ea@0yD zikvm+utvi|sNj^ANwN_#<)^ZMasX~pC^W-DHxCqRL_4dF6gS;5>iG_+8+(iI@z*#}sNdv5mQ9MEoTjBN{gOU(^b literal 0 HcmV?d00001 diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 09f462c8..a8adc8b1 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -437,6 +437,17 @@ textarea { } } +.ant-modal{ + .modalHeader{ + background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + } + .top{ + background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + } + .del_header{ + background: linear-gradient(180deg, rgba(103,64,255,0.2) 0%, rgba(166,168,255,0) 100%) !important; + } +} //弹窗-------------------------------------------------------- //loading-------------------------------------------------------- diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 2abfc972..c4cb108c 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -273,6 +273,58 @@ export default { }, ]; } + if ( + n.indexOf("/coursereviewed") !== -1 || + n.indexOf("/CourseReiewed") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "已审核课程", + }, + ]; + } + if ( + n.indexOf("/coursereviewedn") !== -1 || + n.indexOf("/CourseReiewedN") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "待审核课程", + }, + ]; + } + if ( + n.indexOf("/projectreviewed") !== -1 || + n.indexOf("/ProjectReviewed") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "已审核项目", + }, + ]; + } + if ( + n.indexOf("/projectreviewedn") !== -1 || + n.indexOf("/ProjectReviewedN") !== -1 + ) { + state.list = [ + { + name: "审核管理", + }, + { + name: "待审核项目", + }, + ]; + } } ); diff --git a/src/components/Modals/projSet.vue b/src/components/Modals/projSet.vue index d41a38c6..92306df8 100644 --- a/src/components/Modals/projSet.vue +++ b/src/components/Modals/projSet.vue @@ -180,7 +180,7 @@ alt="" />
- 培训体系： + 培训分类：
- 待审核项目 + 待审核项目 - 已审核项目 + 已审核项目 @@ -307,13 +307,13 @@ export default { pagename: "已审核课程", }, { - href: "/projectviewedn", + href: "/projectreviewedn", openKeys: "sub10", selectedKeys: "sub10-3", pagename: "待审核项目", }, { - href: "/projectviewed", + href: "/projectrrviewed", openKeys: "sub10", selectedKeys: "sub10-4", pagename: "已审核项目", diff --git a/src/views/courselibrary/CourseManage.vue b/src/views/courselibrary/CourseManage.vue index 2a5bf0bc..fb6beea2 100644 --- a/src/views/courselibrary/CourseManage.vue +++ b/src/views/courselibrary/CourseManage.vue @@ -1,458 +1,40 @@ +