From 15210e9064559d38133139599e22525ec1945265 Mon Sep 17 00:00:00 2001 From: dongwug Date: Wed, 9 Nov 2022 09:05:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=95=E7=A5=A8=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 29 +++++++++++++++++++++++++--- src/api/indexEval.js | 2 +- src/components/drawers/AddInvist.vue | 2 +- src/components/drawers/AddVote.vue | 4 +++- src/components/drawers/CreVote.vue | 24 +++++++++++++++-------- 5 files changed, 47 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 379ccd42..fc6622f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,8 +15,10 @@ "element-plus": "^2.2.17", "jquery": "^3.6.1", "qs": "^6.11.0", + "sortablejs": "^1.15.0", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vuedraggable": "^4.1.0", "vuex": "^4.0.0" }, "devDependencies": { @@ -9522,6 +9524,11 @@ "websocket-driver": "^0.7.4" } }, + "node_modules/sortablejs": { + "version": "1.15.0", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.15.0.tgz", + "integrity": "sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==" + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", @@ -10447,6 +10454,22 @@ "node": ">=0.10.0" } }, + "node_modules/vuedraggable": { + "version": "4.1.0", + "resolved": "https://registry.npmmirror.com/vuedraggable/-/vuedraggable-4.1.0.tgz", + "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==", + "dependencies": { + "sortablejs": "1.14.0" + }, + "peerDependencies": { + "vue": "^3.0.1" + } + }, + "node_modules/vuedraggable/node_modules/sortablejs": { + "version": "1.14.0", + "resolved": "https://registry.npmmirror.com/sortablejs/-/sortablejs-1.14.0.tgz", + "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==" + }, "node_modules/vuex": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", @@ -14906,9 +14929,9 @@ } }, "dayjs": { - "version": "1.11.6", - "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.6.tgz", - "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==" + "version": "1.11.5", + "resolved": "https://registry.npmmirror.com/dayjs/-/dayjs-1.11.5.tgz", + "integrity": "sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA==" }, "debug": { "version": "4.3.4", diff --git a/src/api/indexEval.js b/src/api/indexEval.js index f76de0b9..01f7794f 100644 --- a/src/api/indexEval.js +++ b/src/api/indexEval.js @@ -1,5 +1,5 @@ import http from "./config"; -import qs from 'qs'; +// import qs from 'qs'; /** * 接口传参数方式（get） diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue index 61f36c1d..8655565a 100644 --- a/src/components/drawers/AddInvist.vue +++ b/src/components/drawers/AddInvist.vue @@ -269,7 +269,6 @@ export default { appraiseId: 0, appraiseStartTime: "", appraiseTag: "", - createTime: "", createUser: 0, researchId: 0, researchName: "", @@ -325,6 +324,7 @@ export default { // state.createLoading = false; }); }; + //搜索评估信息接口 onMounted(() => { // createInvist(); diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue index 39681d3e..d13fe14e 100644 --- a/src/components/drawers/AddVote.vue +++ b/src/components/drawers/AddVote.vue @@ -65,7 +65,7 @@
- 传过来的name + {{voteStemName}}
@@ -197,6 +197,7 @@ export default { ascriptionId: "", voteStemId: "", voteId:"", + voteStemName:"", }); const closeDrawer = () => { ctx.emit("update:addvoteVisible", false); @@ -213,6 +214,7 @@ export default { 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); }; diff --git a/src/components/drawers/CreVote.vue b/src/components/drawers/CreVote.vue index fb0c3ebf..9722df81 100644 --- a/src/components/drawers/CreVote.vue +++ b/src/components/drawers/CreVote.vue @@ -159,15 +159,21 @@ export default { //创建题干接口 const createQueTit = () => { - if (!state.questions[0].inputV) { + if (state.inputV1 == "") { message.destroy(); - return message.info("请输入题干"); + return message.info("请输入投票名称"); } + // if (!state.questions.inputV) { + // message.destroy(); + // return message.info("请输入题干"); + // } // if (!state.questions.optins.opvalue) { // message.destroy(); // return message.info("请输入选项"); // } - console.log(state.questions[0].inputV); + console.log('111111',state.questions); + // console.log('22222',state.questions.inputV); + // console.log('333333',state.questions.options); let obj = [ { ascriptionId: 0, @@ -176,7 +182,7 @@ export default { { createUser: 0, optionId: 0, - optionName: "", + optionName: state.questions[0].options[0].opvalue, optionOrderNum: "", optionPictureAddress: "", stem: "", @@ -190,15 +196,16 @@ export default { updateUser: 0, voteStemFlag: "", voteStemId: 0, - voteStemName: "", + voteStemName: state.questions[0].inputV, }, ]; api .createOptionMessage(obj) .then((res) => { console.log("创建成功", res); - console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId); - console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId); + // console.log('res.data.data[0].ascriptionId',res.data.data[0].ascriptionId); + // console.log('res.data.data[0].voteStemId',res.data.data[0].voteStemId); + // console.log('state.questions[0].inputV',state.questions[0].inputV); message.success("创建成功"); //获取题干信息 let objstem = { @@ -217,7 +224,8 @@ export default { let stemData = { creVote: state.creVote, ascriptionId: res.data.data[0].ascriptionId, - voteStemId:res.data.data[0].voteStemId + voteStemId: res.data.data[0].voteStemId, + voteStemName: state.questions[0].inputV, }; ctx.emit("getData", stemData); closeDrawer();