From 22356826b897765e01de5950b7ac2bf49b1f96c3 Mon Sep 17 00:00:00 2001 From: lixg Date: Tue, 20 Dec 2022 15:59:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8E=A5=E5=8F=A3=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/method.js | 37 +---- src/components/BreadCrumb.vue | 14 ++ src/components/NavTop.vue | 10 ++ src/components/drawers/AddHomework.vue | 105 +++++++----- src/components/drawers/AddLive.vue | 73 +++++---- src/components/student/TableStudent.vue | 102 ++++++------ src/views/learningpath/LevelAdd.vue | 205 ++++++++++++------------ 7 files changed, 289 insertions(+), 257 deletions(-) diff --git a/src/api/method.js b/src/api/method.js index 98913705..557c4988 100644 --- a/src/api/method.js +++ b/src/api/method.js @@ -179,41 +179,7 @@ function throttle(fn, delay = 200) { }; } -//把token存到cookie -//name 字段名 value 字段值 perpetual 有效期 -const setCookie = (name, value, perpetual) => { - console.log('存储token到cookie') - let exdate = new Date() - exdate.setDate(perpetual * 24 * 60 * 60 * 1000) //exdate.setDate(exdate.getDate() + 365) - document.cookie = `${name}=${value};expires=${exdate.toGMTString()};path=/` - //永久有效 - //document.cookie = name + '=' + value + ';expires=' + 'Fri, 31 Dec 9999 23:59:59 GMT' -} -//获取cookie数据 -//先写一个方法 -function getCookie(name) { - return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || '' - //1.获取cookie字符串 - // const cookies = document.cookie; - // console.log('cookies',cookies) - // //通过；来分割字符串 - // const cookie = cookies.split(";"); - // // console.log('cookie', cookie) - // //遍历，使键值对匹配上 - // for (var i = 0; i < cookie.length; i++) { - // var arr = cookie[i].split("token="); - // // console.log('arr', arr) - // console.log('name', name) - // // if (arr[0] == name) { - // // console.log('arr[1]', arr[1]) - // // return arr[1]; - // // } - // // console.log('arr[1]', arr[1]) - // return arr[1] - // } - // return ""; -} //滚动加载信息 @@ -288,8 +254,7 @@ export { getWeek, autoComma, formatNumber, - setCookie, - getCookie, + scrollLoad, changeOwnership, commonData, diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index b5e57c20..f8f0b742 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -122,6 +122,20 @@ export default { }, ]; } + if ( + n.indexOf("/projectadd?projectId") !== -1 || + n.indexOf("/ProjectAdd?projectId") !== -1 + ) { + state.list = [ + { + name: "项目", + href: "/projectmanage", + }, + { + name: "编辑项目", + }, + ]; + } if (n.indexOf("/taskpage") !== -1 || n.indexOf("/TaskPage") !== -1) { state.list = [ { diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index b69ba583..a1146bdd 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -127,6 +127,16 @@ export default { localStorage.removeItem("pathmapPic"); localStorage.removeItem("projectClass"); localStorage.removeItem("projectPic"); + + localStorage.removeItem("routerId"); + localStorage.removeItem("selectedKeys"); + localStorage.removeItem("openKeys"); + localStorage.removeItem("stageId"); + localStorage.removeItem("openpages"); + localStorage.removeItem("memberInitInfo"); + localStorage.removeItem("projectId"); + localStorage.removeItem("projectTemplateId"); + localStorage.removeItem("orgtreeList"); window.open("https://u-pre.boe.com/web/", "_self"); }; return { diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index ba5830b3..ac0c8d4a 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -31,23 +31,23 @@
- +
- -
- + +
@@ -159,7 +159,7 @@ export default { type: Number, default: null, }, - workName:{ + workName: { type: String, default: null, }, @@ -256,16 +256,39 @@ export default { const resetForm = () => { // formRef.value.resetFields(); - formState.workName = '' - formState.workRequirement = '' - formState.choosedTime = [] + formState.workName = ""; + formState.workRequirement = ""; + formState.choosedTime = []; }; const handleValidate = (...args) => { console.log(args); }; + const beforeUpload = (file) => { + console.log("file", file); + const isJpgOrPng = + file.name.indexOf(".pdf") === -1 && + file.name.indexOf(".ppt") === -1 && + file.name.indexOf(".pptx") === -1 && + file.name.indexOf(".doc") === -1 && + file.name.indexOf(".docx") === -1 && + file.name.indexOf(".xls") === -1 && + file.name.indexOf(".xlsx") === -1 && + file.name.indexOf(".jpg") === -1 && + file.name.indexOf(".jpeg") === -1 && + file.name.indexOf(".png") === -1 && + file.name.indexOf(".gif") === -1 && + file.name.indexOf(".zip") === -1; + // console.log("isJpgOrPng", isJpgOrPng); + return isJpgOrPng; + }; const handleChange = (info) => { - console.log("info", info); + const isfileformat = beforeUpload(info.file); + if (isfileformat) { + fileList.value = []; + message.destroy(); + return message.error("请上传正确格式附件"); + } if (info.file.status !== "uploading") { console.log(info.file, info.fileList); // state.workEnclosureAddress = info.fileList[0].response.data; @@ -315,11 +338,11 @@ export default { // 重置表单选项 const afterVisibleChange = () => { - console.log('11223344', props.EditWorkId) + console.log("11223344", props.EditWorkId); if (props.EditWorkId > 0) { state.EditWorkId = props.EditWorkId; queryWork(); - }else{ + } else { formRef.value.resetFields(); resetForm(); } @@ -328,8 +351,12 @@ export default { // 新增任务 const updteHomeWork = () => { let obj = { - submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm"), - submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm"), + submitEndTime: dayjs(formState.choosedTime[1]).format( + "YYYY-MM-DD HH:mm" + ), + submitStartTime: dayjs(formState.choosedTime[0]).format( + "YYYY-MM-DD HH:mm" + ), workEnclosureAddress: state.workEnclosureAddress ? state.workEnclosureAddress : "", @@ -339,9 +366,9 @@ export default { }; if (props.EditWorkId > 0) { updateWorkTaskUsing(obj) - .then(async(res) => { + .then(async (res) => { // console.log("添加成功", res); - await updateTask(res); + await updateTask(res); ctx.emit("changeData", false); closeDrawer(); }) @@ -351,9 +378,9 @@ export default { }); } else { createWorkTask(obj) - .then(async(res) => { + .then(async (res) => { console.log("添加成功", res); - await updateTask(res); + await updateTask(res); ctx.emit("changeData", false); closeDrawer(); }) @@ -369,12 +396,12 @@ export default { state.addLoading = true; queryWorkDetailById({ workId: props.EditWorkId }) .then((res) => { - console.log(res) - try{ - fileList.value = JSON.parse(res.data.data.workEnclosureAddress) - }catch(e){ - console.log(e) - fileList.value = [] + console.log(res); + try { + fileList.value = JSON.parse(res.data.data.workEnclosureAddress); + } catch (e) { + console.log(e); + fileList.value = []; } formState.workName = res.data.data.workName; formState.workRequirement = res.data.data.workRequirement; @@ -394,10 +421,10 @@ export default { state.EditWorkId = res.data.data.workId; } else { if (props.isLevel == 1) { - if(!props.isactive){ - message.destroy(); - return message.warning("请先选中关卡"); - } + if (!props.isactive) { + message.destroy(); + return message.warning("请先选中关卡"); + } let editObj1 = { chapterId: props.isactive, courseId: res.data.data.workId, @@ -576,7 +603,7 @@ export default { margin-bottom: 32px; .textarea { width: 400px; - + .ant-input { width: 100%; } diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 8e1f08c6..f437ce06 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -32,7 +32,7 @@
@@ -51,13 +51,13 @@
- +
@@ -71,7 +71,7 @@
分钟 @@ -109,7 +109,7 @@
授课老师：
-
+
- -
支持图片格式为jpg/jpeg/png 图片最大为2MB
+
+ 支持图片格式为jpg/jpeg/png 图片最大为2MB +
@@ -174,7 +177,7 @@ />
- +
回放设置： @@ -191,15 +194,14 @@
- - +
直播说明： @@ -215,8 +217,7 @@ />
- - +
考勤设置： @@ -242,7 +243,9 @@ " v-model:value="inputV6" > - 分钟允许签到 + 分钟允许签到
直播开始后： @@ -258,7 +261,9 @@ " v-model:value="inputV7" > - 分钟允许签到 + 分钟允许签到
- - -