From ad72d86668e57b924d1e27a2f9206a7aa5329e98 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 8 Nov 2022 15:58:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=88=A0=E9=99=A4=E6=8A=95=E7=A5=A8?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E9=A2=98=E5=B9=B2=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddVote.vue | 127 +++++++++++++++++++--------- src/components/drawers/CreVote.vue | 17 +++- src/views/projectcenter/TaskAdd.vue | 13 ++- 3 files changed, 113 insertions(+), 44 deletions(-) diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index cf784131..39681d3e 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -48,16 +48,34 @@ 创建投票： -
- - -
传过来的name
- +
+ + +
+
+ 传过来的name +
+
+
- +
@@ -170,14 +188,15 @@ export default { const state = reactive({ inputV1: "", textV1: "", - creVote:false, + creVote: false, crevotevisible: false, time: undefined, basevote: "", endTimes: "", startTimes: "", - ascriptionId:"", - voteStemId:"", + ascriptionId: "", + voteStemId: "", + voteId:"", }); const closeDrawer = () => { ctx.emit("update:addvoteVisible", false); @@ -190,15 +209,45 @@ export default { state.crevotevisible = true; }; const changeVData = (data) => { - console.log('111', data); - state.creVote = data.creVote - state.ascriptionId = data.ascriptionId - state.voteStemId = data.voteStemId - console.log('222',state.creVote); - console.log('333',state.ascriptionId); - } + console.log("111", data); + state.creVote = data.creVote; + state.ascriptionId = data.ascriptionId; + state.voteStemId = data.voteStemId; + console.log("222", state.creVote); + console.log("333", state.ascriptionId); + }; const delBox = () => { state.creVote = false; + dleVoteStem() + }; + + //获取题干信息 + // const getStemText = () => { + // let objstem = { + // stemId: state.ascriptionId, + // ascriptionId: state.voteStemId, + // } + // api + // .queryStemByStemId(objstem) + // .then((res) => { + // console.log("获取成功", res); + // message.success("获取成功"); + // }) + // .catch((err) => { + // console.log(err); + // }); + // } + + //删除题干信息接口 + const dleVoteStem = () => { + let objdelstem = { + voteStemId:state.voteStemId + } + api.deleteVoteStem(objdelstem) + .then((res) => { + console.log('删除题干信息成功', res) + message.success('删除题干信息成功') + }) } //创建投票信息 const createVoteText = () => { @@ -227,17 +276,13 @@ export default { // }; let obj = { + ascriptionId: state.ascriptionId, baseVote: state.basevote, - createTime: "", createUser: 0, - stem: "", - stemId: 0, - updateTime: "", updateUser: 0, voteEndTime: state.endTimes, voteExplain: state.textV1, voteFlag: "", - voteId: 0, voteName: state.inputV1, voteStartTime: state.startTimes, voteTag: "", @@ -245,22 +290,23 @@ export default { api .createVote(obj) .then((res) => { - console.log("创建成功", res); + console.log("创建成功123", res); message.success("创建成功"); + ctx.emit("getData", res.data.data.voteId); closeDrawer(); if (props.learn == 0) - apitaskadd - .addTask({ - courseId: 0, - duration: 0, - flag: true, - name: obj.voteName, - projectId: props.projectId, - projectTaskId: 0, - stageId: props.chooseStageId, - type: 12, - }) - .then((res) => { + apitaskadd + .addTask({ + courseId: 0, + duration: 0, + flag: true, + name: obj.voteName, + projectId: props.projectId, + projectTaskId: 0, + stageId: props.chooseStageId, + type: 12, + }) + .then((res) => { console.log("调用项目添加接口后", res.data); //自定义事件给父组件传值 ctx.emit("changeData", false); @@ -271,7 +317,7 @@ export default { .catch((err) => { console.log(err); }); - else { + else { let editObj1 = { chapterId: 36, courseId: 0, @@ -282,7 +328,7 @@ export default { routerTaskId: 0, type: 12, }; - RouterEditTask(editObj1) + RouterEditTask(editObj1); } }) .catch((err) => { @@ -297,6 +343,7 @@ export default { changeVData, rowSelection, options1, + dleVoteStem, createVoteText, delBox, }; @@ -359,15 +406,15 @@ export default { color: #fff; margin-right: 10px; } - .fileTigan{ + .fileTigan { display: flex; align-items: center; padding: 3px 5px; background-color: rgba(42, 103, 209, 0.4); - span{ + span { margin-right: 5px; } - .delBox{ + .delBox { width: 13px; height: 13px; background-image: url(@/assets/images/basicinfo/ch.png); diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index f8f1cc35..fb0c3ebf 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -157,6 +157,7 @@ export default { console.log("state", bool); }; + //创建题干接口 const createQueTit = () => { if (!state.questions[0].inputV) { message.destroy(); @@ -170,11 +171,9 @@ export default { let obj = [ { ascriptionId: 0, - createTime: "", createUser: 0, optionDetailList: [ { - createTime: "", createUser: 0, optionId: 0, optionName: "", @@ -201,6 +200,20 @@ export default { console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId); console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId); message.success("创建成功"); + //获取题干信息 + let objstem = { + stemId: res.data.data[0].ascriptionId, + ascriptionId: res.data.data[0].voteStemId, + } + api + .queryStemByStemId(objstem) + .then((res) => { + console.log("获取成功", res); + message.success("获取成功"); + }) + .catch((err) => { + console.log(err); + }); let stemData = { creVote: state.creVote, ascriptionId: res.data.data[0].ascriptionId, diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index ad6cc7c0..a2e5360f 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -311,6 +311,7 @@ { + console.log("8989", data); + state.voteId = data.voteId; + } //数据变化 const updateTableData = (data) => { console.log("添加数据", data); @@ -1542,7 +1549,8 @@ export default { api .deleteTask(obj) .then((res) => { - console.log(res); + console.log(res,'gggggggggggggggg'); + // deleteVoteText(); }) .catch((err) => { console.log(err); @@ -1552,7 +1560,7 @@ export default { //删除投票信息 const deleteVoteText = () => { let obj = { - voteId: "", + voteId: state.voteId, }; apivote .deleteVoteMessage(obj) @@ -1905,6 +1913,7 @@ export default { deleteTask, editStage, updateTableData, + changeVData, changeRow, selectRowAll, changeCourseType,