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/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/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 534017f5..5e67f2a7 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -49,29 +49,20 @@
- {{ chooseCourseName }} +
+ + 删除课程 +
+
@@ -211,9 +202,11 @@ 分钟 +
签退
-
+ +
结束前： @@ -225,8 +218,7 @@ width: 88px; height: 32px; border-radius: 8px; - overflow: hidden; - " + overflow: hidden; " :v-model:value="inputV7" > 仅签到 +
@@ -276,6 +269,9 @@ + + +
评估： @@ -284,24 +280,30 @@ 需要评估 - - {{ chooseMentName }} + +
+
+
+ +
+
+ +
+ + 删除评估 +
+ + +
+
+ +
@@ -310,6 +312,11 @@
+
+ + 删除作业 +
+
@@ -317,28 +324,14 @@
- {{ chooseWorkName }} +
@@ -346,10 +339,16 @@
+
+ + 删除考试 +
+
- +
@@ -373,11 +372,7 @@ - + @@ -394,8 +389,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", @@ -481,15 +475,13 @@ export default { 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, + checkedAssessmentId:null, + isface: 1 + }); const clear = () => { state.inputV1 = null; @@ -505,12 +497,11 @@ export default { state.radioV2 = ""; state.checkedHolidy = false; state.checkedAssessment = false; - state.chooseMent = null; - state.chooseWork = null; - state.chooseWorkId = null; - state.chooseWorkName = null; state.chooseCourse = null; - state.chooseCourseName = null; + state.EditTestId =null; + state.assessmentId=null; + state.EditWorkId=null; + }; const closeDrawer = () => { ctx.emit("update:addfaceteachVisible", false); @@ -524,13 +515,33 @@ 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; @@ -545,6 +556,11 @@ export default { state.radioV2 = ""; } }; + /* + const getCheckedAss = (ass) => { + state.assessment = ass; + state.assessmentId = ass.assessmentId + };*/ //查询面授 const queryFaceTeach = () => { //暂时写一个假的offcoursePlanId @@ -569,7 +585,7 @@ export default { state.inputV6 = result.afterStart; state.inputV7 = result.beforeEnd; state.fileList = JSON.parse(result.attach); - state.chooseWorkId = result.homeWorkId; + state.EditWorkId = result.homeWorkId; // state.radioV1 = result. state.checkedHolidy = result.completeType == 1 @@ -592,18 +608,24 @@ export default { 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.chooseCourse =result.offcourseId; + state.EditTestId = result.testId; + state.EditWorkId=result.homeWorkId; + state.assessmentId =result.evaluateId; }); }; //新建或编辑面授 // 新增任务 const updateFaceTeach = () => { + console.log("==========",state.chooseCourse,"hha"); if ( state.inputV1 == "" || state.chooseCourse == null || @@ -633,47 +655,35 @@ export default { 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, + evaluateId:state.assessmentId, + homeWorkId: state.EditWorkId, name: state.inputV1, noProjectMember: state.radioV2 == "1" ? 0 : 1, - offcourseId: 0, - offcoursePlanId: props.edit ? props.EditFaceId : 0, - projectMember: state.radioV2 == "1" ? 1 : 0, + offcourseId:state.chooseCourse, + offcoursePlanId:props.edit ? props.EditFaceId : 0, + projectMember:state.radioV2 == "1" ? 1 : 0, signFlag: 0, signWordFlag: 0, teacherId: state.memberId, - testId: 0, + testId: state.EditTestId, // teacher: state.inputV2, }; - 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; + // state.chooseCourse = value[0]; + //state.chooseCourseName = value[0].name; }; //更新任务列表 @@ -724,8 +734,8 @@ export default { courseId: res.data.data.offcoursePlanId, duration: 0, name: res.data.data.name, - projectId: props.projectId, - projectTaskId: props.projectTaskId || 0, + projectTemplateId: props.projectTemplateId, + projectTemplateTaskId: props.projectTemplateTaskId || 0, stageId: props.chooseStageId, type: 2, }) @@ -740,23 +750,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 +758,7 @@ export default { }; const showAssessment = () => { state.assessmentVisible = true; + }; const faceAssess = (value) => { console.log(value); @@ -842,9 +837,6 @@ export default { updateFaceTeach, updateTask, upDateTable, - closeTag, - getWork, - closeTagWork, clear, handleChange, showAssessment, @@ -855,6 +847,11 @@ export default { handleSearch, handleChange2, templateScroll, + logC, + logT, + logW, + logA, + }; }, }; @@ -980,15 +977,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..028c3f14 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -165,7 +165,7 @@ export default { type: Number, default: null, }, - face: { + faceLevel: { type: Boolean, default: false, }, @@ -259,18 +259,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 +288,7 @@ export default { workName: formState.workName, workRequirement: formState.workRequirement, }; - if (props.edit) { + if (props.EditWorkId >0) { updateWorkTaskUsing(obj) .then((res) => { updateTask(res); @@ -325,62 +328,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, + 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(""); + addTempTask({ + courseId: res.data.data.workId, + name: res.data.data.workName, + projectId: props.EditWorkId > 0 ? props.projectId : 0, + projectTaskId: props.projectTaskId || 0, + stageId: props.chooseStageId, + 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 +399,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/AddTest.vue b/src/components/drawers/AddTest.vue index af6643df..b353bebf 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: { @@ -225,6 +229,8 @@ export default { addStemVisible:false, // editChild:false, fileList: [], + voteCount:null, + }); const closeDrawer = () => { state.inputV1 = "", @@ -240,6 +246,8 @@ export default { } }; + + const showDrawerCreVote = () => { state.createVoteVisible = true; state.editChild = props.edit; @@ -248,12 +256,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}) @@ -400,6 +418,10 @@ export default { const closeStem = () => { state.addStemVisible = false; }; + const log = e => { + state.ballotId=null; + console.log(e); + }; return { ...toRefs(state), showDrawerCreVote, @@ -411,11 +433,117 @@ export default { queryStem, closeStem, handleChange, + log, }; }, };