diff --git a/src/api/indexInvist.js b/src/api/indexInvist.js index 31bb417f..77be057e 100644 --- a/src/api/indexInvist.js +++ b/src/api/indexInvist.js @@ -38,16 +38,15 @@ import http from "./config"; // 接口-请求 //创建评估 -export const createAppraiseMessage = (obj) => http.post('/survey/createAppraiseMessage', obj,); -//删除评估信息 -export const deleteAppraise = (obj) => http.post('/survey/deleteAppraise', { params: obj }) //根据ID获取评估信息详情 -export const queryAppraiseDetailById = (obj) => http.post('/survey/queryAppraiseDetailById', { params: obj }) - -//修改评估信息 -export const updateAppraiseMessage = (obj) => http.post('/survey/updateAppraiseMessage', obj) +export const queryAppraiseDetailById = (obj) => http.post('/assessment/queryAssessmentDetailById', obj,{ + headers: { + 'token': '123', + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + } + }) //获取全部评估信息接口 export const queryAssessmentDetailList = (obj) => http.post('/assessment/queryAssessmentDetailList', obj) diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index b88140e7..3a4567d3 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -25,4 +25,6 @@ export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', ob export const planList = (obj) => http.post('/admin/offcourse/planList', obj) //获取面授课列表 -export const list = (obj) => http.post('/admin/offcourse/list', obj) \ No newline at end of file +export const list = (obj) => http.post('/admin/offcourse/list', obj) + +export const addTempTask = (obj) => http.post('/admin/project//template/editTask', obj) \ No newline at end of file diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index 234da65a..bb3b9803 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -86,6 +86,10 @@ export default { type: Number, default: null, }, + titleTag: { + type: Boolean, + default: false, + } }, setup(props, ctx) { const state = reactive({ @@ -100,9 +104,10 @@ export default { }); const closeDrawer = () => { ctx.emit("update:assessmentVisible", false); + ctx.emit("update:titleTag", true); }; const afterVisibleChange = (bool) => { - console.log("state getAllInvistText", bool); + console.log("state getAllInvistText", bool,"======",props.titleTag); if (props.assessmentVisible) { getAllInvistText(); } diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 3951753b..16281b21 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -380,6 +380,23 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { + apiTask + .addTempTask({ + courseId: res.data.data.activityId, + duration: res.data.data.activityDuration, + name: res.data.data.activityName, + projectTemplateId: props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + type: 9, + }) + .then(() => { + message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); + }) + .catch(() => { + message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); + }); + console.log(""); } }; diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index ca05cb6c..f2440d46 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -192,10 +192,12 @@ export default { }); } else if (props.isLevel == 2) { apiTask.addTask({ - courseId: res.data.data.discussId, - name: res.data.data.discussName, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, + 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, }); } else if (props.isLevel == 3) { diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 2ba29abd..30e1d95b 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -23,12 +23,15 @@
-
+
已选择 0
+ + +
已选择 1 条; @@ -45,6 +48,28 @@ >创建时间: {{ assessment.time }}
+
+ 已选择 1 条; + 名称: {{ assessment1.createName }} + + 题数: {{ assessment1.essayQuestionVoList.length }} + + 创建人: {{ assessment1.createUser }} + + 创建时间: {{ assessment1.createTime }} + +
+ +
+ + +
@@ -55,6 +80,7 @@
@@ -77,6 +103,7 @@ import * as apiTask from "../../api/indexTaskadd"; import { message } from "ant-design-vue"; import AssessmentList from "./ AssessmentList.vue"; import { RouterEditTask } from "@/api/indexTask"; +import * as api from "../../api/indexInvist"; export default { name: "AddInvist", components: { @@ -139,10 +166,13 @@ export default { assessmentId: null, assessmentName: "", assessment: null, + assessment1: null, assessmentVisible: false, + titleTag:false, }); const getCheckedAss = (ass) => { state.assessment = ass; + state.assessment1 =null; }; const closeDrawer = () => { ctx.emit("update:addinvistVisible", false); @@ -159,8 +189,24 @@ export default { state.assessmentId = null; state.assessmentName = ""; state.assessment = null; + queryInfo(); + + }; + const queryInfo = () => { + if (props.edit) { + state.titleTg =false; + //编辑讨 + api + .queryAppraiseDetailById({ assessmentId: props.EditInvistId }) + .then((res) => { + //更新讨论信息 + state.assessment1=res.data.data; + + }) + .catch(() => { + }); + } }; - const updateTask = () => { if (state.assessment == null) { return message.warning("请选择评估"); diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 351d9b8d..44cb118b 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -1854,7 +1854,7 @@ export default { state.addactivevisible = true; state.EditActiveId = id; state.projectTaskId = eleId; - console.log("active=======", id); + }; const showDrawerAddEval = (id, eleId) => { state.addevalvisible = true; @@ -1863,12 +1863,12 @@ export default { state.projectTaskId = eleId; }; const showDrawerAddInvist = (id, eleId) => { - console.log(id, eleId, "213312"); + state.EditInvistId = id; state.addinvistvisible = true; state.projectTaskId = eleId; }; const showDrawerAddVote = (id, eleId) => { - console.log(id, eleId, "95835325932953295325"); + state.addvotevisible = true; state.EditVoteId = id; state.projectTaskId = eleId; diff --git a/src/views/projectcenter/TemplateLibrary.vue b/src/views/projectcenter/TemplateLibrary.vue index 0eaf0d2f..e271b643 100644 --- a/src/views/projectcenter/TemplateLibrary.vue +++ b/src/views/projectcenter/TemplateLibrary.vue @@ -15,7 +15,7 @@
创建时间: - { + let date = Math.ceil(new Date(state.time).getTime() / 1000); + let obj = { - "beginTime": 0, - "name": "", + // "create_time": state.time, + "beginTime":date, + "name": state.value1, "pageNo": pagination.current, "pageSize": 10, - "status": 0 } api.templateList(obj).then((res) => { state.tableData1 = [] @@ -222,13 +226,16 @@ export default defineComponent({ } const searchLevel = () => { getLibraryList(); + /* setTimeout(() => { const result = state.tableData1.filter(item => item.name.includes(state.value1)) state.tableData1 = result; },100) + */ }; const resetLevel = () => { state.value1 = ''; + state.time = ''; getLibraryList(); getTableDate1() }; diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue index 85ce4986..e334703e 100644 --- a/src/views/projectcenter/temTask.vue +++ b/src/views/projectcenter/temTask.vue @@ -176,7 +176,7 @@ @changeData="updateTableData" :isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:EditOnlineId="EditOnlineId" @@ -216,7 +216,7 @@ @changeData="updateTableData" :isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" v-model:EditCaseId="EditCaseId" @@ -239,7 +239,7 @@ @changeData="updateTableData" v-model:isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:EditWorkId="EditWorkId" v-model:projectTaskId="projectTaskId" @@ -262,7 +262,7 @@ @changeData="updateTableData" :isLevel="isLevel" v-model:edit="edit" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:EditTestId="EditTestId" v-model:projectTaskId="projectTaskId" @@ -284,7 +284,7 @@ v-model:addliveVisible="addlivevisible" :isLevel="isLevel" @changeData="updateTableData" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:edit="edit" v-model:EditLiveId="EditLiveId" @@ -307,7 +307,7 @@ v-model:addrefVisible="addrefvisible" :isLevel="isLevel" @changeData="updateTableData" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:edit="edit" v-model:EditRefId="EditRefId" @@ -330,7 +330,7 @@ v-model:adddiscussVisible="adddiscussvisible" v-model:edit="edit" :isLevel="isLevel" - v-model:projectId="projectId" + v-model:projectTemplateId="projectTemplateId" v-model:chooseStageId="chooseStageId" v-model:EditDiscussId="EditDiscussId" v-model:projectTaskId="projectTaskId" @@ -351,7 +351,7 @@
{ @@ -1964,7 +1965,6 @@ //打开测评的弹窗 const showEditEvalDrawer = (id, eleId) => { - console.log("222222222222222222222", id); state.addevalvisible = true; state.projectTaskId = eleId; state.EditRefId = id;