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 @@