diff --git a/src/api/config.js b/src/api/config.js index 00e5b12e..f0674203 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.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkyMTE4MzMsImV4cCI6MTY2OTIxOTAzMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.40067eca3be5d50857448005a673cbe1a48f560ff8e9c7aea4e7ff12f59c7962"; + // config.headers.token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NjkzMDA4MDksImV4cCI6MTY2OTMwODAwOSwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.bb3e0e031513761003d5c3bfeaf16e364bdf8fe7bc4cf691a05a74dc454afbfb"; } return config; }, diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 16281b21..0120c1e8 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -385,7 +385,7 @@ export default { courseId: res.data.data.activityId, duration: res.data.data.activityDuration, name: res.data.data.activityName, - projectTemplateId: props.projectTemplateId, + projectTemplateId:props.projectTemplateId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId, type: 9, diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index a61dff5b..b3aa65f0 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -32,7 +32,7 @@
-
+
搜索
@@ -149,6 +149,8 @@ export default { ctx.emit("update:edit", false); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); + state.inputV1="" + state.selectedRowKeys=[] }; const afterVisibleChange = (bol) => { if ( bol == true ) { @@ -189,7 +191,6 @@ export default { } state.selectedRowKeys = selectedRowKeys; state.apiTaskList = selectedRows; - console.log('-------------%o-%o',state.apiTaskList, state.apiTaskList.length); }; const handelChangePage = (page, pageSize) => { state.currentPage = page; @@ -199,26 +200,26 @@ export default { const getTableDate = (tableData) => { let data = tableData; let array = []; - 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, - }; - array.push(obj); - }); - state.tableData = array; - console.log('get下来的数据',state.tableData); + 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, + }; + array.push(obj); + }); + state.tableData = array; }; //获取全部案例信息接口 const getAllCaseText = () => { api .queryCasesDetailList({ - "keyWord": "", + "keyWord": state.inputV1, "orderAsc": true, "orderField": "", "pageIndex": 0, @@ -227,7 +228,7 @@ export default { }) .then((res) => { if (res.status === 200) { - getTableDate(res.data.data); + getTableDate(res.data.data); } }) .catch(() => { @@ -238,8 +239,8 @@ export default { for(let i = 0;i < state.apiTaskList.length;i++){ RouterEditTask({ chapterId: props.isactive, - courseId: state.apiTaskList[i].caseid, - name: state.apiTaskList[i].caseName, + courseId: state.apiTaskList[i].casesId, + name: state.apiTaskList[i].title, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 3, @@ -255,18 +256,16 @@ export default { }); } } 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 .addTask({ - "courseId": state.apiTaskList[i].caseid, + "courseId": state.apiTaskList[i].casesId, "duration": 0, "flag": true, - "name": state.apiTaskList[i].caseName, + "name": state.apiTaskList[i].title, "projectId": props.projectId, "projectTaskId": props.projectTaskId, - "stageId": props.chooseStageId, + "stageId": Number(props.chooseStageId), "type": 3, }) .then(() => { @@ -281,7 +280,30 @@ export default { }); } } else if (props.isLevel == 3) { - console.log(""); + 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, + "projectTemplateId": props.projectTemplateId, + "stageId": props.chooseStageId, + "type": 3, + }) + .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/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index f2440d46..a1c8a59d 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -201,7 +201,15 @@ export default { type: 8, }); } else if (props.isLevel == 3) { - console.log(""); + apiTask.addTask({ + courseId: res.data.data.discussId, + duration: res.data.data.discussExplain, + name: res.data.data.discussName, + projectId: props.projectId, + projectTaskTemplateId: props.projectTaskTemplateId || 0, + stageId: props.chooseStageId, + type: 8, + }); } }; const updateDiscussInfo = () => { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 128063da..c6748822 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -56,6 +56,7 @@ class="tag-style" v-if="evaluationTypeName != ''" :closable="true" + @close="delTag" >{{ evaluationTypeName }} @@ -91,7 +92,7 @@
- +
{ state.EvalListVisible = true; }; + //删除标签要清除子组件传过来的参数 + const delTag = ()=> { + state.evaluationTypeId= 0 + state.evaluationTypeName= "" + } + //向关卡或阶段渲染 const updateTask = (value) => { if (props.isLevel == 1) { RouterEditTask({ @@ -222,14 +228,32 @@ export default { stageId: props.chooseStageId, type: 10, }) + .then(( ) => { + message.destroy() + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + }) + .catch(( ) => { + message.destroy() + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); + } else if (props.isLevel == 3) { + apitaskadd + .addTask({ + duration:0, + flag:true, + courseId: Number(value.evaluationId), + name: value.evaluationName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 10, + }) .then(( ) => { message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); }) .catch(( ) => { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); - } else if (props.isLevel == 3) { - console.log(""); } }; //根据id获取测评信息 @@ -250,9 +274,49 @@ export default { dayjs(res.data.data.evaluationEndTime, "YYYY-MM-DD"), ]; }) - .catch(() => { + .catch((err) => { message.destroy() message.error("获取测量平信息失败"); + console.log(err,"erererrerererererer"); + }); + } + const creoredit = ()=> { + if(props.edit){ + editInvistText() + }else{ + createEvalText() + } + } + const editInvistText = ()=> { + if (!state.inputV1) { + message.destroy(); + return message.info("请输入测评名称"); + } + if (!state.evaluationTypeId) { + message.destroy(); + return message.info("请选择测评"); + } + let objei = { + evaluationName: state.inputV1, + evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), + evaluationId: props.edit ? Number(props.EditEvalId) : 0, + evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), + evaluationTypeId: state.evaluationTypeId, + evaluationTypeName: state.evaluationTypeName, + evaluationFlag: "", + evaluationPictureAddress: "", + evaluationTag: "", + updateTime: "", + } + api + .updateEvaluation(objei) + .then((res) => { + updateTask(res.data.data); + closeDrawer(); + ctx.emit("changeData", false); + }) + .catch((err) => { + console.log(err,'errrrrrrrrrrrrrrrrrrrrr'); }); } //创建测评信息 @@ -268,7 +332,7 @@ export default { let obj = { evaluationName: state.inputV1, evaluationEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"), - evaluationId: props.edit ? props.evaluationId : 0, + evaluationId: props.evaluationId , evaluationStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"), evaluationTypeId: state.evaluationTypeId, evaluationTypeName: state.evaluationTypeName, @@ -281,12 +345,10 @@ export default { .createEvaluation(obj) .then((res) => { updateTask(res.data.data); - message.success("创建成功"); closeDrawer(); ctx.emit("changeData", false); }) .catch(() => { - message.error("创建失败"); }); }; @@ -295,9 +357,12 @@ export default { afterVisibleChange, checkFinish, closeDrawer, + delTag, //增改 + creoredit, createEvalText, queryInvistById, + editInvistText, showEvalDrawer, updateTask, }; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 5bca4104..6d7d2377 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -699,7 +699,26 @@ export default { message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + let editObj = { + courseId: res.data.data.offcoursePlanId, + duration: 0, + name: res.data.data.name, + projectTemplateId: props.projecTempaltetId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 2, + }; + // 新增编辑或新增项目 + ProjectEditTask(editObj) + .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..444412c1 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -362,7 +362,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + let editObj = { + 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, + }; + ProjectEditTask(editObj) + .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 30e1d95b..e09b56ab 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -23,53 +23,55 @@
-
+
已选择 0 条
- - -
- 已选择 1 条; - 名称： {{ assessment.name }} - - 题数： {{ assessment.num }} - - 创建人： {{ assessment.creator }} - - 创建时间： {{ assessment.time }} - +
+ 已选择 1 条; + 名称： {{ assessment.name }} + + 题数： {{ assessment.num }} + + 创建人： + {{ assessment.creator }} + + 创建时间： + {{ assessment.time }} + +
+
+ 已选择 1 条; + 名称： + {{ assessment1.createName }} + + 题数： + {{ + assessment1.essayQuestionVoList.length + }} + + 创建人： + {{ assessment1.createUser }} + + 创建时间： + {{ assessment1.createTime }} + +
-
- 已选择 1 条; - 名称： {{ assessment1.createName }} - - 题数： {{ assessment1.essayQuestionVoList.length }} - - 创建人： {{ assessment1.createUser }} - - 创建时间： {{ assessment1.createTime }} - -
- -
- - -
@@ -168,11 +170,11 @@ export default { assessment: null, assessment1: null, assessmentVisible: false, - titleTag:false, + titleTag: false, }); const getCheckedAss = (ass) => { state.assessment = ass; - state.assessment1 =null; + state.assessment1 = null; }; const closeDrawer = () => { ctx.emit("update:addinvistVisible", false); @@ -190,21 +192,18 @@ export default { state.assessmentName = ""; state.assessment = null; queryInfo(); - }; const queryInfo = () => { if (props.edit) { - state.titleTg =false; + state.titleTg = false; //编辑讨 api .queryAppraiseDetailById({ assessmentId: props.EditInvistId }) .then((res) => { //更新讨论信息 - state.assessment1=res.data.data; - + state.assessment1 = res.data.data; }) - .catch(() => { - }); + .catch(() => {}); } }; const updateTask = () => { @@ -248,7 +247,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + 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..aa50f373 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -557,7 +557,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + courseId: res.data.data.liveId, + duration: res.data.data.duration, + name: res.data.data.liveName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 6, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); } }; //创建直播 diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index 11377929..c7b3016f 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -328,7 +328,25 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + apiTask + .addTask({ + courseId: state.assessmentId, + name: state.assessmentName, + projectTemplateId: props.projectTemplateId, + 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 09741fb7..70b83bd1 100644 --- a/src/components/drawers/AddProject.vue +++ b/src/components/drawers/AddProject.vue @@ -1,15 +1,14 @@