From 36da16fc0dfa001a7fe90ea33dcb409c73c2947b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E8=B6=85?= Date: Fri, 25 Nov 2022 18:21:40 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=84=E4=BB=BB=E5=8A=A1=20=E5=BE=85=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E8=AF=BE=E7=A8=8B=E6=95=B0=E6=8D=AE=E5=8F=8A=E5=90=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=20=E9=9D=A2=E6=8E=88=E8=AF=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddActive.vue | 4 +- src/components/drawers/AddCase.vue | 130 ++++++++++++++++-------- src/components/drawers/AddDiscuss.vue | 38 +++++-- src/components/drawers/AddEval.vue | 103 +++++++++++-------- src/components/drawers/AddFaceteach.vue | 48 ++++++--- src/components/drawers/AddHomework.vue | 17 ++++ src/components/drawers/AddInvist.vue | 17 ++++ src/components/drawers/AddLive.vue | 36 +++++-- src/components/drawers/AddOnline.vue | 61 +++++++---- src/components/drawers/AddProject.vue | 1 + src/components/drawers/AddRef.vue | 32 ++++-- src/components/drawers/AddTest.vue | 60 +++++++---- src/components/drawers/SelFacet.vue | 63 ++++-------- src/views/examine/CourseReviewed.vue | 21 +++- src/views/examine/CourseReviewedN.vue | 28 +++-- src/views/examine/ProjectReviewed.vue | 23 ++++- src/views/examine/ProjectReviewedN.vue | 19 +++- 17 files changed, 466 insertions(+), 235 deletions(-) diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 16281b21..5b2cea60 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -228,6 +228,7 @@ import * as apiTask from "../../api/indexTaskadd"; import { RouterEditTask } from "@/api/indexTask"; import { message } from "ant-design-vue"; import dayjs from "dayjs"; + export default { name: "AddActive", // components: { @@ -332,8 +333,7 @@ export default { dayjs(res.data.data.activityEndTime, "YYYY-MM-DD"), ]; }) - .catch(() => { - }); + .catch(() => {}); }; const afterVisibleChange = (bool) => { if (bool && props.edit) { diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index a61dff5b..9f679b95 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -49,7 +49,10 @@ :row-class-name=" (_record, index) => (index % 2 === 1 ? 'table-striped' : null) " - :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" + :row-selection="{ + selectedRowKeys: selectedRowKeys, + onChange: onSelectChange, + }" :columns="tableDataFunc()" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" @@ -82,6 +85,7 @@ import * as api from "../../api/indexCase.js"; import * as apiTask from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { RouterEditTask } from "@/api/indexTask"; +import { addTempTask } from "../../api/indexTaskadd"; // import dayjs from "dayjs"; export default { @@ -137,8 +141,8 @@ export default { currentPage: 1, tableDataTotal: 0, pageSize: 10, - selectedRowKeys:[], - apiTaskList:[], + selectedRowKeys: [], + apiTaskList: [], inputV1: "", time: undefined, caseId: null, @@ -151,8 +155,8 @@ export default { localStorage.setItem("chapterId", props.isactive); }; const afterVisibleChange = (bol) => { - if ( bol == true ) { - getAllCaseText() + if (bol == true) { + getAllCaseText(); } }; const tableDataFunc = () => { @@ -183,13 +187,17 @@ export default { ]; return columns; }; - const onSelectChange = (selectedRowKeys,selectedRows)=> { - if(selectedRowKeys.length>2){ - return + const onSelectChange = (selectedRowKeys, selectedRows) => { + if (selectedRowKeys.length > 2) { + return; } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; - console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length); + console.log( + "-------------%o-%o", + state.apiTaskList, + state.apiTaskList.length + ); }; const handelChangePage = (page, pageSize) => { state.currentPage = page; @@ -202,40 +210,39 @@ export default { data.map((value, index) => { let obj = { key: index, - authorId:value.authorId, - authorName:value.authorName, - companyId:value.companyId, - coverUrl:value.coverUrl, - caseid:value.id, - title:value.title, + authorId: value.authorId, + authorName: value.authorName, + companyId: value.companyId, + coverUrl: value.coverUrl, + caseid: value.id, + title: value.title, }; array.push(obj); }); state.tableData = array; - console.log('get下来的数据',state.tableData); + console.log("get下来的数据", state.tableData); }; //获取全部案例信息接口 const getAllCaseText = () => { api .queryCasesDetailList({ - "keyWord": "", - "orderAsc": true, - "orderField": "", - "pageIndex": 0, - "pageSize": 0, - "top": true + keyWord: "", + orderAsc: true, + orderField: "", + pageIndex: 0, + pageSize: 0, + top: true, }) .then((res) => { if (res.status === 200) { getTableDate(res.data.data); } }) - .catch(() => { - }); + .catch(() => {}); }; const updateTask = () => { if (props.isLevel == 1) { - for(let i = 0;i < state.apiTaskList.length;i++){ + for (let i = 0; i < state.apiTaskList.length; i++) { RouterEditTask({ chapterId: props.isactive, courseId: state.apiTaskList[i].caseid, @@ -253,35 +260,72 @@ export default { .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); - } + } } else if (props.isLevel == 2) { - console.log("state api task list: %o-length: %o", state.apiTaskList, state.apiTaskList.length ) - for(let i = 0;i < state.apiTaskList.length;i++){ - console.log(state.apiTaskList[i],'state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId'); - apiTask + console.log( + "state api task list: %o-length: %o", + state.apiTaskList, + state.apiTaskList.length + ); + for (let i = 0; i < state.apiTaskList.length; i++) { + console.log( + state.apiTaskList[i], + "state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId" + ); + apiTask .addTask({ - "courseId": state.apiTaskList[i].caseid, - "duration": 0, - "flag": true, - "name": state.apiTaskList[i].caseName, - "projectId": props.projectId, - "projectTaskId": props.projectTaskId, - "stageId": props.chooseStageId, - "type": 3, + courseId: state.apiTaskList[i].caseid, + duration: 0, + flag: true, + name: state.apiTaskList[i].caseName, + projectId: props.projectId, + projectTaskId: props.projectTaskId, + stageId: props.chooseStageId, + type: 3, }) .then(() => { - message.destroy() + message.destroy(); message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); ctx.emit("changeData", false); closeDrawer(); }) .catch(() => { - message.destroy() + message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); - } + } } else if (props.isLevel == 3) { - console.log(""); + console.log( + "state api task list: %o-length: %o", + state.apiTaskList, + state.apiTaskList.length + ); + for (let i = 0; i < state.apiTaskList.length; i++) { + console.log( + state.apiTaskList[i], + "state.apiTaskList[i].caseIdstate.apiTaskList[i].caseId" + ); + addTempTask({ + courseId: state.apiTaskList[i].caseid, + duration: 0, + flag: true, + name: state.apiTaskList[i].caseName, + projectId: props.projectId, + projectTaskId: props.projectTaskId, + stageId: props.chooseStageId, + type: 3, + }) + .then(() => { + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); + } } }; //重置案例信息 @@ -427,7 +471,7 @@ export default { .ant-table-selection-column { padding: 0px !important; padding-left: 15px !important; - .ant-table-selection{ + .ant-table-selection { display: none; } } diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index f2440d46..d2718ffb 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -76,6 +76,7 @@ import * as api from "../../api/indexDiscuss"; import * as apiTask from "../../api/indexTaskadd"; import { RouterEditTask } from "@/api/indexTask"; import { message } from "ant-design-vue"; +import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddDiscuss", props: { @@ -165,8 +166,7 @@ export default { state.checkedC1 = res.data.data.discussSettings == "true" ? true : false; }) - .catch(() => { - }); + .catch(() => {}); } }; const afterVisibleChange = (bool) => { @@ -191,17 +191,39 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); } else if (props.isLevel == 2) { - apiTask.addTask({ + apiTask + .addTask({ courseId: res.data.data.discussId, duration: res.data.data.discussExplain, name: res.data.data.discussName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId, - type: 8, - }); + type: 8, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + }); } else if (props.isLevel == 3) { console.log(""); + addTempTask({ + courseId: res.data.data.discussId, + duration: res.data.data.discussExplain, + name: res.data.data.discussName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 8, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); + }); } }; const updateDiscussInfo = () => { @@ -224,8 +246,7 @@ export default { closeDrawer(); ctx.emit("changeData", false); }) - .catch(() => { - }); + .catch(() => {}); } else { api .createDiscuss(obj) @@ -234,8 +255,7 @@ export default { closeDrawer(); ctx.emit("changeData", false); }) - .catch(() => { - }); + .catch(() => {}); } }; return { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 128063da..e2f910a1 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -112,6 +112,7 @@ import * as apitaskadd from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { RouterEditTask } from "@/api/indexTask"; import dayjs from "dayjs"; +import { addTempTask } from "../../api/indexTaskadd"; // const router = useRouter(); export default { name: "AddEval", @@ -175,10 +176,10 @@ export default { EvalListVisible: false, // addLoading:false, }); - const checkFinish = (value)=> { - state.evaluationTypeId = value.quiz_kid - state.evaluationTypeName = value.title - } + const checkFinish = (value) => { + state.evaluationTypeId = value.quiz_kid; + state.evaluationTypeName = value.title; + }; const closeDrawer = () => { ctx.emit("update:addevalVisible", false); ctx.emit("update:edit", false); @@ -188,7 +189,7 @@ export default { }; const afterVisibleChange = (bool) => { if (props.edit && bool) { - queryInvistById() + queryInvistById(); } }; const showEvalDrawer = () => { @@ -201,13 +202,15 @@ export default { courseId: Number(value.evaluationId), name: value.evaluationName, routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, + routerTaskId: props.routerTaskId || 0, type: 10, }) - .then(( ) => { - message.success(`${props.EditTestId ? "编辑" : "新增"}关卡任务成功`); + .then(() => { + message.success( + `${props.EditTestId ? "编辑" : "新增"}关卡任务成功` + ); }) - .catch(( ) => { + .catch(() => { message.error(`${props.EditTestId ? "编辑" : "新增"}关卡任务失败`); }); } else if (props.isLevel == 2) { @@ -222,39 +225,55 @@ export default { stageId: props.chooseStageId, type: 10, }) - .then(( ) => { + .then(() => { message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); }) - .catch(( ) => { + .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { console.log(""); + addTempTask({ + duration: 0, + flag: true, + courseId: Number(value.evaluationId), + name: value.evaluationName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 10, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //根据id获取测评信息 - const queryInvistById = ()=> { + const queryInvistById = () => { let objqi = { - evaluationId : props.EditEvalId - } + evaluationId: props.EditEvalId, + }; api - .queryEvaluationDetailById(objqi) - .then((res) => { - message.destroy() - message.success("获取测评信息成功"); - state.inputV1 = res.data.data.evaluationName - state.evaluationTypeName = res.data.data.evaluationTypeName - state.evaluationTypeId = res.data.data.evaluationTypeId; - state.time = [ - dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), - dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), - ]; - }) - .catch(() => { - message.destroy() - message.error("获取测量平信息失败"); - }); - } + .queryEvaluationDetailById(objqi) + .then((res) => { + message.destroy(); + message.success("获取测评信息成功"); + state.inputV1 = res.data.data.evaluationName; + state.evaluationTypeName = res.data.data.evaluationTypeName; + state.evaluationTypeId = res.data.data.evaluationTypeId; + state.time = [ + dayjs(res.data.data.evaluationStartTime, "YYYY-MM-DD"), + dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), + ]; + }) + .catch(() => { + message.destroy(); + message.error("获取测量平信息失败"); + }); + }; //创建测评信息 const createEvalText = () => { if (!state.inputV1) { @@ -277,17 +296,17 @@ export default { evaluationTag: "", updateTime: "", }; - api - .createEvaluation(obj) - .then((res) => { - updateTask(res.data.data); - message.success("创建成功"); - closeDrawer(); - ctx.emit("changeData", false); - }) - .catch(() => { - message.error("创建失败"); - }); + api + .createEvaluation(obj) + .then((res) => { + updateTask(res.data.data); + message.success("创建成功"); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error("创建失败"); + }); }; return { diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 5bca4104..dd1d6a79 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -386,6 +386,7 @@ import dayjs from "dayjs"; import AssessmentList from "../drawers/ AssessmentList.vue"; // import { toDate } from "../../api/method"; import { queryWorkDetailById } from "../../api/indexWork"; +import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddFaceteach", components: { @@ -446,13 +447,13 @@ export default { selfacetvisible: false, addhomeworkvisible: false, addtestvisible: false, - inputV1: "", - inputV2: "", + inputV1: null, + inputV2: null, inputV3: "", - inputV4: "", - inputV5: "", - inputV6: "", - inputV7: "", + inputV4: null, + inputV5: null, + inputV6: null, + inputV7: null, testV1: "", radioV1: "", radioV2: "", @@ -598,19 +599,21 @@ export default { } else { let obj = { address: state.inputV4, - afterStart: state.inputV6, applyFlag: 1, attach: JSON.stringify(state.fileList), - beforeEnd: state.inputV7, - beforeStart: state.inputV5, - // beginTime: dayjs(state.chooseTime[0]).format("YYYY-MM-DD"), + afterStart: state.inputV6 || 0, + beforeEnd: state.inputV7 || 0, + beforeStart: state.inputV5 || 0, + // beginTime: dayjs(state.chooseTime[0]).format("YYYY-MM-DD hh-mm-ss"), beginTime: parseInt( new Date(state.chooseTime[0].$d).getTime() / 1000 ), + // beginTime: "", completeType: state.radioV1 == "1" ? 2 : 1, description: state.textV1, - // endTime: dayjs(state.chooseTime[1]).format("YYYY-MM-DD"), - endTime: parseInt(new Date(state.chooseTime[0].$d).getTime() / 1000), + // endTime: dayjs(state.chooseTime[1]).format("YYYY-MM-DD hh-mm-ss"), + endTime: parseInt(new Date(state.chooseTime[1].$d).getTime() / 1000), + // endTime: "", evalFlag: state.checkedAssessment == true ? 1 : 0, evaluateId: state.chooseMent == null ? 0 : state.chooseMent.assessmentId, @@ -624,7 +627,7 @@ export default { signWordFlag: 0, teacherId: 0, testId: 0, - teacher: state.inputV2, + // teacher: state.inputV2, }; if (props.edit) { @@ -699,7 +702,24 @@ export default { message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + addTempTask({ + courseId: res.data.data.offcoursePlanId, + duration: 0, + name: res.data.data.name, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 2, + }) + .then(() => { + message.success( + `${props.EditFaceId ? "编辑" : "新增"}阶段任务成功` + ); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); + }); } }; const closeTag = () => { diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 7a8fa48c..1d1a7862 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -116,6 +116,7 @@ import { } from "@/api/indexWork"; import { ProjectEditTask, RouterEditTask } from "@/api/indexTask"; import dayjs from "dayjs"; +import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddHomework", @@ -363,6 +364,22 @@ export default { }); } else if (props.isLevel == 3) { console.log(""); + addTempTask({ + courseId: res.data.data.workId, + name: res.data.data.workName, + projectId: props.edit ? props.projectId : 0, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 4, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + state.addLoading = false; + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 4c02bc58..b1df2fb8 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -106,6 +106,7 @@ import { message } from "ant-design-vue"; import AssessmentList from "./ AssessmentList.vue"; import { RouterEditTask } from "@/api/indexTask"; import * as api from "../../api/indexInvist"; +import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddInvist", components: { @@ -248,6 +249,22 @@ export default { }); } else if (props.isLevel == 3) { console.log(""); + addTempTask({ + courseId: state.assessment.assessmentId, + name: state.assessment.name, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 11, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index 5f250ccb..6e2bbaf6 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -124,14 +124,17 @@
直播封面:
-
+
@@ -320,6 +323,7 @@ import * as api from "../../api/indexLiveBroadcast"; import * as apiTask from "../../api/indexTaskadd"; import { toDate } from "@/api/method"; import { RouterEditTask } from "@/api/indexTask"; +import { addTempTask } from "../../api/indexTaskadd"; import dayjs from "dayjs"; // import { useRouter } from "vue-router"; function getBase64(img, callback) { @@ -328,7 +332,6 @@ function getBase64(img, callback) { reader.readAsDataURL(img); } - export default { name: "AddLive", props: { @@ -471,6 +474,7 @@ export default { state.radioV1 = res.data.data.standardSettings; //state.= res.data.data state.assessmentId = res.data.data.assessmentId; + state.imageUrl = res.data.data.liveCover; }) .catch(() => { message.error(`查询失败`); @@ -486,6 +490,7 @@ export default { const handleChange = (info) => { if (info.file.status === "uploading") { state.loading = true; + console.log("info", info); return; } @@ -494,6 +499,7 @@ export default { getBase64(info.file.originFileObj, (base64Url) => { state.imageUrl = base64Url; state.loading = false; + console.log("imgURL", state.imageUrl); }); } @@ -558,6 +564,22 @@ export default { }); } else if (props.isLevel == 3) { console.log(""); + addTempTask({ + courseId: res.data.data.liveId, + duration: res.data.data.duration, + name: res.data.data.liveName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 6, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //创建直播 @@ -593,7 +615,7 @@ export default { afterSignIn: state.inputV6, beforeSignIn: state.inputV7, assessmentId: state.assessmentId == null ? 0 : state.assessmentId, - // liveCover: state.fileList,//直播封面 + liveCover: state.imageUrl, //直播封面 liveDuration: state.inputV2, liveEndTime: endTime, liveStartTime: startTime, @@ -617,8 +639,7 @@ export default { updateTask(res); closeDrawer(); }) - .catch(() => { - }); + .catch(() => {}); } else { api .createLiveBroadcast(state.obj) @@ -627,8 +648,7 @@ export default { updateTask(res); closeDrawer(); }) - .catch(() => { - }); + .catch(() => {}); } }; diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 11377929..880bdd26 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -59,7 +59,9 @@
已选择 {{ selectedRowKeys.length }}已选择 + {{ selectedRowKeys.length }} + 项 列表选项总计:{{ tableDataTotal }} (index % 2 === 1 ? 'table-striped' : null) " :row-selection="{ - selectedRowKeys:selectedRowKeys, - onChange:onSelectChange, - onSelect:onSelected, - }" + selectedRowKeys: selectedRowKeys, + onChange: onSelectChange, + onSelect: onSelected, + }" :columns="tableDataFunc()" :data-source="tableData" :loading="tableDataTotal === -1 ? true : false" @@ -113,6 +115,7 @@ import * as apiTask from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { RouterEditTask } from "@/api/indexTask"; import dayjs from "dayjs"; +import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddOnline", props: { @@ -172,7 +175,7 @@ export default { time: undefined, assessmentId: null, assessmentName: "", - selectedRowKeys:[], + selectedRowKeys: [], tableData: [], currentPage: 1, tableDataTotal: 0, @@ -238,15 +241,15 @@ export default { const onSelected = (record) => { state.assessmentId = record.assessmentId; state.assessmentName = record.name; - } - const onSelectChange = (selectedRowKeys,b) => { - state.selectedRowKeys = selectedRowKeys + }; + const onSelectChange = (selectedRowKeys, b) => { + state.selectedRowKeys = selectedRowKeys; console.log(b); - } + }; //清空所选 - const clearLine = ()=> { - state.selectedRowKeys=[] - } + const clearLine = () => { + state.selectedRowKeys = []; + }; const handelChangePage = (page, pageSize) => { state.currentPage = page; state.pageSize = pageSize; @@ -257,7 +260,7 @@ export default { let array = []; data.map((value, index) => { let obj = { - key: index+1, + key: index + 1, assessmentId: value.assessmentId, num: value.essayQuestionVoList.length, name: value.assessmentName ? value.assessmentName : "-", @@ -283,8 +286,7 @@ export default { state.tableDataTotal = Number(res.data.data.total); } }) - .catch(() => { - }); + .catch(() => {}); }; const updateTask = () => { if (props.isLevel == 1) { @@ -297,14 +299,14 @@ export default { type: 1, }) .then(() => { - message.destroy() + message.destroy(); message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); ctx.emit("changeData", false); closeDrawer(); state.addLoading = false; }) .catch(() => { - message.destroy() + message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); }); } else if (props.isLevel == 2) { @@ -318,17 +320,34 @@ export default { type: 1, }) .then(() => { - message.destroy() + message.destroy(); message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); ctx.emit("changeData", false); closeDrawer(); }) .catch(() => { - message.destroy() + message.destroy(); message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + addTempTask({ + courseId: state.assessmentId, + name: state.assessmentName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 1, + }) + .then(() => { + message.destroy(); + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.destroy(); + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //重置在线信息 diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue index 4622d2c4..3e56db6a 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -558,6 +558,7 @@ export default { }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); + closeDrawer(); }) .catch(() => { message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index ab154f9b..09d99af8 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -92,6 +92,7 @@ import * as api from "../../api/indexExternalChain"; import * as apiTask from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import { RouterEditTask } from "@/api/indexTask"; +import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddRef", props: { @@ -159,7 +160,6 @@ export default { }; const afterVisibleChange = () => { - if (props.edit) { queryRef(); } @@ -202,7 +202,9 @@ export default { type: 7, }) .then(() => { - message.success(`${props.EditTestId ? "编辑" : "新增"}阶段任务成功`); + message.success( + `${props.EditTestId ? "编辑" : "新增"}阶段任务成功` + ); ctx.emit("changeData", false); closeDrawer(); }) @@ -211,6 +213,24 @@ export default { }); } else if (props.isLevel == 3) { console.log(""); + addTempTask({ + courseId: res.data.data.linkId, + name: res.data.data.linkName, + projectId: props.projectId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 7, + }) + .then(() => { + message.success( + `${props.EditTestId ? "编辑" : "新增"}阶段任务成功` + ); + ctx.emit("changeData", false); + closeDrawer(); + }) + .catch(() => { + message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); + }); } }; //创建外链 @@ -238,9 +258,7 @@ export default { message.success("编辑成功"); updateTask(res); }) - .catch(() => { - - }); + .catch(() => {}); } else { api .createExternalChain(obj) @@ -248,9 +266,7 @@ export default { message.success("提交成功"); updateTask(res); }) - .catch(() => { - - }); + .catch(() => {}); } }; // 查询任务 diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index f3787e95..202b0912 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -79,14 +79,14 @@
- 选择试卷 - + type="primary" + style="width: 100px; margin-left: 35px" + class="outer" + @click.prevent + @click="selectTest()" + > + 选择试卷 + - + + diff --git a/src/components/drawers/EvList.vue b/src/components/drawers/EvList.vue index 929bfa48..257dbd95 100644 --- a/src/components/drawers/EvList.vue +++ b/src/components/drawers/EvList.vue @@ -77,7 +77,7 @@ + + .opat { + .opacationt { + display: flex; + align-items: center; + justify-content: center; + .ant-switch-checked { + background-color: #5dc988; + } + .showt { + // margin-top: 10px; + display: flex; + margin-left: 10px; + height: 23px; + position: relative; + .bi { + // margin-top: 10px; + width: 63px; + height: 23; + background-color: #5dc988; + line-height: 23px; + position: absolute; + z-index: 998; + color: #ffffff; + border-radius: 4px; + } + .xuan { + width: 63px; + height: 23px; + background-color: #f2f6fc; + line-height: 23px; + // display: none; + position: absolute; + z-index: 998; + color: #5dc988; + border-radius: 4px; + } + } + } + } + .racona { + display: flex; + align-items: center; + height: 100%; + .img { + width: 17px; + height: 14px; + background-image: url("../../assets/images/leveladd/z1.png"); + // position: absolute; + // left: -40px; + } + .ch { + margin-left: 10px; + } + } + .footbtn { + width: 100%; + height: 80px; + margin-top: 16px; + // flex: 1; + background-color: #fff; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07); + display: flex; + justify-content: end; + .btnbox { + display: flex; + margin-right: 36px; + height: 80px; + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + flex-shrink: 0; + margin: 21px 0px 19px 14px; + cursor: pointer; + white-space: nowrap; + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } + .btn1 { + background-color: #409eff; + .btnText { + color: #ffffff; + } + } + .btn2 { + background-color: #ffffff; + .btnText { + color: #409eff; + } + } + } + } +} + \ No newline at end of file From a663dbe2b27fa0f133c2ab84afc26a9701e968cc Mon Sep 17 00:00:00 2001 From: lixg Date: Sat, 26 Nov 2022 15:09:08 +0800 Subject: [PATCH 15/22] =?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/api/config.js | 25 ++++++++++++------------- src/api/index1.js | 4 ++-- src/components/NavTop.vue | 2 +- src/main.js | 13 ++++++++++--- src/views/learningpath/LearningPath.vue | 3 --- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/api/config.js b/src/api/config.js index a20b0f8b..b0067b9c 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-11-25 17:33:03 + * @LastEditTime: 2022-11-26 13:44:54 * @FilePath: /fe-manage/src/api/config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -14,7 +14,6 @@ import axios from "axios"; // "application/x-www-form-urlencoded"; axios.defaults.withCredentials = true; - const http = axios.create({ baseURL: "/manageApi", timeout: 1000 * 5, @@ -24,18 +23,18 @@ const http = axios.create({ http.interceptors.request.use( (config) => { - const token = localStorage.getItem("token"); - // const token = getCookie('token') - // console.log('token', token) - if (token) { - config.headers.token = token; //测试1111 - } else { - console.log("当前请求页面无token,请执行操作!!!"); + // const token = localStorage.getItem("token"); + // // const token = getCookie('token') + // // console.log('token', token) + // if (token) { + // config.headers.token = token; //测试1111 + // } else { + // console.log("当前请求页面无token,请执行操作!!!"); - // 此处测试默认配置token - config.headers.token = "123456"; - // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzODQ5MTgsImV4cCI6MTY2OTM5MjExOCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.7c3af587cbacf68180e86681442e06ffd33c65a78fc835aaac34d0c773752d99"; - } + // // 此处测试默认配置token + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njk0Mjk1ODYsImV4cCI6MTY2OTQzNjc4NiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.e33e1ab87a82079279e3907428dd81076336d53fcb9022891386fed2fa90e0cc"; + // // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzODQ5MTgsImV4cCI6MTY2OTM5MjExOCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.7c3af587cbacf68180e86681442e06ffd33c65a78fc835aaac34d0c773752d99"; + // } return config; }, (err) => { diff --git a/src/api/index1.js b/src/api/index1.js index 43c80689..953a30b6 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-25 14:56:59 + * @LastEditTime: 2022-11-26 14:57:17 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -105,7 +105,7 @@ export const getAudienceInfo = (obj) => http.post('/admin/orgStruct/getAudienceI //获取授权(修改版) export const optionAuthPerm = (obj) => http.post('/admin/AuthPerm/optionAuthPerm', obj) //获取用户登录 -export const getUser = () => http.post('/admin/CheckUser/login') +export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true }) // 获取组织结构树 diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index fecadcd2..dca09764 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -96,7 +96,6 @@ export default { state.visible = true; console.log("点击下载", state.visible); }; - const getUser = () => { api .getUser() @@ -111,6 +110,7 @@ export default { }); }; getUser(); + return { ...toRefs(state), changeRole, diff --git a/src/main.js b/src/main.js index 49f33316..ae142895 100644 --- a/src/main.js +++ b/src/main.js @@ -1,3 +1,11 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-09 09:26:26 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-26 14:54:37 + * @FilePath: /fe-manage/src/main.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ import { createApp } from 'vue' import App from './App.vue' import router from './router' @@ -8,6 +16,8 @@ import 'element-plus/dist/index.css' import "@/assets/scss/common.scss" import Antd from 'ant-design-vue'; import 'ant-design-vue/dist/antd.css'; +// import axios from 'axios' +// axios.defaults.withCredentials = true; // import zhCN from 'ant-design-vue/es/locale/zh_CN'; const app = createApp(App) // 清理控制台warn信息 @@ -18,7 +28,4 @@ app.config.warnHandler = () => null; app.use(Antd); app.use(router); app.use(store); - app.mount('#app'); - - diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index 461e454e..cc038ca8 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1649,9 +1649,6 @@ export default { onMounted(() => { // console.log("执行"); getLearnPath(); - // let cookie = - // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzNjI4OTAsImV4cCI6MTY2OTM3MDA5MCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.2e68ae110cf0e8f157d8312301c0ca8104d6ec2a2a294052d5497c06019ed3d8"; - // setCookie("token", cookie, 10); }); return { From 093feb913e10d8fff788dbf91ef77f722e9c8dcc Mon Sep 17 00:00:00 2001 From: Ggysh-7 <102372376+Ggysh-7@users.noreply.github.com> Date: Sat, 26 Nov 2022 16:06:15 +0800 Subject: [PATCH 16/22] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E3=80=81=E6=A1=88=E4=BE=8B=E7=9A=84=E6=B7=BB=E5=8A=A0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=87=8D=E7=BD=AE=E7=BC=96=E8=BE=91=E5=B7=B2=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/config.js | 2 +- src/api/indexOnline.js | 18 ++ src/components/drawers/AddCase.vue | 72 ++++++-- src/components/drawers/AddOnline.vue | 207 +++++++++++++++------- src/views/learningpath/LevelAddDetail.vue | 17 +- vue.config.js | 2 +- 6 files changed, 232 insertions(+), 86 deletions(-) create mode 100644 src/api/indexOnline.js diff --git a/src/api/config.js b/src/api/config.js index a20b0f8b..06827537 100644 --- a/src/api/config.js +++ b/src/api/config.js @@ -34,7 +34,7 @@ http.interceptors.request.use( // 此处测试默认配置token config.headers.token = "123456"; - // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzODQ5MTgsImV4cCI6MTY2OTM5MjExOCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.7c3af587cbacf68180e86681442e06ffd33c65a78fc835aaac34d0c773752d99"; + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njk0NDkwMzMsImV4cCI6MTY2OTQ1NjIzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.e79f798576a6886f38e15e87a0534bb023ecc19c079d5e9fb92d6241a82446c8"; } return config; }, diff --git a/src/api/indexOnline.js b/src/api/indexOnline.js new file mode 100644 index 00000000..b69d20ec --- /dev/null +++ b/src/api/indexOnline.js @@ -0,0 +1,18 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-07 17:06:45 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2022-11-21 16:39:00 + * @FilePath: /fe-manage/src/api/index.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +import http from "./config"; +// import qs from 'qs'; + + +// 接口-请求 +//查询在线课信息列表接口 +export const queryOnlinelList = (obj) => http.post('/queryOnlineClassesDetailList', obj) + + + diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 4d71ef10..202ffb9e 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -26,13 +26,13 @@
-
+
搜索
@@ -45,6 +45,23 @@
+ { let data = tableData; let array = []; - data.map((value, index) => { + if(state.searching){ + data.map((value, index) => { + let obj = { + key: index, + authorId: value.authorId, + authorName: value.authorName, + companyId: value.companyId, + coverUrl: value.coverUrl, + id: value.id, + casesId: value.casesId, + title: value.title, + }; + if(obj.title == state.inputV1){ + array.push(obj); + } + }); + } else { + data.map((value, index) => { let obj = { key: index, authorId: value.authorId, @@ -218,6 +252,7 @@ export default { }; array.push(obj); }); + } state.tableData = array; }; //获取全部案例信息接口 @@ -227,8 +262,8 @@ export default { keyWord: state.inputV1, orderAsc: true, orderField: "", - pageIndex: 0, - pageSize: 0, + pageIndex: state.currentPage, + pageSize: state.pageSize, top: true, }) .then((res) => { @@ -313,13 +348,29 @@ export default { } } }; + //搜索案例列表 + const searchList = ()=> { + if(state.inputV1 !== ''){ + state.searching = true + getAllCaseText() + }else { + state.searching = false + resetCase() + } + } //重置案例信息 const resetCase = () => { state.inputV1 = "" + state.searching = false state.selectedRowKeys=[] state.currentPage = 1 getAllCaseText(); }; + onMounted(()=>{ + // let cookie = + // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2Njk0MjgwNTAsImV4cCI6MTY2OTQzNTI1MCwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.9ea5ce6d4cd43c2c17f21a293e4dc0d362c2a404b9d50fae5c49fed5a238fb1a"; + // setCookie("token", cookie, 10); + }) return { ...toRefs(state), afterVisibleChange, @@ -330,6 +381,7 @@ export default { getTableDate, updateTask, getAllCaseText, + searchList, resetCase, }; }, @@ -447,10 +499,6 @@ export default { .main_table { position: relative; padding-bottom: 80px; - .classify { - margin-left: 10px !important; - padding-left: 9px !important; - } .ant-checkbox-wrapper { align-items: center; margin-top: -2px; diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 880bdd26..6d97c56f 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -34,6 +34,7 @@
内容分类:
-
+
搜索
@@ -72,7 +73,25 @@
+ +