From 00179237a4d17dabd45987bd11def905d866f1d4 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, 14 Nov 2022 17:45:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=85=B3=E5=8D=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?bug=EF=BC=8C=E5=92=8C=E5=8F=B3=E4=BE=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/FaceManage.vue | 2 +- src/components/drawers/TestManage.vue | 2 +- src/components/drawers/TimeManage.vue | 2 +- src/components/drawers/WorkManage.vue | 2 +- src/views/learningpath/LevelAdd.vue | 226 ++++---------------------- 5 files changed, 34 insertions(+), 200 deletions(-) diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue index d30f9203..68a3273d 100644 --- a/src/components/drawers/FaceManage.vue +++ b/src/components/drawers/FaceManage.vue @@ -362,7 +362,7 @@ export default { let timer; onMounted(() => { setTimeout(() => { - getManageList(); + // getManageList(); }, 1000); timer = setInterval(() => { state.open = false; diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 38f4a605..ca76fd5a 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -291,7 +291,7 @@ export default { let timer; onMounted(() => { setTimeout(() => { - getManageList(); + // getManageList(); }, 1000); timer = setInterval(() => { state.open = false; diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue index eae03011..ef802882 100644 --- a/src/components/drawers/TimeManage.vue +++ b/src/components/drawers/TimeManage.vue @@ -291,7 +291,7 @@ export default { let timer; onMounted(() => { setTimeout(() => { - getManageList(); + // getManageList(); }, 500); timer = setInterval(() => { state.open = false; diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue index 163d0d6a..0962b1f4 100644 --- a/src/components/drawers/WorkManage.vue +++ b/src/components/drawers/WorkManage.vue @@ -312,7 +312,7 @@ export default { onMounted(() => { setTimeout(() => { - getManageList(); + // getManageList(); }, 1000); }); return { diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index b0cef46f..fd563c8a 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -263,6 +263,7 @@ +
快速创建关卡任务
+ @@ -396,7 +398,7 @@ class="operation" style="cursor: pointer" :style="{ - display: item.course === '面授' ? 'flex' : 'none', + display: item.type === 2 ? 'flex' : 'none', }" @click="showFS" > @@ -405,10 +407,10 @@
@@ -442,21 +444,21 @@ class="operation" style="cursor: pointer; margin-right: 35px" @click=" - item.course === '在线' || - item.course === '案例' || - item.course === '外链' || - item.course === '讨论' || - item.course === '直播' || - item.course === '评估' || - item.course === '投票' || - item.course === '活动' - ? showTime(item.course, item.name) - : item.course === '考试' || item.course === '测评' - ? showTest(item.course, item.name) - : item.course === '面授' - ? showFace(item.course) - : item.course === '作业' - ? showWork(item.course) + item.type === 1 || + item.type === 3 || + item.type === 7 || + item.type === 8 || + item.type === 6 || + item.type === 11 || + item.type === 12 || + item.type === 9 + ? showTime(item.type, item.name) + : item.type === 5 || item.type === 10 + ? showTest(item.type, item.name) + : item.type === 2 + ? showFace(item.type) + : item.type === 4 + ? showWork(item.type) : null " > @@ -638,81 +640,7 @@
-
-
-
-
-
-
关卡晋级规则
-
-
- - 启用关卡自动规则加入 -
- 若开启“新建/编辑关卡-添加学员”支持设定自动加入规则,将于每日8点同步数据 -
-
-
选择范围
-
- -
-
- -
-
-
-
关卡学习方案展示设置
-
仅支持移动端
-
-
- 列表展示 -
-
- 路径展示 -
-
-
-
-
-
+ @@ -1010,79 +938,6 @@ export default { ], huodModal: false, zhibModal: false, - projectNameListt: [ - { - id: 1, - value: "导出信息", - label: "导出信息", - }, - { - id: 2, - value: "批量调整关卡", - label: "批量调整关卡", - }, - { - id: 3, - value: "批量删除", - label: "批量删除", - }, - ], - projectNameList: [ - { - id: 1, - value: "项目一", - label: "项目一", - }, - { - id: 2, - value: "项目二", - label: "项目二", - }, - { - id: 3, - value: "项目三", - label: "项目三", - }, - { - id: 4, - value: "项目四", - label: "项目四", - }, - ], - projectNameList2: [ - { - id: 1, - value: "项目一", - label: "项目一", - }, - { - id: 2, - value: "项目二", - label: "项目二", - }, - { - id: 3, - value: "项目三", - label: "项目三", - }, - { - id: 4, - value: "项目四", - label: "项目四", - }, - ], - projectNameList4: [ - { - id: 1, - value: "关卡1", - label: "关卡1", - }, - { - id: 2, - value: "关卡2", - label: "关卡2", - }, - ], //任务大纲列表 taskSyllabus: [ { @@ -1109,7 +964,6 @@ export default { nubvalue3: ref("4"), nubvalue1: ref("4"), fileList:ref([]), - checked2: false, docChecked:true, currentPage: 1, tableDataTotal: 100, @@ -1263,22 +1117,6 @@ export default { ] }) - // console.log("store", state.routerId); - const selectProjectName = (value, index) => { - console.log("value", value, index); - if (value === "批量删除") { - showDeleteALLModal(); - } - }; - const selectProjectName2 = (value, index) => { - console.log("value", value, index); - }; - const selectProjectName3 = (value, index) => { - console.log("value", value, index); - }; - const selectProjectName4 = (value, index) => { - console.log("value", value, index); - }; const tableDataFunc = () => { const columns = [ { @@ -1601,10 +1439,6 @@ export default { return { ...toRefs(state), ...toRefs(levelList), - selectProjectName, - selectProjectName2, - selectProjectName3, - selectProjectName4, showDeleteALLModal, closeDeleteALLModal, tableDataFunc, From c7dc4dd6e0150985591584d335e08066863cbcf4 Mon Sep 17 00:00:00 2001 From: songwc Date: Mon, 14 Nov 2022 18:18:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E5=BC=B9=E7=AA=97=20=E6=A6=82?= =?UTF-8?q?=E8=A7=88=20=E8=8E=B7=E5=8F=96=E8=A7=84=E5=88=99=20=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E7=BC=96=E8=BE=91=20=E5=85=B1=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexProjStu.js | 5 +- src/components/drawers/ProjectScore.vue | 137 +++- src/components/drawers/StuAdd.vue | 22 +- src/views/projectcenter/ProjectManage.vue | 4 +- src/views/projectcenter/TaskAdd.vue | 85 ++- src/views/projectcenter/TaskPage.vue | 888 ++++++++++++---------- 6 files changed, 702 insertions(+), 439 deletions(-) diff --git a/src/api/indexProjStu.js b/src/api/indexProjStu.js index 392664b7..b8dfc793 100644 --- a/src/api/indexProjStu.js +++ b/src/api/indexProjStu.js @@ -22,4 +22,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess', export const topStudent = (obj) => http.post('/admin/project/topStudent', obj) //项目概览 -export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) \ No newline at end of file +export const overview = (obj) => http.get('/admin/project/overview', { params: obj }) + +//设置项目积分规则 +export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj) \ No newline at end of file diff --git a/src/components/drawers/ProjectScore.vue b/src/components/drawers/ProjectScore.vue index 0ba76354..9a590d99 100644 --- a/src/components/drawers/ProjectScore.vue +++ b/src/components/drawers/ProjectScore.vue @@ -164,8 +164,50 @@ >{{ score1 }} 积分
- 优秀学员可获得 {{ score2 }}完成在线课程获得 {{ done }}积分 + 完成面授课程获得 {{ done1 }}积分 + 完成作业成绩不低于 {{ done2 }}分获得 + {{ done3 }}积分 +
+
+ {{ four1}}名学完在线课程获得 + {{ four2}}积分 + {{ four3}}名提交作业且成绩不低于 + {{ four4}}分获得 + {{ four5}}积分 +
+
+ 考试成绩高于{{ five1 }}分获得 + {{ five2 }}积分 +
+
+ 考勤正常学员获得 {{ six1}}积分 +
+
+ 成为小组长获得{{ seven1 }}积分 + 优秀学员可获得 + {{ seven2 }}积分
@@ -186,11 +228,82 @@ >积分
- 优秀学员可获得 完成在线课程获得 积分 + >积分 + 完成面授课程获得 + 积分 + 完成作业成绩不低于 分获得 + 积分
+
+ 名学完在线课程获得 + 积分 + 名提交作业且成绩不低于 + 分获得 + 积分 + +
+
+ 考试成绩高于分获得 + 积分 +
+
+ 考勤正常学员获得 积分 +
+
+ 成为小组长获得积分 + 优秀学员可获得 + 积分 +
+ -
收起 + 收起 +
+ /> +
@@ -409,10 +412,13 @@ v-if="showHidden1" @click="morePeopleHidden1" > -
收起 + 收起 +
+ /> +
@@ -469,10 +475,13 @@ v-if="showHidden2" @click="morePeopleHidden2" > -
收起 + 收起 +
+ /> + @@ -1051,6 +1060,7 @@ export default { // console.log("selectedRowKeys changed: ", selectedRowKeys,item); state.selectedRowKeys = selectedRowKeys; state.choosepeople = item.reverse(); + console.log(item, "选中你了!", state.choosepeople); selectedsHeight(); }; //单个删除选中的人 diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 00a53bf2..2f1873f2 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1161,7 +1161,6 @@ export default { getTableDate(); }; - const searchSubmit = () => { console.log("点击了搜索"); state.currentPage = 1; @@ -2921,6 +2920,9 @@ export default { data.subList.map((data2) => { data2.paraentName = value.name + "/" + data.name; data2.isbj = "class"; + storage.set("isbj", data.projectId); + // console.log(data2.paraentName, "conme"); + storage.set("pN", data2.paraentName); }); // console.log("lalallalaa", data); } else { diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 293616e0..97ecea72 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -303,7 +303,7 @@ v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" - v-model:EditInvistId = "EditInvistId" + v-model:EditInvistId="EditInvistId" /> @@ -325,7 +325,7 @@ v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" - v-model:EditVoteId = "EditVoteId" + v-model:EditVoteId="EditVoteId" /> @@ -337,7 +337,7 @@
任务列表
-
+
+ +
+
+
+
+
+ 提示 +
+
+
+ 您确定要批量删除任务吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
0) { - let arr = res.data.data.stageList[0].taskList; console.log("任务列表", arr); getTableData(arr); @@ -1351,8 +1379,6 @@ export default { }); }; - - //获取删除id(投票) const changeVData = (data) => { console.log("8989", data); @@ -1363,7 +1389,7 @@ export default { console.log("添加数据", data); getTask(data); }; - + //删除任务 const deleteTask = () => { let obj = { projectTaskIds: state.deleteID }; @@ -1420,8 +1446,11 @@ export default { }) .catch((err) => { console.log(err); + message.destroy(); + message.warning("批量删除失败"); }); }); + state.deAll = false; }; const onSelectChange = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); @@ -1502,12 +1531,12 @@ export default { state.projectTaskId = eleId; state.adddiscussvisible = true; }; - + const showDrawerAddActive = (id, eleId) => { state.addactivevisible = true; state.EditActiveId = id; state.projectTaskId = eleId; - console.log("active=======",id); + console.log("active=======", id); }; const showDrawerAddEval = (id, eleId) => { state.addevalvisible = true; @@ -1566,6 +1595,8 @@ export default { }); } state.selectRow = arr; + console.log(state.selectRow, "xuanzhong"); + console.log(Object.prototype.toString.call(state.selectRow)); //判断是否是全部选择或者是全部未选择来修改selectAll框的样式 if (arr.length !== 0) { if (arr.length === state.tableData.length) { @@ -1607,8 +1638,7 @@ export default { const changeCourseType = (id) => { console.log("任务id", id); }; - - + //打开测评的弹窗 const showEditEvalDrawer = (id, eleId) => { console.log("222222222222222222222", id); @@ -1641,6 +1671,17 @@ export default { showDrawerAddTest(id, eleId); } }; + const showdeAll = () => { + if(state.selectRow.length==0){ + message.destroy() + return message.warning("请选择要删除的任务") + }else{ + state.deAll = true; + } + }; + const closeDeAll = () => { + state.deAll = false; + }; return { ...toRefs(state), selectProjectName, @@ -1688,8 +1729,8 @@ export default { moveTask, deleteTaskAll, decideType, - - + showdeAll, + closeDeAll, }; }, }; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 223c22a9..78918d7c 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -175,11 +175,17 @@
阶段2
-->
-
- {{item.stage}} -
+
+ {{ item.stage }} +
@@ -216,20 +222,35 @@
作业完成率
-
{{stageOverviewList.totalTaskCnt}}
+
+ {{ stageOverviewList.totalTaskCnt }} +
阶段任务总数 - + +
+
+ {{ stageOverviewList.totalReqCnt }}
-
{{stageOverviewList.totalReqCnt}}
必修课 - + +
+
+ {{ stageOverviewList.totalOptCnt }}
-
{{stageOverviewList.totalOptCnt}}
选修课 - +
@@ -454,7 +475,6 @@ background: linear-gradient(180deg, #ddeaff, #f0f8fe); display: block; " - >
@@ -857,140 +877,159 @@
- + - -
- - - -
- +
+ -
-
-
编辑
-
-
-
项目名称:
-
- {{ name }} -
-
-
-
封面图:
-
- -
-
-
-
项目时间:
-
- {{ startTime }} ~ {{ endTime }} -
-
-
-
项目经理:
-
- {{ manager }} -
-
-
-
资源归属:
-
- {{ sourceBelong }} -
-
-
-
项目说明:
-
- {{ remark }} -
-
-
-
同步学习记录:
-
- 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程) -
-
-
-
项目级别:
-
- {{ level }} -
-
-
-
培训体系:
-
- {{ systemId }} -
-
-
-
是否BOEU实施:
-
- BOEU实施 -
-
-
-
- - -
-
-
-
-
-
-
上传共享文档
-
- +
+
+
编辑
+
+
+
项目名称:
+
+ {{ name }} +
+
+
+
封面图:
+
+ +
+
+
+
项目时间:
+
+ {{ startTime }} ~ {{ endTime }} +
+
+
+
项目经理:
+
+ {{ manager }} +
+
+
+
资源归属:
+
+ {{ sourceBelong }} +
+
+
+
项目说明:
+
+ {{ remark }} +
+
+
+
同步学习记录:
+
+ 同步课程学习记录(如学员在课程库中拥有课程的学习记录,自动免修该课程) +
+
+
+
项目级别:
+
+ {{ level }} +
+
+
+
培训体系:
+
+ {{ 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 + }} + 删除 +
+
+
+
+
+
@@ -1455,6 +1494,7 @@ + diff --git a/src/components/drawers/CorPowerlist.vue b/src/components/drawers/CorPowerlist.vue index e972af16..5f442929 100644 --- a/src/components/drawers/CorPowerlist.vue +++ b/src/components/drawers/CorPowerlist.vue @@ -8,135 +8,126 @@ @after-visible-change="afterVisibleChange" >
-
-
授权名单
- +
授权名单
+ +
+
+ + +
+
-
-
-
-
-
姓名:
-
- -
-
-
-
-
- -
搜索
-
-
- -
重置
-
-
-
- -
- - - -
-
- -
-
+ +
+
+
-
- - + +
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要取消该用户的授权吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+ +
+
+ + +
+
+ + diff --git a/src/components/drawers/CourseView.vue b/src/components/drawers/CourseView.vue new file mode 100644 index 00000000..198d192a --- /dev/null +++ b/src/components/drawers/CourseView.vue @@ -0,0 +1,2157 @@ + + + + + diff --git a/src/components/drawers/OwnPower.vue b/src/components/drawers/OwnPower.vue index f2de47ca..e52e83a2 100644 --- a/src/components/drawers/OwnPower.vue +++ b/src/components/drawers/OwnPower.vue @@ -3,10 +3,10 @@ :visible="ownpowervisible" class="drawerStyle ownpower" placement="right" - width="60%" + width="85%" @after-visible-change="afterVisibleChange" > -
+
归属权
-
-
-
姓名:
- -
-
-
-
- -
-
搜索
+
+
+
+
姓名:
+
-
-
- +
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
-
重置
-
- -
- -
-
- -
-
-
- - -
-
-
选择组织:
-
- +
+
BOE组织树
+ + - + +
-
-
-
姓名:
- -
-
- -
-
-
-
- -
-
搜索
-
-
-
- -
-
重置
-
-
-
- -
+
+
- -
-
+ +
+
-
选择受众:
-
- +
组织:
+ +
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+ +
+
+
BOE组织树
+ + + + +
+ 确认添加 +
+
+
+ + +
+
+
+ +
+
+
受众名称:
+ +
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
-
-
姓名:
- -
-
-
-
-
- -
-
搜索
-
-
-
- -
-
重置
-
-
- -
- -
-
+
+ +
@@ -263,38 +291,197 @@
已选
-
6
-
+
-
+
全部清除
-
-
- 李明 -
+
+
快速选人
+
+
+
+ +
+
{{ item.name }}
+
+
+
-
- 李大明 -
+
+
+ 查看更多 + +
-
- 李二明 -
+
+
+ 收起 + +
-
- 李明 -
+
+
+
添加组织
+
+
+
+ +
+
{{ item.value }}
+
+
+
-
- 李大明 -
+
+
+ 查看更多 + +
-
- 李二明 -
+
+
+ 收起 + +
+
+
+
+
受众关联
+
+
+
+ +
+
{{ item.name }}
+
+
+
+
+
+
+ 查看更多 + +
+
+
+
+ 收起 + +
@@ -304,11 +491,45 @@
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要添加此组织吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ diff --git a/src/components/drawers/ProjManagePower.vue b/src/components/drawers/ProjManagePower.vue index 949ad4e5..47921661 100644 --- a/src/components/drawers/ProjManagePower.vue +++ b/src/components/drawers/ProjManagePower.vue @@ -4,11 +4,11 @@ :visible="ProjManagevisible" class="drawerStyle ProjManageship" placement="right" - width="60%" + width="85%" @after-visible-change="afterVisibleChange" > -
-
+
+
管理权
-
-
-
姓名:
- -
-
-
-
- -
-
搜索
+
+
+
+
姓名:
+
-
-
- +
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
-
重置
-
- -
- -
-
- -
-
-
- - -
-
-
选择组织:
-
- +
+
BOE组织树
+ + - + +
-
-
-
姓名:
- -
-
- -
-
-
-
- -
-
搜索
-
-
-
- -
-
重置
-
-
-
- -
+
+
- -
-
+ +
+
-
选择受众:
-
- +
组织:
+ +
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
+
+
+ +
+
+
BOE组织树
+ + + + +
+ 确认添加 +
+
+
+ + +
+
+
+ +
+
+
受众名称:
+ +
+
+
+
+ +
+
搜索
+
+
+
+ +
+
重置
-
-
姓名:
- -
-
-
-
-
- -
-
搜索
-
-
-
- -
-
重置
-
-
- -
- -
-
+
+ +
@@ -264,38 +292,197 @@
已选
-
6
-
+
-
+
全部清除
-
-
- 李明 -
+
+
快速选人
+
+
+
+ +
+
{{ item.name }}
+
+
+
-
- 李大明 -
+
+
+ 查看更多 + +
-
- 李二明 -
+
+
+ 收起 + +
-
- 李明 -
+
+
+
添加组织
+
+
+
+ +
+
{{ item.value }}
+
+
+
-
- 李大明 -
+
+
+ 查看更多 + +
-
- 李二明 -
+
+
+ 收起 + +
+
+
+
+
受众关联
+
+
+
+ +
+
{{ item.name }}
+
+
+
+
+
+
+ 查看更多 + +
+
+
+
+ 收起 + +
@@ -305,11 +492,45 @@
+ + + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要添加此组织吗 +
+
+
+
取消
+
+
+
确定
+
+
+
+
+
+ \ No newline at end of file diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 2e46199b..4887d1a8 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -1673,6 +1673,13 @@ + + + + + + +