From 4698f25a226f5d8ca8a5e4e849fd03cb8c7630f7 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Mon, 26 Dec 2022 17:15:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8A=A0=E5=85=B3=E5=8D=A1id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddTest.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index ab8d1e95..98ab1fef 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -538,11 +538,13 @@ export default { //TODO缺少paperName字段 state.test.examinationTestName = state.paperName; //考试推送 - state.test.targetId = 0; - state.test.type = 0; - if (props.isLevel == 1) { - state.test.targetId = props.routerId; - state.test.type = 2; + state.test.targetId = 0; + state.test.type = 0; + state.test.chapterId=0; + if(props.isLevel == 1){ + state.test.targetId = props.routerId; + state.test.chapterId = props.isactive; + state.test.type = 2; } else if (props.isLevel == 2) { state.test.targetId = props.projectId; From 5e4e6f16b7f25982cd7a1823427acb6c73fb4253 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 17:19:21 +0800 Subject: [PATCH 2/9] =?UTF-8?q?--=20=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexProjStu.js | 1 + src/components/drawers/SeeStu.vue | 4 +- src/components/student/TableStudent.vue | 914 ++++++++++++------------ src/views/projectcenter/TaskPage.vue | 100 +-- 4 files changed, 528 insertions(+), 491 deletions(-) diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index e620b460..ab1092f2 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -29,6 +29,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess', //是否优秀学员 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) +export const updateStudent = (obj) => http.post('/admin/student/updateStudent', obj) //项目概览 export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index dce4fedc..be119982 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -303,8 +303,8 @@ export default { }; const check = () => { let obj = { - projectId: 37, - studentId: 3, + projectId: props.projectId, + studentId: props.checkStuId, }; studentProcess(obj).then((res) => { console.log("查看了学员", res.data.data); diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index b516df37..b2781f7c 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -1,328 +1,332 @@ + + + + + + + +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否授予此学员优秀学员称号？ +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+ + +
+ +
+
+
+
+
+ 提示 +
+
+ 您是否取消此学员优学员称号？ +
+
+
+
取消
+
+
+
确定
+
+
+
+
+ +
+ + - \ No newline at end of file diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 1d76a46a..8ca77da1 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -688,7 +688,7 @@
- +
@@ -700,7 +700,24 @@ :columns="stuColumns" :stage="stage" :visable ="tabFlag" - > + > + +
@@ -1275,7 +1292,7 @@ :closable="close" wrapClassName="canclestu" centered="true" - @cancel="closeModal1" + @cancel="cancelyou" >
@@ -1288,11 +1305,11 @@ 您是否授予此学员优秀学员称号？
-
-
取消
+
+
取消
-
-
确定
+
+
确定
@@ -1320,11 +1337,11 @@ 您是否取消此学员优学员称号？
-
-
取消
+
+
取消
-
-
确定
+
+
确定
@@ -1678,7 +1695,7 @@ import { getGroupList, deleteGroup, editGroup, - topStudent, + topStudent, updateStudent, } from "../../api/indexProjStu"; import { message, Modal } from "ant-design-vue"; import * as apitl from "../../api/index"; @@ -1725,6 +1742,7 @@ export default { const store = useStore(); const route = useRoute(); const state = reactive({ + editRecord:{}, tabFlag:true, stage: [], stuColumns: [ @@ -2559,26 +2577,12 @@ export default { }; //点击确定授予优秀学员后 const closeModal1 = () => { - let obj = { - projectId: state.projectId, - studentIds: state.changeGoods, - topFlag: 1, - }; - topStudent(obj) - .then((res) => { - console.log(`优秀学员授予成功${res.data}`); - message.success("优秀学员称号授予成功"); - - getStu(); - }) - .catch((err) => { - console.log(`优秀学员授予成功${err}`); - message.warning("优秀学员称号授予失败"); - }); - state.changeGoods = []; + state.editRecord.topFlag = 1 + updateStudent(state.editRecord) state.canclestu = false; + message.success("优秀学员称号授予成功"); }; - + //点击取消授予优秀学员后 const cancelyou = () => { state.changeGoods = []; @@ -2589,24 +2593,10 @@ export default { }; //点击确定取消优秀学员称号 const closeModal3 = () => { - let obj = { - projectId: state.projectId, - studentIds: state.changeGoods, - topFlag: 0, - }; - topStudent(obj) - .then((res) => { - console.log(`取消优秀学员称号成功${res}`); - message.success("优秀学员称号取消成功"); - - getStu(); - }) - .catch((err) => { - console.log(`取消优秀学员称号失败${err}`); - message.warning("优秀学员称号取消失败"); - }); - state.changeGoods = []; + state.editRecord.topFlag = 0 + updateStudent(state.editRecord) state.canclestu1 = false; + message.success("优秀学员称号取消成功"); }; //点击取消取消授予优秀学员后 const cancelcanyou = () => { @@ -3071,8 +3061,8 @@ export default { //tabs切换 const tabsChange = (e) => { - - + + //排行榜 if (e == 6) { //获取进度榜 @@ -4024,9 +4014,19 @@ export default { }; state.codeInfo = obj; }; + function settingTopFlag(record){ + record.topFlag?(state.canclestu1 = true):(state.canclestu=true) + state.editRecord = record + } + function showStudent(record){ + state.Seevisible = true + state.checkStuId = record.studentId + } return { ...toRefs(state), ...toRefs(levelList), + showStudent, + settingTopFlag, totask, tostudent, showModal, @@ -4037,7 +4037,7 @@ export default { closeModal2, showModal3, closeModal3, - + showDeleteOne, closeDeleteOne, showTime, From 39687730cb4c94ba0e726a32efc9304114d3fa31 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 17:30:22 +0800 Subject: [PATCH 3/9] =?UTF-8?q?--=20=E6=9F=A5=E7=9C=8B=20=E4=BC=98?= =?UTF-8?q?=E7=A7=80=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 8ca77da1..564de010 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1695,7 +1695,7 @@ import { getGroupList, deleteGroup, editGroup, - topStudent, updateStudent, + updateStudent, } from "../../api/indexProjStu"; import { message, Modal } from "ant-design-vue"; import * as apitl from "../../api/index"; From d674c660e86e428fd0f8136b0dbf5b7e4bcf4dd2 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 17:43:41 +0800 Subject: [PATCH 4/9] =?UTF-8?q?--=20=E6=9F=A5=E7=9C=8B=20=E4=BC=98?= =?UTF-8?q?=E7=A7=80=E5=AD=A6=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/SeeStu.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index be119982..aced870f 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -15,7 +15,8 @@ @click="closeDrawer" />
-
+ +
@@ -176,6 +177,7 @@ export default { }, setup(props, ctx) { const state = reactive({ + loading:false, userName: null, //用户名 deptName: null, //部门 jobName: null, //岗位 @@ -302,11 +304,13 @@ export default { state.stageList = array; }; const check = () => { + state.loading = true let obj = { projectId: props.projectId, studentId: props.checkStuId, }; studentProcess(obj).then((res) => { + state.loading = false console.log("查看了学员", res.data.data); let result = res.data.data; state.userName = result.userInfoBo.userName; From f3ecc9043d2a1eef32214c35e5a7db6317fa617b Mon Sep 17 00:00:00 2001 From: wuyx Date: Mon, 26 Dec 2022 17:52:30 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E6=96=B0=E5=BB=BA=E5=8F=8A=E9=A2=84=E8=A7=88=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=E5=92=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courselibrary/components/seeModal.vue | 26 +++++------ src/views/courselibrary/courseModal.vue | 46 +++++++++++-------- 2 files changed, 40 insertions(+), 32 deletions(-) diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue index a836205f..754d55fb 100644 --- a/src/views/courselibrary/components/seeModal.vue +++ b/src/views/courselibrary/components/seeModal.vue @@ -76,13 +76,13 @@
-
+
场景：
- {{ filterSenceTxt(detail.sceneId) }} + {{ detail.sceneContent }}
@@ -123,10 +123,10 @@
+ item.indexOf('jpg') !== -1 || + item.indexOf('jpeg') !== -1 || + item.indexOf('png') !== -1 +" src="@/assets/images/coursewareManage/pngpic.png" />
@@ -160,13 +160,13 @@ left: 72px; "> {{ - item.indexOf("-") !== -1 - ? item.slice( - item.lastIndexOf("/") + 1, - item.lastIndexOf("-") - ) + item.slice(item.lastIndexOf(".")) - : item - }} + item.indexOf("-") !== -1 + ? item.slice( + item.lastIndexOf("/") + 1, + item.lastIndexOf("-") + ) + item.slice(item.lastIndexOf(".")) + : item +}}
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 4600852c..ce32c060 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -154,10 +154,10 @@ + (triggerNode) => { + return triggerNode.parentNode || document.body; + } +" @change="changeTreeSelectValue" v-model:value="fen_lei" :tree-data="options2222">
@@ -192,26 +192,34 @@
- - ---> -
内容标签 @@ -359,7 +367,7 @@ export default defineComponent({ fen_lei: null, fen_lei1: null, feng_mian_1: null, - chang_jin: null, + chang_jin: "", tags_val_single: "", tags_val: [], qdms_inputV6: "", @@ -564,7 +572,7 @@ export default defineComponent({ state.fen_lei = null; state.fen_lei1 = null; state.feng_mian_1 = null; - state.chang_jin = null; + state.chang_jin = ""; state.tags_val_single = ""; state.tags_val = []; state.qdms_inputV6 = ""; @@ -751,7 +759,7 @@ export default defineComponent({ targetUser: state.qdms_inputV2, meaning: state.qdms_inputV3, categoryId: state.fen_lei, - sceneId: state.chang_jin, + sceneContent: state.chang_jin, tips: state.tags_val ? state.tags_val.join(",") : null, teacherId: state.member.value, teacher: state.member.name, @@ -841,7 +849,7 @@ export default defineComponent({ state.qdms_inputV3 = item.meaning; state.fen_lei = String(item.categoryId); state.fen_lei1 = changeTreeSelectValue(String(item.categoryId)); - state.chang_jin = String(item.sceneId); + state.chang_jin = String(item.sceneContent ? item.sceneContent : ''); state.tags_val = item.tips ? item.tips.split(",") : []; state.qdms_inputV6 = item.intro; state.member = { value: item.teacherId, name: item.teacher }; From 8b7c4aabafc94bc5c2b2e309a1ad9bdf5fcb2564 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 19:15:57 +0800 Subject: [PATCH 6/9] =?UTF-8?q?--=20=E7=BB=84=E7=BB=87=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/ProjectAudit.vue | 2 +- src/components/project/OrgClass.vue | 4 +- src/components/project/ProjectManagerNew.vue | 2 +- src/views/projectcenter/LibraryAdd.vue | 2 +- src/views/projectcenter/ProjectAdd.vue | 196 ++++++++++--------- src/views/projectcenter/ProjectManage.vue | 4 +- src/views/projectcenter/SonProject.vue | 5 +- src/views/projectcenter/TaskPage.vue | 4 +- src/views/projectcenter/templateAdd.vue | 4 +- 9 files changed, 116 insertions(+), 107 deletions(-) diff --git a/src/components/drawers/ProjectAudit.vue b/src/components/drawers/ProjectAudit.vue index 67115e24..04fd474a 100644 --- a/src/components/drawers/ProjectAudit.vue +++ b/src/components/drawers/ProjectAudit.vue @@ -39,7 +39,7 @@
资源归属：
- {{ projectInfo.sourceBelongName }} + {{ (projectInfo.sourceBelongFullName || '')+projectInfo.sourceBelongName }}
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue index 4cf15db6..73f44421 100644 --- a/src/components/project/OrgClass.vue +++ b/src/components/project/OrgClass.vue @@ -43,9 +43,9 @@ const id = computed(() => { return props.value }) -function change(key, obj) { - console.log(obj[0], key, props.value); +function change(key, obj, {triggerNode: {props: {namePath}}}) { emit('update:name', obj[0]) + emit('update:fullName', namePath) emit('update:value', key) } diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index bbb0270e..bf68e918 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -107,7 +107,7 @@ function change(e, l) { memberParam.value.page = 1 isOpen.value = false Array.isArray(l) && (selectOptions.value = l) - Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName) + Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.departId)?.departId, selectOptions.value.find(e => e.departId)?.departName, selectOptions.value.find(e => e.departId)?.orgName) if (Array.isArray(l)) { emit('update:name', l.map(t => t.label).join(',')) emit('update:value', l.map(t => t.value).join(',')) diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index 8746c2f0..2fbc8308 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -536,7 +536,7 @@
资源归属：
{{ - projectInfo.sourceBelongName + (projectInfo.sourceBelongFullName || '') + projectInfo.sourceBelongName }}
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue index 998b0d39..b4160ad0 100644 --- a/src/views/projectcenter/ProjectAdd.vue +++ b/src/views/projectcenter/ProjectAdd.vue @@ -3,14 +3,15 @@
{{ projectInfo.projectId ? "编辑" : "创建" + >{{ + projectInfo.projectId ? "编辑" : "创建" }}{{ ptojectType == "3" ? "班级" : "项目" }}
返回
@@ -20,8 +21,8 @@
项目归属
@@ -34,8 +35,8 @@
{{ ptojectType == 3 ? "班级名称" : "项目名称" }} @@ -43,27 +44,27 @@
封面图
avatar
@@ -91,64 +92,65 @@
项目时间
项目经理
资源归属
项目级别
@@ -159,8 +161,8 @@
培训分类
@@ -171,15 +173,15 @@
是否BOEU实施
是 否 @@ -192,16 +194,16 @@
同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）
@@ -211,12 +213,12 @@
@@ -235,18 +237,18 @@
模版
{ return triggerNode.parentNode || document.body; } " - placeholder="请选择模版" - :size="size" - style="width: 100%" - :options="classifyList5" - @change="classificationChange5" - @popupScroll="templateScroll" - :fieldNames="{ + placeholder="请选择模版" + :size="size" + style="width: 100%" + :options="classifyList5" + @change="classificationChange5" + @popupScroll="templateScroll" + :fieldNames="{ label: 'name', value: 'projectTemplateId', }" @@ -260,33 +262,33 @@
取消 确定 + :loading="loading" + v-on:click="createProject" + type="primary" + class="btn1" + style="margin-left: 20px" + >确定