From e179da897c5eeb258a875b9da2c20e561f306f13 Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 6 Dec 2022 14:46:03 +0800 Subject: [PATCH 01/16] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E5=9B=BE=E8=83=8C=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 8 ++++---- src/views/learningpath/LearningPath.vue | 3 ++- src/views/learningpath/LevelAddDetail.vue | 7 +++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index 7eca520f..326b58f4 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -55,10 +55,10 @@ http.interceptors.response.use( if (code === 0 || code === 200) { return response; } else { - if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); - // window.open("http://111.231.196.214:12013/manage/login", '_self'); - } + // if (code === 1000) { + // window.open("https://u-pre.boe.com/web/", '_self'); + // // window.open("http://111.231.196.214:12013/manage/login", '_self'); + // } console.log("api %o", msg); } return response; diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index f82e7bc4..dfad713f 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -200,6 +200,7 @@ 'background-image': 'url(' + item.dictValue + ')', display: index >= 5 ? 'none' : 'flex', }" + style="background-size: 100% 100%" >
0) { console.log("store.state.pathmapPic", store.state.pathmapPic); - state.imgData = [store.state.pathmapPic[0]]; + state.imgData = store.state.pathmapPic; } }); //添加权限 diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index b3f51883..11735c9b 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -905,9 +905,7 @@
- 请确认是否批量删除{{ deleteType === 1 ? "任务" : "学员" }} + 请确认是否批量删除任务
@@ -1630,7 +1628,7 @@ export default { state.gqxy_hs = !state.gqxy_hs; }; const showDeleteALLModal = (type) => { - if (state.selectRow.length === 0){ + if (state.selectRow.length === 0) { message.destroy(); return message.warning("请选择要删除的任务"); } @@ -1744,6 +1742,7 @@ export default { .then((res) => { console.log(res); state.deleteAll = false; + // state.deleteType = null; message.destroy(); state.selectRow = []; //选择行 state.selectAll = 0; //0：未选择，1：全选，2：部分选择 From 35f532bf0cf4a8d0dc483b59f47f461ea7198bcb Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Tue, 6 Dec 2022 14:50:16 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 38 --- src/views/examine/CourseReviewedN.vue | 318 +------------------ 2 files changed, 10 insertions(+), 346 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 70c902ca..b623b129 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -5191,8 +5191,6 @@ export default defineComponent({ }; const handleLook = async (itm, type) => { // state.isEdit = 0; - // console.log(45555); - // console.log(itm); if (type === "1") { return; } @@ -5206,42 +5204,6 @@ export default defineComponent({ state.lookCourseModal = true; item.attach = item.attach == "" ? [] : item.attach.split(","); state.faceDetailObj = item; - // // heroImg.value.src = item.picUrl; - // // valueHtmlRef.value = item.outline; - // // attachMap.value = item.attach == "" ? [] : item.attach.split(","); - // console.log("res222222222"); - // console.log(item); - // console.log(state.lookCourseModal); - - // state.qdms_inputV1 = item.name; - // state.imageUrl = item.picUrl; - // state.qdms_inputV2 = item.targetUser; - // state.qdms_inputV3 = item.meaning; - // state.fen_lei = String(item.categoryId); - // state.chang_jin = String(item.sceneId); - // state.tags_val = item.tips ? item.tips.split(",") : []; - // //state.qdms_inputV5 = item.teacherId; - // state.teacher = item.teacher; - // state.teacherId = item.teacherId; - // state.qdms_inputV6 = item.intro; - // state.member = { value: item.teacherId, name: item.teacher }; - - // if (item.attach == "") { - // state.imgList = []; - // } else { - // if (item.attach.indexOf(",")) { - // const arr = item.attach.split(","); - // arr.forEach((item) => { - // state.imgList.push({ img: item }); - // }); - // } else { - // state.imgList = [{ img: item.attach }]; - // } - // } - - // valueHtml.value = item.outline; - - // state.lookMs = true; }; // const handleTea = async () => { // console.log("item22224444"); diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 1e1953b4..7eca2536 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -141,304 +141,11 @@
- -
-
- - 预览 -
-
- -
-
-
-
-
-
-
-
-
-
- -
- 课程名称： -
-
-
- {{ faceDetailObj !== null ? faceDetailObj.name : "" }} -
-
-
-
-
-
-
-
-
-
-
-
-
- -
- 封面图： -
- - -
-
-
-
- -
- 目标人群： -
-
-
- {{ - faceDetailObj !== null ? faceDetailObj.targetUser : "" - }} -
-
-
-
-
- 课程价值： -
-
-
- {{ faceDetailObj !== null ? faceDetailObj.meaning : "" }} -
-
-
- -
-
-
- -
- 内容分类： -
-
- -
- {{ - faceDetailObj !== null - ? contentList11.find( - (e) => e.dictCode == faceDetailObj.categoryId - )?.dictValue - : "" - }} -
-
-
-
-
- 场景： -
-
- -
- {{ - faceDetailObj !== null - ? sceneist11.find( - (e) => e.dictCode == faceDetailObj.sceneId - )?.dictValue - : "" - }} -
-
-
-
-
- 内容标签： -
-
- {{ faceDetailObj !== null ? faceDetailObj.tips : "" }} -
-
-
-
-
-
-
- asterisk -
- 授课教师： -
-
-
- {{ faceDetailObj !== null ? faceDetailObj.teacher : "" }} -
-
-
-
-
- 课程简介： -
-
-
- {{ faceDetailObj !== null ? faceDetailObj.intro : "" }} -
-
-
-
-
- 附件 -
-
- - {{ - [ - "附件一", - "附件二", - "附件三", - "附件四", - "附件五", - "附件六", - ][index] - }} - - 查看 - -
-
-
-
-
- -
-
-
- {{ item.name }} -
- -
-
-
-
上传完成
-
-
- 100% -
-
-
-
-
- - 删除 - -
-
-
-
-
-
-
-
- 课程大纲 -
-
-
- - -
-
-
-
-
-
取消
-
-
-
确定
-
-
-
-
-
- + /> { - state.lookCourseModal = true; getFaceDetail(value.record.offId); console.log(value.record); }} style="cursor:pointer;color:#387DF7" > - 预览 + 预览3
); @@ -652,7 +357,10 @@ export default { .then((res) => { console.log("获取面授详情信息成功", res); let result = res.data.data; + state.lookCourseModal = true; + result.attach = result.attach == "" ? [] : result.attach.split(","); state.faceDetailObj = result; + heroImg.value.src = result.picUrl; valueHtml.value = result.outline; attachMap.value = result.attach == "" ? [] : result.attach.split(","); @@ -705,15 +413,10 @@ export default { }; // 预览弹框 开启和关闭 - const ft_exit = () => { state.lookCourseModal = false; }; - const handlePush = () => { - state.lookCourseModal = false; - }; - const setFaceData = (tableData) => { if (!tableData || !tableData.length) { state.tableData1 = []; @@ -832,7 +535,6 @@ export default { closeCourAuditModal, sureCourAuditModal, ft_exit, - handlePush, getFaceDetail, heroImg, valueHtml, From 89db35b9ce4853fab1bbcd0b14bb889bc928bdc5 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Tue, 6 Dec 2022 14:51:23 +0800 Subject: [PATCH 03/16] t --- src/views/examine/CourseReviewedN.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue index 7eca2536..1eb8b0c7 100644 --- a/src/views/examine/CourseReviewedN.vue +++ b/src/views/examine/CourseReviewedN.vue @@ -287,7 +287,7 @@ export default { }} style="cursor:pointer;color:#387DF7" > - 预览3 + 预览 ); From 9b6cc6f5062ffd647ed00c13ccdea44a6514e472 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 6 Dec 2022 15:12:22 +0800 Subject: [PATCH 04/16] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1=E7=95=8C=E9=9D=A2=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskPage.vue | 83 ++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 01a73b35..be2ea7de 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -32,11 +32,51 @@
{{ act }}
+ +
+ {{ act }} +
+ + +
+
+
+
+
+ 提示 +
+
+
+ 您确定要提交审核吗 +
+
+
+
+
取消
+
+
+
确定
+
+
+
+
+ diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index b0976927..2956237e 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -47,13 +47,13 @@
{ - state.selectedRowKeys = [] + state.selectedRowKeys = []; state.currentPage = page; state.pageSize = pageSize; getAllCaseText(); @@ -224,7 +224,7 @@ export default { const getTableDate = (tableData) => { let data = tableData; let array = []; - data.map((value, index) => { + data.map((value, index) => { let obj = { key: index, authorId: value.authorId, @@ -251,15 +251,15 @@ export default { isTop: "", }) .then((res) => { - console.log('案例列表',res) - if (res.status === 200) { - state.selectedRowKeys=[0] - for(let i=0;i {}); @@ -334,25 +334,25 @@ export default { } }; //搜索案例列表 - const searchList = ()=> { - if(state.inputV1 !== ''){ - getAllCaseText() - }else { - resetCase() + const searchList = () => { + if (state.inputV1 !== "") { + getAllCaseText(); + } else { + resetCase(); } - } + }; //重置案例信息 const resetCase = () => { - state.inputV1 = "" - state.selectedRowKeys=[] - state.currentPage = 1 + state.inputV1 = ""; + state.selectedRowKeys = []; + state.currentPage = 1; getAllCaseText(); }; - onMounted(()=>{ + onMounted(() => { // let cookie = // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njk0MjgwNTAsImV4cCI6MTY2OTQzNTI1MCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.9ea5ce6d4cd43c2c17f21a293e4dc0d362c2a404b9d50fae5c49fed5a238fb1a"; // setCookie("token", cookie, 10); - }) + }); return { ...toRefs(state), afterVisibleChange, diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 01a73b35..ac7cdde5 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1087,11 +1087,11 @@ >BOEU实施
- +
审核意见：
- {{passInfo}} + {{ passInfo }}
@@ -1106,7 +1106,10 @@
上传共享文档
- +
@@ -2435,9 +2438,8 @@ export default { authClassify: 3, addAuthList: [], switchopen: true, - isPass:false, // 是否审核未通过 - passInfo:null, // 审核未通过原因说明 - + isPass: false, // 是否审核未通过 + passInfo: null, // 审核未通过原因说明 }); const levelList = reactive({ @@ -2511,10 +2513,10 @@ export default { let leng = res.data.data.stageList.length; if (leng > 0) { let taskarr = res.data.data.stageList; - console.log('11-22-33',taskarr) - if(taskarr.length==1){ - if(taskarr[0].stageId == '0'){ - taskarr[0].name = '无阶段任务' + console.log("11-22-33", taskarr); + if (taskarr.length == 1) { + if (taskarr[0].stageId == "0") { + taskarr[0].name = "无阶段任务"; } } state.taskSyllabus = taskarr; @@ -3370,13 +3372,13 @@ export default { console.log("get task", res.data.data); if (res.data.code === 200) { // 判断当前审核是否通过 - if(res.data.data.projectAuditLogDtoList!==null){ - console.log('审核信息是什么',res.data.data.projectAuditLogDtoList) - let dataset = res.data.data.projectAuditLogDtoList - for(let i=0;i { console.log("小组创建成功", res); message.success("小组创建成功"); getGroup(); + getStu(); }) .catch((err) => { console.log("小组创建失败", err); @@ -3569,40 +3573,39 @@ export default { }; //end---------项目概览 - - // 设置上传图片开关 - const checkedClose = (data, a) => { + // 设置上传图片开关 + const checkedClose = (data, a) => { console.log(data, a); state.docChecked = data; - state.switchopen = data + state.switchopen = data; // 更新开关状态 editProj({ - attachSwitch:state.switchopen?1:-1, - boeFlag: state.boeFlag, - category: state.category, - courseSyncFlag: state.courseSyncFlag, - 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: Number(state.projectId), - remark: state.remark, - sourceBelongId: Number(state.tsourceBelong), - status: state.status, - systemId: state.tsystemId, - templateId: state.templateId || 0, - type: state.type, + attachSwitch: state.switchopen ? 1 : -1, + boeFlag: state.boeFlag, + category: state.category, + courseSyncFlag: state.courseSyncFlag, + 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: Number(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); }) - .then((res) => { - console.log("上传成功", res); - }) - .catch((err) => { - console.log("上传失败了", err); - }); + .catch((err) => { + console.log("上传失败了", err); + }); }; const handleChange = ({ file, fileList }) => { @@ -3615,7 +3618,7 @@ export default { let str = JSON.stringify(list); console.log("str", str); //要编辑项目 - console.log('编辑的项目信息',{ + console.log("编辑的项目信息", { attach: str, // beginTime: state.tstartTime.slice(0, 10), boeFlag: state.boeFlag, @@ -3637,9 +3640,9 @@ export default { systemId: state.tsystemId, templateId: state.templateId || 0, type: state.type, - }) + }); editProj({ - attachSwitch:state.switchopen?1:-1, + attachSwitch: state.switchopen ? 1 : -1, attach: str, boeFlag: state.boeFlag, category: state.category, @@ -4028,7 +4031,7 @@ export default { deFile, toDate, routered, - checkedClose + checkedClose, }; }, }; From 9fe20829d3482693d48ab1ab9146b72a5e8276d7 Mon Sep 17 00:00:00 2001 From: kclf <1195754634@qq.com> Date: Tue, 6 Dec 2022 16:08:09 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=8E=BB=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index fa4a039d..68b77a06 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -4017,7 +4017,7 @@ export default defineComponent({ state.imgList.splice(index, 1); }; const handleDel2 = (index) => { - state.fileList.splice(index, 1); + state.filesList.splice(index, 1); }; // 渲染列表1操作 @@ -4658,6 +4658,8 @@ export default defineComponent({ }; const handleCancelStu = () => { state.cstm_hs = false; + state.filesList = []; + state.kk_eidt = false; state.xjkkradioV1 = ""; state.completeType = ""; From ebc8ade5f912cf7f8101c04300c6180670346554 Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 6 Dec 2022 16:13:44 +0800 Subject: [PATCH 09/16] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddCase.vue | 5 + src/components/drawers/AddTest.vue | 559 ++++++++++++++--------------- 2 files changed, 282 insertions(+), 282 deletions(-) diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 2956237e..2d3f9e5e 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -255,6 +255,11 @@ export default { if (res.data.code === 200) { // state.selectedRowKeys = [0]; for (let i = 0; i < res.data.data.list.length; i++) { + console.log( + "res.data.data.list[i].casesId", + res.data.data.list[i].casesId, + props.EditCaseId + ); if (Number(res.data.data.list[i].casesId) == props.EditCaseId) { state.selectedRowKeys = [i]; } diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 0128d5ea..fb4bc621 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -1,18 +1,18 @@