diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index 63b38ae1..9986004b 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -65,7 +65,7 @@
- {{voteStemName}} + {{ballotName}}
@@ -76,6 +76,7 @@ v-model:crevoteVisible="crevotevisible" @getData="getStemId" v-model:voteStemId="voteStemId" + v-model:editStem="editStem" /> @@ -122,7 +123,7 @@
- +
@@ -184,6 +185,14 @@ export default { type: Number, default: null, }, + voteId: { + type: Number, + default: null, + }, + ballotId: { + type: Number, + default: null, + } }, setup(props, ctx) { const state = reactive({ @@ -199,34 +208,52 @@ export default { voteStemId: null, voteId:"", voteStemName:"", + ballotName: "", + editStem: false, //编辑状态 + ballotId: "", //题干id + optionId: "", //删除,修改选项id }); const closeDrawer = () => { + state.inputV1 = "", + state.textV1 = "", + state.startTimes = "", + state.time = undefined, + state.endTimes = "", + state.basevote = "", ctx.emit("update:addvoteVisible", false); ctx.emit("update:edit", false); }; const afterVisibleChange = (bool) => { console.log("state", bool); + // if (props.edit == true) { + // queryVoteText() + // } }; const showDrawerCreVote = () => { state.crevotevisible = true; + if (state.creVote == true) { + state.editStem = true + } }; const getStemId = (data) => { + state.ballotName = data.ballotName; state.voteStemName = data.voteStemName; state.voteStemId = Number(data.voteStemId); + state.ballotId = Number(data.ballotId) state.creVote = data.creVote; console.log('state.voteStemId', state.voteStemId); console.log('state.voteStemId', state.creVote); } //暂时没用 之前给子用传参来着 - const changeVData = (data) => { - console.log("111", data); - state.creVote = data.creVote; - state.ascriptionId = data.ascriptionId; - state.voteStemId = data.voteStemId; - state.voteStemName = data.voteStemName; - console.log("222", state.creVote); - console.log("333", state.ascriptionId); - }; + // const changeVData = (data) => { + // console.log("111", data); + // state.creVote = data.creVote; + // state.ascriptionId = data.ascriptionId; + // state.voteStemId = data.voteStemId; + // state.voteStemName = data.voteStemName; + // console.log("222", state.creVote); + // console.log("333", state.ascriptionId); + // }; const delBox = () => { state.creVote = false; }; @@ -247,6 +274,16 @@ export default { delBox() }) } + + //新建还是编辑方法 + const creoredi = () => { + if (props.eidt == false) { + createVoteText() + } + else { + changeVoteText() + } + } //创建投票信息 const createVoteText = () => { if (!state.inputV1) { @@ -271,25 +308,34 @@ export default { let obj = { - ascriptionId: state.ascriptionId, + ballotId: state.ballotId, baseVote: state.basevote, + createTime: "", createUser: 0, + updateTime: "", updateUser: 0, voteEndTime: state.endTimes, voteExplain: state.textV1, voteFlag: "", + voteId: 0, voteName: state.inputV1, voteStartTime: state.startTimes, - voteTag: "", + voteTag: "" + }; api .createVote(obj) .then((res) => { console.log("创建成功123", res); message.success("创建成功"); - ctx.emit("getData", res.data.data.voteId); + let changeVoteId = { + voteId: res.data.data.voteId, + ballotId: state.ballotId, + } + ctx.emit("getData", changeVoteId); closeDrawer(); if (props.learn == 0) + //添加到项目任务列表 apitaskadd .addTask({ courseId: 0, @@ -330,18 +376,71 @@ export default { console.log("创建失败", err); }); }; + + //根据投票id获取投票信息 + // const queryVoteText = ()=>{ + // let objqurvt = { + // voteStemId:state.voteStemId + // //没有接口 个人认为应该是这个id + // } + // api + // //目前没接口 大概写的 + // .queryVoteText(objqurvt) + // .then((res)=>{ + // console.log('获取投票信息成功',res); + // state.inputV1 = res.data.data.voteName + // state.endTimes = res.data.data.voteEndTime + // state.startTimes = res.data.data.voteStartTime + // state.textV1 = res.data.data.voteExplain + // state.baseVote = res.data.data.baseVote + // state.ascriptionId = res.data.data.ascriptionId + // state.ballotId = res.data.data.ballotId + // }) + // .catch((err)=>{ + // console.log('获取投票信息失败',err); + // }) + // } + //修改投票信息接口 + const changeVoteText = () => { + let objcvt = { + ballotId: state.ballotId, + baseVote: state.basevote, + createTime: "", + createUser: 0, + updateTime: "", + updateUser: 0, + voteEndTime: state.endTimes, + voteExplain: state.textV1, + voteFlag: "", + voteId: state.voteId, + voteName: state.inputV1, + voteStartTime: state.startTimes, + voteTag: "" + } + api + .editVote(objcvt) + .then((res) => { + console.log('修改投票信息成功', res); + }) + .catch((err) => { + console.log('修改投票信息失败', err); + }) + } return { ...toRefs(state), showDrawerCreVote, afterVisibleChange, closeDrawer, getStemId, - changeVData, + // changeVData, rowSelection, options1, dleVoteStem, + creoredi, createVoteText, + changeVoteText, delBox, + // queryVoteText, updateTableData, }; }, diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index eb05cc62..a0e4dbf8 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -9,7 +9,8 @@ >
-
创建投票
+
编辑投票
+
创建投票
- +
@@ -122,6 +123,10 @@ export default { type: Boolean, default: false, }, + editStem: { + type: Boolean, + default: false, + }, }, setup(props, ctx) { const state = reactive({ @@ -178,12 +183,40 @@ export default { value.splice(value[index],1) } const closeDrawer = () => { + state.inputV1 ="", + state.questions=[ + { + stemTit: "题干", + inputV: "", + options: [ + { + title: "选项", + opvalue: "", + }, + { + title: "选项", + opvalue: "", + }, + ], + }, + ], ctx.emit("update:crevoteVisible", false); }; const afterVisibleChange = (bool) => { console.log("state", bool); + if (props.editStem == true) { + queryStemText() + } }; - + //创建题干还是编辑题干 + const creoredi = () => { + if (props.eidtStem == false) { + createQueTit() + } + else { + changeStemText() + } + } //创建题干接口 const createQueTit = () => { if (!state.inputV1) { @@ -258,8 +291,10 @@ export default { // console.log('state.questions[0].inputV',state.questions[0].inputV); message.success("创建成功"); let objstem = { + ballotName: state.inputV1, voteStemName: state.questions[0].inputV, voteStemId: res.data.data.voteStemVoList[0].voteStemId, + ballotId: res.data.data.ballotId, creVote: true, }; ctx.emit("getData", objstem); @@ -269,6 +304,82 @@ export default { console.log(err); }); }; + //删除选项信息 + const delOptText = () => { + let objdelopt = { + // optionId: optionId + } + api + .deleteVoteStemOption(objdelopt) + .then((res) => { + console.log('删除选项信息成功', res); + }) + .catch((err) => { + console.log('删除选项信息失败', err); + }); + } + //根据id获取题干信息 + const queryStemText = () => { + let objqurst = { + stemId: 1, + ballotId: "", + } + api + .queryStemByStemId(objqurst) + .then((res) => { + console.log('获取题干信息成功', res); + state.inputV1 = res.data.data.voteName + }) + .catch((err) => { + console.log('获取题干信息失败', err); + }) + } + //编辑题干信息 + const changeStemText = () => { + let objcst = { + "ballotId": 0, + "ballotName": "", + "createTime": "", + "createUser": 0, + "updateTime": "", + "updateUser": 0, + "voteStemDtoList": [ + { + "ballotId": 0, + "createTime": "", + "createUser": 0, + "optionDetailList": [ + { + "createTime": "", + "createUser": 0, + "optionFlag": "", + "optionId": 0, + "optionName": "", + "optionOrderNum": "", + "optionPictureAddress": "", + "stem": "", + "updateTime": "", + "updateUser": 0, + "voteStemId": 0 + } + ], + "orderNumber": "", + "updateTime": "", + "updateUser": 0, + "voteStemFlag": "", + "voteStemId": 0, + "voteStemName": "" + } + ] + } + api.updateStemMessage(objcst) + .then((res) => { + console.log('修改题干信息成功', res); + }) + .catch((err) => { + console.log('修改题干信息失败', err); + }) + } return { ...toRefs(state), afterVisibleChange, @@ -277,7 +388,9 @@ export default { delQue, addOpt, delOpt, + creoredi, createQueTit, + delOptText, }; }, }; diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index f1112328..81a71774 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1244,18 +1244,21 @@ export default { }; //测试评估投票抽屉 const showDrawerAddEval = (id, eleId) => { - state.addevalVisible = true; + // state.addevalVisible = true; + state.addevalvisible = true; state.EditEvalId = id; state.routerTaskId = eleId; }; const showDrawerAddInvist = (id, eleId) => { - state.addinvistVisible = true; + // state.addinvistVisible = true; + state.addinvistvisible = true; state.routerTaskId = eleId; state.EditInvistId =id; }; const showDrawerAddVote = (id, eleId) => { - state.addhomeworkvisible = true; + // state.addhomeworkvisible = true; + state.addvotevisible = true; state.EditVoteId = id; state.routerTaskId = eleId; }; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 293616e0..cb6a6a98 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -325,7 +325,8 @@ v-model:projectId="projectId" v-model:chooseStageId="chooseStageId" v-model:projectTaskId="projectTaskId" - v-model:EditVoteId = "EditVoteId" + v-model:voteId = "voteId" + v-model:ballotId = "ballotId" />
@@ -926,7 +927,8 @@ export default { EditTestId: null,// 要编辑的考试id EditEvalId:null, EditInvistId:null, - EditVoteId:null, + EditVoteId: null, //编辑需要投票的id + ballotId: "", //编辑需要的题干id projectTaskId:null, // 要编辑的具体任务id projectNameList: [ { @@ -1353,10 +1355,11 @@ export default { - //获取删除id(投票) + //获取修改、删除id(投票) const changeVData = (data) => { - console.log("8989", data); + console.log("获取修改、删除id投票", data); state.voteId = data.voteId; + state.ballotId = data.ballotId; }; //数据变化 const updateTableData = (data) => { @@ -1519,9 +1522,12 @@ export default { state.projectTaskId = eleId; }; const showDrawerAddVote = (id, eleId) => { + console.log(id, eleId, '95835325932953295325'); state.addvotevisible = true; state.EditVoteId = id; state.projectTaskId = eleId; + // voteId = state.voteId; + // ballotId = state.ballotId; }; const showConfirm = () => { state.confirmModal = true; diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index 2b331d6f..eee6cca9 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -433,7 +433,7 @@ background: linear-gradient(180deg, #ddeaff, #f0f8fe); display: block; " - + v-if="taskSyllabus.length == 0" >