From c853af33169e752f8d0103b139809ccf64d3fb13 Mon Sep 17 00:00:00 2001 From: lixg Date: Fri, 9 Dec 2022 14:22:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 4 +- src/views/courselibrary/CoursewareManage.vue | 71 ++++--- src/views/learningpath/LevelAdd.vue | 25 ++- src/views/projectcenter/LibraryAdd.vue | 191 ++++++++++--------- 4 files changed, 172 insertions(+), 119 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index 773efa21..adba7185 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 14:32:52 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-08 15:47:05 + * @LastEditTime: 2022-12-09 10:04:32 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -56,7 +56,7 @@ http.interceptors.response.use( return response; } else { if (code === 1000) { - window.open("https://u-pre.boe.com/web/", '_self'); + // 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); diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 3704ec16..93ad5b99 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -221,7 +221,7 @@ - +
@@ -231,7 +231,7 @@ alt="" />
- + 是否设置目录
@@ -257,7 +257,7 @@
- +
取消
@@ -1548,7 +1548,7 @@
-
+
- --> +
@@ -1585,11 +1596,15 @@
重置
-
-
-
- 新建开课 -
+
+
+
+
+ 新建开课
@@ -2713,7 +2728,7 @@ import SeeModal from "./components/seeModal.vue"; import CourseModal from "./courseModal.vue"; import * as moment from "moment"; import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue"; -import { codeUrl } from "../../api/method"; +import { codeUrl, toDate } from "../../api/method"; //列表表格 const columns1 = [ { @@ -2979,7 +2994,7 @@ const columns6 = [ return index + 1 + pageNum; }, }, - { + { title: "课程名称", dataIndex: "organization", key: "organization", @@ -2990,7 +3005,7 @@ const columns6 = [ return text ? text : "-"; }, }, - { + { title: "场地", dataIndex: "address", key: "saddress", @@ -3001,7 +3016,7 @@ const columns6 = [ return text ? text : "-"; }, }, - { + { title: "教师名称", dataIndex: "teacher", key: "teacher", @@ -3013,9 +3028,6 @@ const columns6 = [ }, }, - - - { title: "开始时间", dataIndex: "starttime", @@ -3040,7 +3052,7 @@ const columns6 = [ return text ? text : "-"; }, }, - { + { title: "创建人", dataIndex: "createName", key: "createName", @@ -4111,15 +4123,30 @@ export default defineComponent({ // 渲染开课操作 const getTableDate3 = async () => { // let datas = state.tableData6; + let beginTime = ""; + let endTime = ""; + if (state.selectTime) { + // beginTime = parseInt(new Date(state.selectTime[0].$d).getTime() / 1000); + // endTime = parseInt(new Date(state.selectTime[1].$d).getTime() / 1000); + beginTime = toDate( + new Date(state.selectTime[0].$d).getTime() / 1000, + "Y-M-D h:m:s" + ); + endTime = toDate( + new Date(state.selectTime[1].$d).getTime() / 1000, + "Y-M-D h:m:s" + ); + } let obj = { pageNo: state.currentPage222, pageSize: state.pageSize222, createName: state.kk_inputV1, teacher: state.kk_inputV2, - beginTime: parseInt(new Date(state.selectTime).getTime() / 1000), + beginTime: beginTime, + endTime: endTime, offcourseId: state.offcourseId, }; - console.log("获取开课", obj); + console.log("获取开obj", obj, state.selectTime); let res = await planList(obj); console.log("开课res", res); const { rows, total, pageNo } = res.data.data; @@ -4745,7 +4772,7 @@ export default defineComponent({ completeType: item.completeType, endTime: new Date(item.endTime) / 1000, evalFlag: item.evalFlag, - name: item.name+'1', + name: item.name + "1", signFlag: item.signFlag, //是否允许未报名的签到:1是0否 //signWordFlag: item.signWordFlag, //签到是否需要口令:1是0否 teacherId: item.teacherId, @@ -4769,7 +4796,7 @@ export default defineComponent({ }); const postData = { offcourseId: null, //不传代表新增 - name: item.name+'1', + name: item.name + "1", picUrl: item.picUrl, targetUser: item.targetUser, meaning: item.meaning, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index e2b6cc2e..bfedfe65 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1462,6 +1462,7 @@ export default { codevisible: false, //二维码是否显示 codeInfo: null, //二维码内容 + levelTotal: 0, //设置基本信息需判断的关卡总数 previewSelect: 0, studySelect: 0, previewStartNum: 0, @@ -2057,6 +2058,10 @@ export default { //获取设置信息 if (res.data.code === 200) { //previewSetting studySetting + if (res.data.data.chapterList) { + state.levelTotal = res.data.data.chapterList.length; + } + state.previewSelect = res.data.data.routerInfo.enablePreview; state.studySelect = res.data.data.routerInfo.enableStudy; if (res.data.data.routerInfo.previewSetting) { @@ -2231,7 +2236,7 @@ export default { message.warning("删除失败"); }); }; - // 设置------------------------------------------------------ + // 设置start------------------------------------------------------ //编辑基本信息 const editLearnInfo = () => { let obj = { @@ -2241,6 +2246,13 @@ export default { previewSetting: state.previewStartNum + "," + state.previewEndNum, studySetting: state.studyStartNum + "," + state.studyEndNum, }; + if ( + state.previewStartNum > state.levelTotal || + state.previewEndNum > state.levelTotal || + state.studyStartNum > state.levelTotal || + state.studyEndNum > state.levelTotal + ) + return message.warning("关卡数超过范围"); console.log("编辑设置基本信息obj", obj); api .editLearnInfo(obj) @@ -2248,13 +2260,14 @@ export default { console.log("编辑设置基本信息成功", res); if (res.data.code === 200) { message.success("修改成功"); + closebtn(); } }) .catch((err) => { console.log("编辑设置基本信息失败", err); }); }; - // 设置----------------------------------------------------- + // 设置end----------------------------------------------------- //添加学员 watch( () => state.addAuthList, @@ -2312,12 +2325,14 @@ export default { //清空所选的学员 const clearChooseStu = () => { Modal.confirm({ - title: '确定清空所有学员吗？', onOk: async () => { - state.addAuthList = [] + title: "确定清空所有学员吗？", + onOk: async () => { + state.addAuthList = []; // student.studentDelAll({id: state.routerId, type: 2}) // state.tabledata = [] // state.tableDataTotal = 0; - }, bodyStyle: 'margin-top:70%' + }, + bodyStyle: "margin-top:70%", }); }; diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue index f5072de6..ca4e5bc3 100644 --- a/src/views/projectcenter/LibraryAdd.vue +++ b/src/views/projectcenter/LibraryAdd.vue @@ -56,7 +56,10 @@
任务大纲
- +
「{{ item.course }}」
-
{{ item.name }}
+
+ {{ item.name }} +
@@ -279,52 +284,47 @@
-
+
关闭
-
+
开启
-
-
当前公告内容：
+
+
当前公告内容：
- {{noticeContent==""?"暂无公告":noticeContent}} -
+ {{ noticeContent == "" ? "暂无公告" : noticeContent }} +
 
-
编辑
-
- -
@@ -592,7 +592,10 @@
上传共享文档
- +
@@ -844,8 +847,8 @@ export default defineComponent({ seven1: null, seven2: null, edit: true, - fileList:[], - attachSwitch:true, + fileList: [], + attachSwitch: true, // 共享文档列表 docList: [ { @@ -863,17 +866,17 @@ export default defineComponent({ ], isEdit: false, // 是否处于编辑状态 // 基本信息 - projectInfo: { }, - noticeContent:"", - editFlag:false, + projectInfo: {}, + noticeContent: "", + editFlag: false, }); const value = ref(""); const textnum = "150"; const routered = useRouter(); const changeopclo = () => { - state.projectInfo.noticeFlag = state.checked?1:0; + state.projectInfo.noticeFlag = state.checked ? 1 : 0; api - .templateEdit( state.projectInfo) + .templateEdit(state.projectInfo) .then((res) => { console.log(res); }) @@ -913,9 +916,9 @@ export default defineComponent({ state.isEdit = false; getDetail(); }; - const editNotice =()=>{ - state.editFlag = true ; - } + const editNotice = () => { + state.editFlag = true; + }; const checkType = (type) => { let typeRules = [ @@ -944,30 +947,39 @@ export default defineComponent({ api .templateDetail(localStorage.getItem("projectTemplateId")) .then((res) => { - console.log("get model list ----->", res, res.data.data.stageList); + console.log("get model list ----->", res, res.data.data.stageList); state.taskSyllabus = []; console.log(res); state.projectInfo = res.data.data.projectTemplateInfo; - - state.noticeContent = state.projectInfo.notice; - state.checked = state.projectInfo.noticeFlag==1?true:false; - console.log("res.data.data.projectTemplateInfo",res.data.data.projectTemplateInfo); - try{ - state.fileList = JSON.parse(res.data.data.projectTemplateInfo.attach); - }catch{ + state.noticeContent = state.projectInfo.notice; + state.checked = state.projectInfo.noticeFlag == 1 ? true : false; + console.log( + "res.data.data.projectTemplateInfo", + res.data.data.projectTemplateInfo + ); + + try { + state.fileList = JSON.parse( + res.data.data.projectTemplateInfo.attach + ); + } catch { state.fileList = []; } - state.attachSwitch = res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false + state.attachSwitch = + res.data.data.projectTemplateInfo.attachSwitch == 1 ? true : false; let data = res.data.data.stageList; console.log("data=====", data); for (let i in data) { console.log("what ------ > ", i, data); - if(data[i].taskList.length!==0){ - state.taskSyllabus.push({ text: data[i].name?data[i].name:'无阶段任务', children: [] }); + if (data[i].taskList.length !== 0) { + state.taskSyllabus.push({ + text: data[i].name ? data[i].name : "无阶段任务", + children: [], + }); } - + for (let j in data[i].taskList) { state.taskSyllabus[i].children.push({ course: checkType(data[i].taskList[j].type), @@ -987,14 +999,14 @@ export default defineComponent({ }); }; - // 发布公告 - const addNotice = () => { - // state.projectInfo.notice= - if(!state.projectInfo.notice){ - return message.warning("请输入公告内容"); - } + // 发布公告 + const addNotice = () => { + // state.projectInfo.notice= + if (!state.projectInfo.notice) { + return message.warning("请输入公告内容"); + } api - .templateEdit( state.projectInfo) + .templateEdit(state.projectInfo) .then((res) => { state.noticeContent = state.projectInfo.notice; message.success("公告发布成功"); @@ -1004,7 +1016,7 @@ export default defineComponent({ message.error("公告发布失败" + err); console.log(err); }); - state.editFlag =false; + state.editFlag = false; }; // 删除阶段 @@ -1043,7 +1055,6 @@ export default defineComponent({ }); }; - // 新建或编辑阶段 const stateEdit = () => { let obj = { @@ -1124,23 +1135,23 @@ export default defineComponent({ let str = JSON.stringify(fileList); console.log("str", str); console.table({ - name: state.projectInfo.name, - category: state.projectInfo.category, - picUrl: state.projectInfo.picUrl, - manager: state.projectInfo.manager, - managerId: state.projectInfo.managerId || 0, - sourceBelongId: state.projectInfo.sourceBelongId, - level: state.projectInfo.level, - systemId: state.projectInfo.systemId, - boeFlag: state.projectInfo.boeFlag ? 1 : 0, - courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, - notice: state.projectInfo.notice, - noticeFlag: state.projectInfo.noticeFlag, - projectTemplateId: localStorage.getItem("projectTemplateId"), - remark: state.projectInfo.remark, - status: state.projectInfo.status, - attach: str, - }); + name: state.projectInfo.name, + category: state.projectInfo.category, + picUrl: state.projectInfo.picUrl, + manager: state.projectInfo.manager, + managerId: state.projectInfo.managerId || 0, + sourceBelongId: state.projectInfo.sourceBelongId, + level: state.projectInfo.level, + systemId: state.projectInfo.systemId, + boeFlag: state.projectInfo.boeFlag ? 1 : 0, + courseSyncFlag: state.projectInfo.courseSyncFlag ? 1 : 0, + notice: state.projectInfo.notice, + noticeFlag: state.projectInfo.noticeFlag, + projectTemplateId: localStorage.getItem("projectTemplateId"), + remark: state.projectInfo.remark, + status: state.projectInfo.status, + attach: str, + }); //要编辑项目 api .templateEdit({ @@ -1183,17 +1194,17 @@ export default defineComponent({ // 更新开关状态 api - .templateEdit({ - sourceBelongId: state.projectInfo.sourceBelongId, - projectTemplateId: localStorage.getItem("projectTemplateId"), - attachSwitch: state.attachSwitch?1:-1 - }) - .then((res) => { - console.log("开关更新成功", res); - }) - .catch((err) => { - console.log("开关更新失败", err); - }); + .templateEdit({ + sourceBelongId: state.projectInfo.sourceBelongId, + projectTemplateId: localStorage.getItem("projectTemplateId"), + attachSwitch: state.attachSwitch ? 1 : -1, + }) + .then((res) => { + console.log("开关更新成功", res); + }) + .catch((err) => { + console.log("开关更新失败", err); + }); }; //设置积分规则 @@ -1277,7 +1288,7 @@ export default defineComponent({ handleChange2, scoresum, checkedClose, - editNotice + editNotice, }; }, });