diff --git a/package-lock.json b/package-lock.json index b9a94c4b..50f55a04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19867,7 +19867,7 @@ }, "sortablejs": { "version": "1.15.0", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.15.0.tgz", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz", "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" }, "source-map": { @@ -20676,7 +20676,7 @@ }, "vuedraggable": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz", + "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz", "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", "requires": { "sortablejs": "1.14.0" @@ -20684,7 +20684,7 @@ "dependencies": { "sortablejs": { "version": "1.14.0", - "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz", "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" } } diff --git a/src/api/indexTaskadd.js b/src/api/indexTaskadd.js index 3a4567d3..0beb6673 100644 --- a/src/api/indexTaskadd.js +++ b/src/api/indexTaskadd.js @@ -27,4 +27,4 @@ export const planList = (obj) => http.post('/admin/offcourse/planList', obj) //获取面授课列表 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 +export const addTempTask = (obj) => http.post('/admin/project/template/editTask', obj) \ No newline at end of file diff --git a/src/api/indexVote.js b/src/api/indexVote.js index 11b05e52..5bc1b809 100644 --- a/src/api/indexVote.js +++ b/src/api/indexVote.js @@ -42,10 +42,16 @@ import qs from 'qs'; // 接口-请求 //基础票数上传接口 -export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj) +export const baseVoteupload = (obj) => http.post('/vote/baseVoteupload', obj,{ + headers: { + 'token': '123', + 'Content-Type' : 'multipart/form-data', + } +}) //创建题干信息接口 -export const createOptionMessage = (obj) => http.post('/vote/createOptionMessage', obj) +export const createStemMessage = (obj) => http.post('/vote/createOptionMessage', obj) + //投票信息创建接口 export const createVote = (obj) => http.post('/vote/createVote', obj) @@ -54,7 +60,12 @@ export const createVote = (obj) => http.post('/vote/createVote', obj) export const deleteVoteMessage = (obj) => http.post('/vote/deleteVoteMessage', { params: obj }) //删除题干信息接口 -export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', { params: obj }) +export const deleteVoteStem = (obj) => http.post('/vote/deleteVoteStem', obj,{ + headers: { + 'token': '123', + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + } +}) //删除题选项息接口 export const deleteVoteStemOption = (obj) => http.post('/vote/deleteVoteStemOption', { params: obj }) @@ -64,15 +75,24 @@ export const editVote = (obj) => http.post('/vote/editVote', obj) //根据题干ID获取题干信息 export const queryStemByStemId = (obj) => http.post('/vote/queryStemByStemId', obj,{ - headers: {'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'} -}) + headers: { + 'token': '123', + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + } + }) //修改题干信息接口 export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', obj); //上传组件 export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj })); - +//根据题干ID获取投票任务 +export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj,{ + headers: { + 'token': '123', + 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8', + } +}) // 测试方法 // import * as api from '../../api/index' diff --git a/src/components/drawers/ AssessmentList.vue b/src/components/drawers/ AssessmentList.vue index bb3b9803..d5268f12 100644 --- a/src/components/drawers/ AssessmentList.vue +++ b/src/components/drawers/ AssessmentList.vue @@ -82,7 +82,7 @@ export default { type: Boolean, default: false, }, - isface: { + assessmentId: { type: Number, default: null, }, @@ -101,10 +101,12 @@ export default { tableDataTotal: 0, tableData: [], selectedRowKeys: [], + assessmentId:null, }); const closeDrawer = () => { ctx.emit("update:assessmentVisible", false); ctx.emit("update:titleTag", true); + }; const afterVisibleChange = (bool) => { console.log("state getAllInvistText", bool,"======",props.titleTag); @@ -150,14 +152,10 @@ export default { const rowSelection = { type: "radio", onSelect: (selectedRows) => { - state.assessment = selectedRows; - console.log("selectedRows=======", state.assessment); - if (props.isface == 1) { - ctx.emit("faceAssess", state.assessment); - } else { - ctx.emit("checkedAss", state.assessment); - } - + state.assessment =selectedRows; + state.assessmentId = selectedRows.assessmentId; + ctx.emit("checkedAss", state.assessment); + ctx.emit("update:assessmentId", state.assessmentId); state.selectedRowKeys = []; closeDrawer(); }, diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 35841804..9c888fda 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -282,6 +282,10 @@ export default { type: Number, default: null, }, + projectTemplateId:{ + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -370,7 +374,7 @@ export default { name: res.data.data.activityName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 9, }) .then(() => { @@ -385,9 +389,9 @@ 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, + stageId: props.chooseStageId || 0, type: 9, }) .then(() => { @@ -397,7 +401,7 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); - console.log(""); + } }; //创建活动 diff --git a/src/components/drawers/AddCase.vue b/src/components/drawers/AddCase.vue index 202ffb9e..603ffe64 100644 --- a/src/components/drawers/AddCase.vue +++ b/src/components/drawers/AddCase.vue @@ -299,10 +299,8 @@ export default { apiTask .addTask({ courseId: state.apiTaskList[i].casesId, - duration: 0, - flag: true, name: state.apiTaskList[i].title, - projectId: props.projectId, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId, stageId: Number(props.chooseStageId), type: 3, @@ -332,7 +330,7 @@ export default { name: state.apiTaskList[i].caseName, projectId: props.projectId, projectTemplateId: props.projectTemplateId, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 3, }) .then(() => { diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index d2718ffb..b09e50f3 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -128,6 +128,10 @@ export default { type: Number, default: null, }, + projectTemplateId:{ + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -194,11 +198,10 @@ export default { 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, + stageId: props.chooseStageId || 0, type: 8, }) .then(() => { @@ -211,11 +214,10 @@ export default { console.log(""); addTempTask({ courseId: res.data.data.discussId, - duration: res.data.data.discussExplain, name: res.data.data.discussName, - projectId: props.projectId, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 8, }) .then(() => { diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 0891faf3..ff4cf07e 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -228,7 +228,7 @@ export default { name: value.evaluationName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 10, }) .then(() => { @@ -240,15 +240,12 @@ export default { 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, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 10, }) .then(() => { diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 534017f5..e736d368 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -30,9 +30,9 @@
@@ -49,29 +49,20 @@
- {{ chooseCourseName }} +
+ + 删除课程 +
+
@@ -82,7 +73,7 @@
分钟 @@ -162,7 +153,7 @@
分钟
@@ -206,34 +197,13 @@ border-radius: 8px; overflow: hidden; " - :v-model:value="inputV6" + :v-model:value="afterStart" > 分钟
-
-
签退
-
-
-
- 结束前： - - 分钟（提前签退则记为早退） -
-
+ +
@@ -241,14 +211,11 @@ 完成标准设置：
- - 仅签到 - 签到、签退全部完成 - + + + 仅签到 + +
@@ -256,24 +223,18 @@ 其他设置：
- 学员请假后记为任务完成
-
+
现场参与：
-
- - 允许项目内人员临时到场参加 - 允许项目外人员临时到场参加 - +
+ 允许项目内人员临时到场参加 + 允许项目外人员临时到场参加
@@ -281,27 +242,29 @@ 评估：
- 需要评估 - - {{ chooseMentName }} + 需要评估
+
+
+
+
+ +
+ + 删除评估 +
+ + +
+
+ +
@@ -310,6 +273,11 @@
+
+ + 删除作业 +
+
@@ -317,39 +285,33 @@
- {{ chooseWorkName }} +
- 配置考试： + 配置考试:
+
+ + 删除考试 +
+
- +
@@ -373,11 +335,7 @@ - + @@ -394,8 +352,7 @@ import { debounce } from "lodash-es"; import { queryFaceDetailById, editPlan } from "../../api/indexFace"; import dayjs from "dayjs"; import AssessmentList from "../drawers/ AssessmentList.vue"; -// import { toDate } from "../../api/method"; -import { queryWorkDetailById } from "../../api/indexWork"; +// import { toDate } from "../../api/method";、 import { addTempTask } from "../../api/indexTaskadd"; export default { name: "AddFaceteach", @@ -458,64 +415,53 @@ export default { selfacetvisible: false, addhomeworkvisible: false, addtestvisible: false, - memberValue: null, + memberValue: { + value:"", + label:"" + }, fetching: false, totalPages: 0, currentPage: 1, tableDataTotal: 100, memberId: 0, pageSize: 10, - inputV1: "", - inputV2: "", - inputV3: "", - inputV4: null, - inputV5: null, - inputV6: null, - inputV7: null, - testV1: "", - radioV1: "", - radioV2: "", - textV1: "", - checkedHolidy: false, - checkedAssessment: false, + courseName: "", + duration: "", + address: null, + beforeStart: null, + afterStart: null, + description: "", chooseTime: [], fileList: [], chooseCourse: null, //选择的在线课程 - chooseCourseName: null, //选择的课程的名字 - face: true, //面授传给配置作业的标识 - chooseWork: null, //配置的work - chooseWorkName: null, //配置的work名字 - chooseWorkId: null, //配置的work ID - chooseMent: null, - chooseMentName: null, + assessmentId:null, + EditTestId:null, + EditWorkId:null, assessmentVisible: false, - isface: 1, + + }); const clear = () => { - state.inputV1 = null; - state.inputV2 = null; - state.inputV3 = null; - state.inputV4 = null; - state.inputV5 = null; - state.inputV6 = null; - state.inputV7 = null; + state.courseName = null; + state.memberValue = null; + state.duration = null; + state.address = null; + state.beforeStart = null; + state.afterStart = null; state.chooseTime = []; - state.textV1 = null; - state.radioV1 = ""; - state.radioV2 = ""; - state.checkedHolidy = false; - state.checkedAssessment = false; - state.chooseMent = null; - state.chooseWork = null; - state.chooseWorkId = null; - state.chooseWorkName = null; + state.description = null; + state.onlySign =false; + state.completeLeave =false; + state.projectMember =false; + state.noProjectMember =false; state.chooseCourse = null; - state.chooseCourseName = null; + state.EditTestId =null; + state.assessmentId=null; + state.EditWorkId=null; + }; const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); - state.radioV1 = ""; - state.radioV2 = ""; localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); clear(); @@ -524,38 +470,48 @@ export default { if (bool && props.edit) { // 该页面显示同时 edit为true 时，发送查询请求, queryFaceTeach(); + } }; + + const logC= e => { + state.chooseCourse=null; + console.log(e); + }; + const logW = e => { + state.EditWorkId=null; + console.log(e); + }; + const logT= e => { + state.EditTestId=null; + console.log(e); + }; + const logA= e => { + state.EditEvalId=null; + console.log(e); + }; + const showDrawerSelFacet = () => { state.selfacetvisible = true; }; const showDrawerAddHomework = () => { state.addhomeworkvisible = true; + }; const showDrawerAddTest = () => { state.addtestvisible = true; }; - const cloradio1 = (value) => { - if (value != "") { - state.radioV1 = ""; - } - }; - const cloradio2 = (value) => { - if (value != "") { - state.radioV2 = ""; - } - }; + + //查询面授 const queryFaceTeach = () => { - //暂时写一个假的offcoursePlanId queryFaceDetailById(props.EditFaceId).then((res) => { - // state.inputV1 = res.data.data.name; - // state.inputV2 = res.data.data.teacherId; console.log("获取到了面授课开课详情", res.data.data); let result = res.data.data; - state.inputV1 = result.name; - state.textV1 = result.description; - state.inputV2 = result.teacher; + state.courseName = result.name; + state.description = result.description; + state.memberValue= {value:result.teacherId,label:result.teacher} + state.duration =result.duration; if (result.beginTime && result.endTime) { state.chooseTime = [ dayjs(result.beginTime, "YYYY-MM-DD"), @@ -564,40 +520,19 @@ export default { } else { state.chooseTime = []; } - state.inputV4 = result.address; - state.inputV5 = result.beforeStart; - state.inputV6 = result.afterStart; - state.inputV7 = result.beforeEnd; + state.address = result.address; + state.beforeStart = result.beforeStart; + state.afterStart = result.afterStart; state.fileList = JSON.parse(result.attach); - state.chooseWorkId = result.homeWorkId; - // state.radioV1 = result. - state.checkedHolidy = - result.completeType == 1 - ? false - : result.completeType == 2 - ? false - : result.completeType == 3 - ? true - : false; - if (result.projectMember) { - state.radioV2 = "1"; - } else if (result.noProjectMember) { - state.radioV2 = "2"; - } else { - state.radioV2 = ""; - } - if (result.completeSet == 1) { - state.radioV1 = "1"; - } else { - state.radioV1 = "2"; - } - state.checkedAssessment = result.evalFlag == 1 ? true : false; - if (state.chooseWorkId) { - queryWorkDetailById({ workId: state.chooseWorkId }).then((res) => { - state.chooseWork = res.data.data; - state.chooseWorkName = res.data.data.workName; - }); - } + state.EditWorkId = result.homeWorkId; + state.onlySign = result.completeType.split(",")[0]==1?true:false; + state.completeLeave =result.completeType.split(",")[1]==1?true:false; + state.chooseCourse =result.offcourseId; + state.projectMember = result.projectMember.split(",")[0]==1?true:false; + state.noProjectMember = result.projectMember.split(",")[1]==1?true:false; + state.EditTestId = result.testId; + state.EditWorkId=result.homeWorkId; + state.assessmentId =result.evaluateId; }); }; @@ -605,76 +540,50 @@ export default { // 新增任务 const updateFaceTeach = () => { if ( - state.inputV1 == "" || + state.courseName == "" || state.chooseCourse == null || - state.inputV2 == "" || + state.memberValue == "" || state.chooseTime == [] || - state.inputV3 == "" || - state.inputV4 == "" + state.duration == "" || + state.address == "" ) { message.destroy(); return message.warning("请输入必填字段"); } else { let obj = { - address: state.inputV4, + teacherId:state.memberValue.value, + teacher:state.memberValue.label, + address:state.address, applyFlag: 1, attach: JSON.stringify(state.fileList), - 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 hh-mm-ss"), + afterStart: state.afterStart || 0, + beforeStart: state.beforeStart || 0, + beginTime: parseInt( new Date(state.chooseTime[0].$d).getTime() / 1000), + completeType: state.onlySign? "1,":"0," + state.completeLeave?"1":"0", + description: state.description, 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, - homeWorkId: state.chooseWorkId || 0, - name: state.inputV1, - noProjectMember: state.radioV2 == "1" ? 0 : 1, - offcourseId: 0, - offcoursePlanId: props.edit ? props.EditFaceId : 0, - projectMember: state.radioV2 == "1" ? 1 : 0, + evalFlag: state.needEval?1:0, + evaluateId:state.assessmentId, + homeWorkId: state.EditWorkId, + name: state.courseName, + projectMember:state.innerPersion?"1":"0" + state.outPerson?"1":"0", + offcourseId:state.chooseCourse, + offcoursePlanId:props.EditFaceId >0 ? props.EditFaceId : 0, signFlag: 0, - signWordFlag: 0, - teacherId: state.memberId, - testId: 0, - // teacher: state.inputV2, + testId: state.EditTestId }; - if (props.edit) { - editPlan(obj) + editPlan(obj) .then((res) => { updateTask(res); closeDrawer(); - }) - .catch((err) => { + }).catch((err) => { message.error(`添加失败${err}`); }); - } else { - editPlan(obj) - .then((res) => { - updateTask(res); - closeDrawer(); - }) - .catch((err) => { - message.error(`添加失败${err}`); - }); - } + } }; - const upDateTable = (value) => { - console.log("gg", value); - console.log("gg", value[0].name); - state.chooseCourse = value[0]; - state.chooseCourseName = value[0].name; - }; + //更新任务列表 // 新增编辑或新增项目任务 @@ -705,7 +614,7 @@ export default { name: res.data.data.name, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 2, }; // 新增编辑或新增项目 @@ -722,11 +631,11 @@ export default { } else if (props.isLevel == 3) { addTempTask({ courseId: res.data.data.offcoursePlanId, - duration: 0, name: res.data.data.name, - projectId: props.projectId, + duration: res.data.data.duration, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 2, }) .then(() => { @@ -740,23 +649,7 @@ export default { }); } }; - const closeTag = () => { - state.chooseCourse = null; - state.chooseCourseName = null; - }; - const closeTagWork = () => { - state.chooseWork = null; - state.chooseWorkName = null; - state.chooseWorkId = null; - }; - const getWork = (value) => { - console.log("getWork", value); - state.chooseWork = value; - state.chooseWorkName = value.workName; - state.chooseWorkId = value.workId; - // console.log("getWorkName", value.workName); - }; const handleChange = ({ file, fileList }) => { if (file.status !== "uploading") { console.log(file, fileList); @@ -764,6 +657,7 @@ export default { }; const showAssessment = () => { state.assessmentVisible = true; + }; const faceAssess = (value) => { console.log(value); @@ -825,7 +719,7 @@ export default { const handleChange2 = (value, label) => { console.log(`selected ${value}`); state.memberId = value; - state.inputV2 = label; + state.memberValue = label; }; const handleFocus = () => { queryMember(); @@ -837,14 +731,8 @@ export default { showDrawerAddTest, afterVisibleChange, closeDrawer, - cloradio1, - cloradio2, updateFaceTeach, updateTask, - upDateTable, - closeTag, - getWork, - closeTagWork, clear, handleChange, showAssessment, @@ -855,6 +743,11 @@ export default { handleSearch, handleChange2, templateScroll, + logC, + logT, + logW, + logA, + }; }, }; @@ -926,7 +819,7 @@ export default { .main_item2 { display: flex; align-items: flex-start; - // margin-bottom: 32px; + margin-bottom: 32px; .signbox { width: 120px; @@ -980,15 +873,14 @@ export default { .xkbtn { cursor: pointer; - width: 130px; + width: 130px; height: 40px; background: #388be1; border-radius: 8px; border: 0; margin-right: 16px 8px 32px 0; color: #fff; - margin-top: 16px; - margin-bottom: 60px; + } } } diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 1d1a7862..28e2b21c 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -165,10 +165,14 @@ export default { type: Number, default: null, }, - face: { + faceLevel: { type: Boolean, default: false, }, + projectTemplateId:{ + type: Number, + default: null, + }, }, setup(props, ctx) { const formState = reactive({ @@ -259,18 +263,21 @@ export default { const fileList = ref([]); const closeDrawer = () => { - resetForm(); - fileList.value = []; + + formState.choosedTime = ""; ctx.emit("update:addhomeworkVisible", false); ctx.emit("update:edit", false); - ctx.emit("changeData", false); + ctx.emit("update:EditWorkId", state.EditWorkId); + console.log("state.EditWorkId==============",state.EditWorkId); localStorage.setItem("stageId", props.chooseStageId); localStorage.setItem("chapterId", props.isactive); + fileList.value = []; + resetForm(); }; const afterVisibleChange = () => { - if (props.addhomeworkVisible && props.edit) { - // 该页面显示同时 edit为true 时，发送查询请求, + if (props.EditWorkId >0) { + state.EditWorkId = props.EditWorkId; queryWork(); } }; @@ -285,7 +292,7 @@ export default { workName: formState.workName, workRequirement: formState.workRequirement, }; - if (props.edit) { + if (props.EditWorkId >0) { updateWorkTaskUsing(obj) .then((res) => { updateTask(res); @@ -325,62 +332,69 @@ export default { }; // 新增编辑或新增项目任务 const updateTask = (res) => { - if (props.isLevel == 1) { - let editObj1 = { - chapterId: props.isactive, - courseId: res.data.data.workId, - name: res.data.data.workName, - routerId: props.routerId, - routerTaskId: props.routerTaskId || 0, - type: 4, - }; + + if(props.faceLevel){ + state.EditWorkId = res.data.data.workId + + }else{ + if (props.isLevel == 1) { + let editObj1 = { + chapterId: props.isactive, + courseId: res.data.data.workId, + name: res.data.data.workName, + routerId: props.routerId, + routerTaskId: props.routerTaskId || 0, + type: 4, + }; - RouterEditTask(editObj1) - .then(() => { - message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`); - ctx.emit("changeData", false); - state.addLoading = false; - }) - .catch(() => { - message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`); - }); - } else if (props.isLevel == 2) { - 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 ? "编辑" : "新增"}阶段任务失败`); - }); - } 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 ? "编辑" : "新增"}阶段任务失败`); - }); + RouterEditTask(editObj1) + .then(() => { + message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务成功`); + ctx.emit("changeData", false); + state.addLoading = false; + }) + .catch(() => { + message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}关卡任务失败`); + }); + } else if (props.isLevel == 2) { + let editObj = { + courseId: res.data.data.workId, + name: res.data.data.workName, + projectId: props.EditWorkId > 0 ? props.projectId : 0, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0 , + type: 4, + }; + ProjectEditTask(editObj) + .then(() => { + message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + state.addLoading = false; + }) + .catch(() => { + message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`); + }); + } else if (props.isLevel == 3) { + console.log("projectTemplateId,===",props.projectTemplateId); + addTempTask({ + courseId: res.data.data.workId, + name: res.data.data.workName, + projectTemplateId:props.projectTemplateId, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId || 0, + type: 4, + }) + .then(() => { + message.success(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务成功`); + ctx.emit("changeData", false); + state.addLoading = false; + }) + .catch(() => { + message.error(`${props.EditWorkId > 0 ? "编辑" : "新增"}阶段任务失败`); + }); + } } + }; const cle = () => { @@ -389,7 +403,7 @@ export default { submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"), submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"), workEnclosureAddress: "", - workId: props.edit ? props.EditWorkId : 0, + workId: props.EditWorkId > 0 ? props.EditWorkId : 0, workName: formState.workName, workRequirement: formState.workRequirement, }; diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index b1df2fb8..dacc9d0b 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -157,6 +157,10 @@ export default { type: Number, default: null, }, + projectTemplateId:{ + type: Number, + default: null, + } }, setup(props, ctx) { const state = reactive({ @@ -236,7 +240,7 @@ export default { name: state.assessment.name, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 11, }) .then(() => { @@ -248,13 +252,12 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); addTempTask({ courseId: state.assessment.assessmentId, name: state.assessment.name, - projectId: props.projectId, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 11, }) .then(() => { diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index e9efc541..53c00b89 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -382,6 +382,10 @@ export default { type: Number, default: null, }, + projectTemplateId:{ + type: Number, + default: null, + }, }, setup(props, ctx) { // const router = useRouter(); @@ -559,7 +563,7 @@ export default { name: res.data.data.liveName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 6, }) .then(() => { @@ -570,14 +574,14 @@ export default { message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + console.log("props.projectTemplateId",props.projectTemplateId); addTempTask({ courseId: res.data.data.liveId, duration: res.data.data.duration, name: res.data.data.liveName, - projectId: props.projectId, + projectTemplateId:props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 6, }) .then(() => { diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue index cd524446..47316a2e 100644 --- a/src/components/drawers/AddOnline.vue +++ b/src/components/drawers/AddOnline.vue @@ -371,7 +371,7 @@ export default { name: value.name, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 1, }) .then(() => { @@ -389,9 +389,9 @@ export default { addTempTask({ courseId: state.onlineClassesId, name: state.onlineName, - projectId: props.projectId, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 1, }) .then(() => { diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue index 09d99af8..5faf1ad1 100644 --- a/src/components/drawers/AddRef.vue +++ b/src/components/drawers/AddRef.vue @@ -140,6 +140,10 @@ export default { type: Number, default: null, }, + projectTemplateId:{ + type: Number, + default: null, + }, }, setup(props, ctx) { const state = reactive({ @@ -198,7 +202,7 @@ export default { name: res.data.data.linkName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 7, }) .then(() => { @@ -212,13 +216,13 @@ export default { message.error(`${props.EditTestId ? "编辑" : "新增"}阶段任务失败`); }); } else if (props.isLevel == 3) { - console.log(""); + addTempTask({ courseId: res.data.data.linkId, name: res.data.data.linkName, - projectId: props.projectId, + projectTemplateId:props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 7, }) .then(() => { diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index af6643df..64b3d7e3 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -15,6 +15,7 @@ @click="closeDrawer" /> +
+
{{voteCount}}票
@@ -159,7 +163,7 @@ export default { name: "AddVote", components: { CreateVote - + }, props: { addvoteVisible: { @@ -201,6 +205,10 @@ export default { isactive: { type: Number, default: null, + }, + projectTemplateId:{ + type: Number, + default: null, } @@ -225,6 +233,9 @@ export default { addStemVisible:false, // editChild:false, fileList: [], + voteCount:null, + projectTemplateId:null, + }); const closeDrawer = () => { state.inputV1 = "", @@ -234,12 +245,16 @@ export default { ctx.emit("update:addvoteVisible", false); ctx.emit("update:edit", false); }; - const afterVisibleChange = () => { - if(props.edit){ + const afterVisibleChange = (bool) => { + if(props.edit&&bool){ queryVoteInfo(); } + state.projectTemplateId = props.projectTemplateId; + console.log("projectTemplateId visible====",state.projectTemplateId); }; + + const showDrawerCreVote = () => { state.createVoteVisible = true; state.editChild = props.edit; @@ -248,12 +263,22 @@ export default { }; const handleChange = info => { - if (info.file.status !== "uploading") { - - console.log("基础票数rinfo======",info); - } - }; + let resFileList = [...info.fileList]; + + resFileList.map(file => { + if (file.response) { + // Component will show file.url as link + file.url = file.response.url; + console.log("file========",file); + console.log("file========",file.response); + state.voteCount = file.response.data; + } + + }); + //fileList.value = resFileList; + }; + //删除题干信息接口 const dleVoteStem = () => { api.deleteVoteStem({voteStemId:state.ballotId}) @@ -286,6 +311,7 @@ export default { } const updateToTask =(res)=>{ + console.log("props.isLevel=====",props.isLevel); if(props.isLevel ==1){ RouterEditTask({ chapterId: props.isactive, @@ -310,7 +336,7 @@ export default { name: res.data.data.voteName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, + stageId: props.chooseStageId || 0, type: 12, }) .then(() => { @@ -321,16 +347,14 @@ export default { message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`) }); }else if (props.isLevel == 3) { - console.log(""); + addTempTask({ - duration: 0, - flag: true, - courseId: Number(res.data.data.EditVoteId), - name: res.data.data.data.voteName, - projectId: props.projectId, + courseId: res.data.data.voteId, + name: res.data.data.voteName, + projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, - stageId: props.chooseStageId, - type: 10, + stageId: props.chooseStageId || 0, + type: 12, }) .then(() => { message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`); @@ -373,6 +397,7 @@ export default { api .editVote(obj) .then((res) => { + console.log("updte======"); updateToTask(res); closeDrawer(); message.success("修改投票信息成功") @@ -400,6 +425,10 @@ export default { const closeStem = () => { state.addStemVisible = false; }; + const log = e => { + state.ballotId=null; + console.log(e); + }; return { ...toRefs(state), showDrawerCreVote, @@ -411,11 +440,117 @@ export default { queryStem, closeStem, handleChange, + log, }; }, };