From 518f779fe662dfb7c0c786af6e3434dbd4a7edee Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 13 Feb 2023 16:33:46 +0800
Subject: [PATCH 01/10] =?UTF-8?q?--fix=20=E9=9D=A2=E6=8E=88=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/courselibrary/CoursewareManage.vue | 26 ++++++--------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 7ed37d5f..777052b0 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -3619,7 +3619,7 @@ export default defineComponent({
       let type = t.concat(p);
       const postData = {
         offcourseId: state.offcourseId,
-        offcoursePlanId: state.offcoursePlanId, //开课ID,不传代表新增
+        id: state.offcoursePlanId, //开课ID,不传代表新增
         address: state.xjkkinputV2,
         applyFlag: state.checked1 ? 1 : 0,
         attach: state.attach,
@@ -3660,17 +3660,10 @@ export default defineComponent({
     };
 
     //编辑开课
-    const handelEditStu = async (itm) => {
-      console.log(itm);
+    const handelEditStu = async (item) => {
 
-      state.offcourseId = itm.id;
-      state.offcoursePlanId = itm.offcoursePlanId;
-
-      const item = await detailPlan({
-        offcoursePlanId: Number(state.offcoursePlanId),
-      }).then((res) => {
-        if (res.data.code === 200) return res.data.data;
-      });
+      state.offcourseId = item.offcourseId;
+      state.offcoursePlanId = item.id;
 
       if (item.evaluateId) {
         api
@@ -3692,12 +3685,9 @@ export default defineComponent({
           }
         );
       }
-
-      console.log("res");
       console.log("获取面授课详情", item);
-
       state.xjkkinputV2 = item.address;
-      state.checked1 = item.applyFlag === 1 ? true : false;
+      state.checked1 = item.applyFlag === 1;
       let arrss = item.attach.split(",");
       let str = "";
       for (let i = 0; i < arrss.length; i++) {
@@ -3718,9 +3708,9 @@ export default defineComponent({
         (state.comLeave =
           item.completeType.split(",")[1] == "1" ? true : false),
         (state.checked4 = item.evalFlag === 1 ? true : false);
-      state.assessmentId = String(item.evaluateId);
-      state.EditTestId = String(item.testId);
-      state.EditWorkId = String(item.homeWorkId);
+      state.assessmentId =item.evaluateId || '';
+      state.EditTestId = item.testId || '';
+      state.EditWorkId = item.homeWorkId || ''
       state.xjkkinputV1 = item.name;
       if (item.signFlag === 1) {
         //是否允许未报名的签到:1是0否

From 4bd09b8a55a5d680a44c67021be66d98226753d6 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 13 Feb 2023 16:45:28 +0800
Subject: [PATCH 02/10] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=9D=A2=E6=8E=88=E8=AF=BEID=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 55a3de1f..275d3150 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -445,8 +445,8 @@ export default {
 			// let options = state.options2222;
 			data.map((value) => {
 				let obj = {
-					key: value.offcourseId,
-					num: value.offcourseId,
+					key: value.id,
+					num: value.id,
 					name: value.name || "-",
 					teacher: value.teacher || "-",
 					creator: value.createName || "-",

From 565fd7770fc482d8d306294a9053522166376618 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 13 Feb 2023 16:46:30 +0800
Subject: [PATCH 03/10] fix

---
 src/views/courselibrary/CoursewareManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 39bb97d0..fb3f3cf2 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1557,7 +1557,7 @@ import {
   list,
   edit,
   detail,
-  detailPlan,
+  // detailPlan,
   handle,
   deletePlan,
   planList,

From 995e5043769c069243e61865099159dc9af4c17a Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 13 Feb 2023 16:49:37 +0800
Subject: [PATCH 04/10] =?UTF-8?q?style:=E6=96=B0=E5=BB=BA=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddProject.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 40c5f73b..1e839168 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -66,7 +66,7 @@
           </div>
         </div>
 
-        <div class="main_item" style="margin-top: 16px;">
+        <div class="main_item" style="margin-top: 16px;margin-bottom: 32px;">
           <button class="xkbtn" @click="goProjectmanage">
             新建项目
           </button>

From 400298b62f73d5766021ccb1c0a3ab3c5cc77cff Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 13 Feb 2023 17:50:10 +0800
Subject: [PATCH 05/10] =?UTF-8?q?fix:=E5=88=87=E6=8D=A2=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/UnlockMode.vue     |  1 +
 src/views/learningpath/LevelAddDetail.vue | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue
index 5a1a2b97..8cf87b98 100644
--- a/src/components/drawers/UnlockMode.vue
+++ b/src/components/drawers/UnlockMode.vue
@@ -136,6 +136,7 @@ export default {
       state.checked = true;
       state.radioSelect = 1;
       ctx.emit("update:unlockModeVisible", false);
+      ctx.emit("closeUnlockModal", false)
     };
 
   
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 2442e94b..b38507d7 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -178,7 +178,7 @@
                   </div> -->
                 <!-- </div> -->
                 <unlock-mode ref="unlockModeModal" v-model:unlockModeVisible="unlockModeVisible"
-                  :objData="routerInfo" @saveUnlock="saveUnlock" />
+                  :objData="routerInfo" @saveUnlock="saveUnlock" @closeUnlockModal="closeUnlockModal" />
               </div>
               <div class="line"></div>
               <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
@@ -619,7 +619,7 @@
                   </div> -->
                 <!-- </div> -->
                 <unlock-mode ref="unlockModeModal" :unlockModeVisible="unlockModeVisible"
-                  :objData="routerInfo" @saveUnlock="saveUnlock" />
+                  :objData="routerInfo" @saveUnlock="saveUnlock" @closeUnlockModal="closeUnlockModal"/>
               </div>
               <div class="line"></div>
               <router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
@@ -1032,6 +1032,11 @@ export default {
       state.updateChapterID = null;
     };
 
+    // 关闭模式弹框
+    const closeUnlockModal = () => {
+      state.unlockModeVisible = false;
+    }
+
     const saveUnlock = (num) => {
        state.routerInfo.unlockMode = num
        editRoutered(state.routerInfo).then(res=>{
@@ -1885,7 +1890,8 @@ export default {
 
       closedeleteAll,
       subdeleteAll,
-      saveUnlock
+      saveUnlock,
+      closeUnlockModal
     };
   },
 };

From b84daddc8bf3e3848c3de44a482134a8b652e379 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 13 Feb 2023 18:03:42 +0800
Subject: [PATCH 06/10] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=9B=BE=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4=E5=92=8C=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E5=8F=82=E6=95=B0=E4=BC=A0=E9=80=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/learningpath/LevelAddDetail.vue | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index b38507d7..ea9242af 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -477,23 +477,20 @@
                       font-size: 14px;
                       font-weight: 400;
                       color: #4f5156;
-                      line-height: 36px;
-                    " class="tableRow">
+                      line-height: 36px;" class="tableRow">
                     <div style="
                         width: 87px;
                         text-align: center;
                         margin-left: 46px;
-                        position: relative;
-                      ">
+                        position: relative;">
                       <div class="racona">
                         <div class="img" style="
                             cursor: pointer;
                             margin-top: 2px;
                             margin-right: 9px;
                             position: absolute;
-                            left: -25px;
-                          "></div>
-                        <a-checkbox :id="element.id" v-model:checked="element.checked" @change="changeRow">
+                            left: -25px;"></div>
+                        <a-checkbox :id="element.routerTaskId" v-model:checked="element.checked" @change="changeRow">
                         </a-checkbox>
                         <div style="margin-top: 2px; margin-left: 8px">
                           {{ element.lei }}
@@ -548,8 +545,8 @@
                           <span style="
                               color: #4ea6ff;
                               margin-right: 25px;
-                              cursor: pointer;
-                            " @click="
+                              cursor: pointer;"
+                              @click="
                               decideType(
                                 element.lei,
                                 element.courseId,
@@ -558,7 +555,7 @@
                             ">
                             编辑
                           </span>
-                          <span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.id)">
+                          <span style="color: #4ea6ff; cursor: pointer" @click="showDeleteModal(element.routerTaskId)">
                             删除
                           </span>
                         </div>

From e78281e6c871d6fc57f2faf9cc858e830a6305ae Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 13 Feb 2023 18:08:16 +0800
Subject: [PATCH 07/10] style

---
 src/views/learningpath/LevelAddDetail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index ea9242af..68fbb4fb 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -171,7 +171,7 @@
                   <a-select-option :value="2">闯关模式</a-select-option>
                   <a-select-option :value="3">闯关模式</a-select-option>
                 </a-select>
-                <a-button type="primary" size="large" style="border-radius: 8px;"
+                <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;"
                   @click="showModeVisible">切换模式</a-button>
                 <!-- <div class="bottonbox" @click="showModeVisible">
                     <div class="btnText">切换模式</div>
@@ -608,7 +608,7 @@
                   <a-select-option :value="2">闯关模式</a-select-option>
                   <a-select-option :value="3">闯关模式</a-select-option>
                 </a-select>
-                <a-button type="primary" size="large" style="border-radius: 8px;"
+                <a-button type="primary" size="large" style="border-radius: 8px;margin-left: 24px;"
                   @click="showModeVisible">切换模式</a-button>
 
                 <!-- <div class="bottonbox" @click="showModeVisible">

From 48ecac28ca07d46f51525cf51278b79ad6540bbf Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 13 Feb 2023 19:17:58 +0800
Subject: [PATCH 08/10] =?UTF-8?q?--fix=20=E6=B7=BB=E5=8A=A0=E6=8A=95?=
 =?UTF-8?q?=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexVote.js               |  10 +-
 src/components/vote/AddVote.vue    | 326 ++++++++++++-----------------
 src/components/vote/CreateVote.vue | 163 ++++-----------
 3 files changed, 180 insertions(+), 319 deletions(-)

diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 171bbf60..36877226 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -50,10 +50,10 @@ export const baseVoteupload = (obj) =>
   });
 //创建题干信息接口
 export const createStemMessage = (obj) =>
-  http.post("/vote/createOptionMessage", obj);
+  http.post("/vote/createOrUpdateVote", obj);
 
 //投票信息创建接口
-export const createVote = (obj) => http.post("/vote/createVote", obj);
+export const createVote = (obj) => http.post("/vote/createOrUpdateVote", obj);
 
 //删除投票信息
 export const deleteVoteMessage = (obj) =>
@@ -71,8 +71,8 @@ export const deleteVoteStemOption = (optionId) =>
 export const editVote = (obj) => http.post("/vote/editVote", obj);
 
 //根据题干ID获取题干信息
-export const queryStemByStemId = (ballotId) =>
-  http.post(`/vote/queryStemByStemId?ballotId=${ballotId}`);
+export const queryStemByStemId = (voteId) =>
+  http.get(`/vote/queryVoteById?voteId=${voteId}`);
 
 //修改题干信息接口
 export const updateStemMessage = (obj) =>
@@ -83,7 +83,7 @@ export const fileUp = (obj) =>
   http.post("/file/upload", obj, qs.stringify({ obj }));
 //根据题干ID获取投票任务
 export const queryVoteDetailById = (voteID) =>
-  http.post(`/vote/queryVoteDetailById?voteId=${voteID}`);
+  http.post(`/vote/queryVoteById?voteId=${voteID}`);
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 3f2118dc..da5efedb 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -1,20 +1,20 @@
 <template>
   <a-drawer
-    :visible="addvoteVisible"
-    class="drawerStyle addvoteDrawer"
-    width="80%"
-    title="添加投票"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
+      :visible="addvoteVisible"
+      class="drawerStyle addvoteDrawer"
+      width="80%"
+      title="添加投票"
+      placement="right"
+      @after-visible-change="afterVisibleChange"
   >
     <div class="drawerMain">
       <div class="header">
         <div v-if="edit" class="headerTitle">编辑投票任务</div>
         <div v-else class="headerTitle">添加投票任务</div>
         <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
         />
       </div>
       <div class="contentMain">
@@ -23,18 +23,18 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
                 />
               </div>
               <span style="margin-right: 3px">任务名称：</span>
             </div>
             <div class="btnbox">
               <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 40px; border-radius: 8px;"
-                placeholder="请输入投票任务名称"
-                maxlength="20"
+                  v-model:value="inputV1"
+                  style="width: 424px; height: 40px; border-radius: 8px;"
+                  placeholder="请输入投票任务名称"
+                  maxlength="20"
               />
             </div>
           </div>
@@ -42,17 +42,38 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
+                />
+              </div>
+              <span style="margin-right: 3px">起止时间：</span>
+            </div>
+            <div class="select">
+              <a-range-picker
+                  :show-time="{ format: 'HH:mm' }"
+                  :disabled-date="disabledDate" :disabled-time="disabledRangeTime"
+                  format="YYYY-MM-DD HH:mm"
+                  style="width: 424px"
+                  v-model:value="time"
+                  :placeholder="['      开始时间', '        结束时间']"
+              />
+            </div>
+          </div>
+          <div class="main_item">
+            <div class="signbox">
+              <div class="sign">
+                <img
+                    src="@/assets/images/coursewareManage/asterisk.png"
+                    alt=""
                 />
               </div>
               <span>创建投票题干：</span>
             </div>
             <div class="btnbox">
               <button class="xkbtn" @click="showDrawerCreVote">
-                {{ ballotId ? "编辑" : "创建" }}投票题干
+                {{ voteId ? "编辑" : "创建" }}投票题干
               </button>
-              <div v-if="ballotId > 0">
+              <div v-if="voteId">
                 <a-tag closable color="processing" @close="handlelog">
                   <span style="font-size: 14px; line-height: 33px">
                     删除投票题干
@@ -61,22 +82,20 @@
               </div>
               <div>
                 <CreateVote
-                  v-model:createVoteVisible="createVoteVisible"
-                  v-model:ballotId="ballotId"
-                  v-model:editChild="editChild"
-                  v-model:ballot_name="ballot_name"
+                    v-model:createVoteVisible="createVoteVisible"
+                    v-model:voteId="voteId"
                 />
               </div>
               <button
-                class="xkbtn"
-                :style="{ display: creVote ? 'block' : 'none' }"
-                @click="showDrawerCreVote"
+                  class="xkbtn"
+                  :style="{ display: creVote ? 'block' : 'none' }"
+                  @click="showDrawerCreVote"
               >
                 编辑投票
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #4ea6ff">{{ ballot_name }}</span>
+                  <span style="color: #4ea6ff">{{ voteName }}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -85,46 +104,23 @@
             <!-- 创建投票侧弹窗 -->
             <div>
               <create-vote
-                v-model:crevoteVisible="crevotevisible"
-                @getData="getStemId"
-                v-model:ballotId="ballotId"
+                  v-model:crevoteVisible="crevotevisible"
+                  v-model:voteId="voteId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
           </div>
-          <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">起止时间：</span>
-            </div>
-            <div class="select" >
-              <a-range-picker
-                :show-time="{ format: 'HH:mm' }"
-                :disabled-date="disabledDate" :disabled-time="disabledRangeTime" 
-                format="YYYY-MM-DD HH:mm"
-                style="width: 424px"
-                v-model:value="time"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
-            </div>
-          </div>
-   
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">投票说明：</span>
             </div>
             <div class="textarea">
               <a-textarea
-                v-model:value="textV1"
-                placeholder="请输入投票说明"
-                allow-clear
-                :rows="6"
-                maxlength="150"
+                  v-model:value="textV1"
+                  placeholder="请输入投票说明"
+                  allow-clear
+                  :rows="6"
+                  maxlength="150"
               />
             </div>
           </div>
@@ -138,15 +134,15 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs } from "vue";
+import {reactive, toRefs} from "vue";
 import CreateVote from "./CreateVote.vue";
 import * as api from "../../api/indexVote";
-import { message } from "ant-design-vue";
-import { RouterEditTask } from "@/api/indexTask";
+import {message} from "ant-design-vue";
+import {RouterEditTask} from "@/api/indexTask";
 import dayjs from "dayjs";
 import * as apiTask from "../../api/indexTaskadd";
-import { addTempTask } from "../../api/indexTaskadd";
-import { baseVoteupload } from "../../api/indexEval";
+import {addTempTask} from "../../api/indexTaskadd";
+import {baseVoteupload} from "../../api/indexEval";
 
 export default {
   name: "AddVote",
@@ -216,30 +212,23 @@ export default {
       voteStemName: "",
       ballot_name: "",
       editStem: false, //编辑状态
-      ballotId: 0, //题干id
+      voteId: '', //题干id
       optionId: "", //删除，修改选项id
       addStemVisible: false, //
       editChild: false,
       fileList: [],
       voteCount: null,
       projectTemplateId: null,
-
-      partakeNum: 0, //参与数
-      totalVoteNum: 0, //总票数
-      browseNum: 0, //浏览数
     });
     const closeDrawer = () => {
       state.inputV1 = "";
       state.textV1 = "";
       state.time = undefined;
       state.basevote = "";
-      state.ballotId = "";
+      state.voteId = "";
       ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
 
-      state.partakeNum = 0; //参与数
-      state.totalVoteNum = 0; //总票数
-      state.browseNum = 0; //浏览数
     };
     const afterVisibleChange = (bool) => {
       if (props.edit && bool) {
@@ -276,90 +265,69 @@ export default {
 
     //删除题干信息接口
     const dleVoteStem = () => {
-      api.deleteVoteStem({ voteStemId: state.ballotId }).then(() => {
+      api.deleteVoteStem({voteStemId: state.voteId}).then(() => {
         message.success("删除题干信息成功");
       });
     };
 
     //根据投票id获取投票信息
     const queryVoteInfo = () => {
-      api
-        .queryVoteDetailById(props.EditVoteId)
-        .then((res) => {
-          console.log("获取投票信息成功", res);
-          state.inputV1 = res.data.data.voteName;
-          state.textV1 = res.data.data.voteExplain;
-          state.baseVote = res.data.data.baseVote;
-          state.ascriptionId = res.data.data.ascriptionId;
-          state.ballotId = res.data.data.ballotId;
-          state.time = [
-            dayjs(res.data.data.voteStartTime, "YYYY-MM-DD HH:mm"),
-            dayjs(res.data.data.voteEndTime, "YYYY-MM-DD HH:mm"),
-          ];
-          state.totalVoteNum = res.data.data.votesTotal; //总票数
-          state.partakeNum = res.data.data.numberOfInvolved; //参与数
-          state.browseNum = res.data.data.numberOfBrowse; //浏览数
-        })
-        .catch((err) => {
-          console.log("获取投票信息失败", err);
-        });
+      api.queryVoteDetailById(props.EditVoteId)
+          .then((res) => {
+            state.inputV1 = res.data.data.voteName;
+            state.textV1 = res.data.data.voteExplain;
+            state.baseVote = res.data.data.baseVote;
+            state.ascriptionId = res.data.data.ascriptionId;
+            state.voteId = res.data.data.id;
+            state.time = [
+              dayjs(res.data.data.voteStartTime, "YYYY-MM-DD HH:mm"),
+              dayjs(res.data.data.voteEndTime, "YYYY-MM-DD HH:mm"),
+            ];
+          })
     };
     const updateToTask = (res) => {
       console.log("props.isLevel=====", props.isLevel);
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
         RouterEditTask({
           chapterId: props.isactive,
-          courseId: res.data.data.voteId,
+          courseId: res.data.data.id,
           name: res.data.data.voteName,
           routerId: props.routerId,
           routerTaskId: props.routerTaskId || 0,
           type: 12,
-        })
-          .then(() => {
-            //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-            ctx.emit("changeData", false);
-            state.addLoading = false;
-          })
-          .catch(() => {
-            //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
-          });
+        }).then(() => {
+              ctx.emit("changeData", false);
+              state.addLoading = false;
+            })
       } else if (props.isLevel == 2) {
-        apiTask
-          .addTask({
-            courseId: res.data.data.voteId,
-            name: res.data.data.voteName,
-            projectId: props.projectId,
-            projectTaskId: props.projectTaskId || 0,
-            stageId: props.chooseStageId || 0,
-            type: 12,
-          })
-          .then(() => {
-            //message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
-            ctx.emit("changeData", false);
-          })
-          .catch(() => {
-            ////message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
-          });
+        apiTask.addTask({
+              courseId: res.data.data.id,
+              name: res.data.data.voteName,
+              projectId: props.projectId,
+              projectTaskId: props.projectTaskId || 0,
+              stageId: props.chooseStageId || 0,
+              type: 12,
+            })
+            .then(() => {
+              ctx.emit("changeData", false);
+            })
       } else if (props.isLevel == 3) {
         addTempTask({
-          courseId: res.data.data.voteId,
+          courseId: res.data.data.id,
           name: res.data.data.voteName,
           projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
           stageId: props.chooseStageId || 0,
           type: 12,
         })
-          .then(() => {
-            ctx.emit("changeData", false);
-            //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
-          })
-          .catch(() => {
-            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
-          });
+            .then(() => {
+              ctx.emit("changeData", false);
+              //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            })
       }
     };
     //修改投票信息接口
@@ -368,7 +336,7 @@ export default {
         message.destroy();
         return message.warning("请输入投票名称");
       }
-      if (!state.ballotId) {
+      if (!state.voteId) {
         message.destroy();
         return message.warning("请创建题干信息");
       }
@@ -377,54 +345,23 @@ export default {
         message.destroy();
         return message.warning("请输入起止时间");
       }
-      // if (!state.basevote) {
-      //   return message.warning("请上传投票基数");
-      // }
-      if (state.time != undefined) {
-        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD HH:mm");
-        state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD HH:mm");
+      if (state.time) {
+        state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss");
+        state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss");
       }
-
       let obj = {
-        voteId: props.edit ? props.EditVoteId : 0,
         voteName: state.inputV1,
-        voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm"),
-        voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm"),
-        ballotId: state.ballotId,
-        baseVote: state.basevote,
+        voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD HH:mm:ss"),
+        voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD HH:mm:ss"),
+        id: state.voteId,
         voteExplain: state.textV1,
-        //votesTotal: state.totalVoteNum, //总票数
-        //numberOfInvolved: state.partakeNum, //参与数
-        //numberOfBrowse: state.browseNum, //浏览数
       };
-      if (props.edit) {
-        api
-          .editVote(obj)
-          .then(async (res) => {
-            console.log("updte======");
-            await updateToTask(res);
-            closeDrawer();
-            message.destroy();
-            message.success("修改投票信息成功");
-          })
-          .catch(() => {
-            message.destroy();
-            message.error("修改投票信息失败");
-          });
-      } else {
-        api
-          .createVote(obj)
-          .then(async (res) => {
-            await updateToTask(res);
-            closeDrawer();
-            message.destroy();
-            message.success("创建投票信息成功");
-          })
-          .catch(() => {
-            message.destroy();
-            message.error("创建投票信息失败");
-          });
-      }
+      api.editVote(obj).then(async (res) => {
+        await updateToTask(res);
+        closeDrawer();
+        message.destroy();
+        message.success(props.edit ? "修改投票信息成功" : "添加投票信息成功");
+      })
     };
     const queryStem = () => {
       state.addStemVisible = true;
@@ -486,8 +423,8 @@ export default {
             width: calc(100%);
             height: 40px;
             background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
+                    rgba(78, 166, 255, 0.2) 0%,
+                    rgba(78, 166, 255, 0) 100%
             );
           }
 
@@ -666,38 +603,41 @@ export default {
             }
           }
         }
+
         .in {
 
-            element.style {
-                border-radius: 8px;
-            }
+          element.style {
+            border-radius: 8px;
+          }
 
-            .ant-input-affix-wrapper {
-                position: relative;
-                display: inline-block;
-                width: 132%;
-                /* min-width: 19px; */
-                padding: 4px 11px;
-                color: rgba(0, 0, 0, 0.85);
-                font-size: 14px;
-                line-height: 1.5715;
-                background-color: #fff;
-                background-image: none;
-                border: 1px solid #d9d9d9;
-                border-radius: 2px;
-                transition: all 0.3s;
-                display: inline-flex;
-            }
+          .ant-input-affix-wrapper {
+            position: relative;
+            display: inline-block;
+            width: 132%;
+            /* min-width: 19px; */
+            padding: 4px 11px;
+            color: rgba(0, 0, 0, 0.85);
+            font-size: 14px;
+            line-height: 1.5715;
+            background-color: #fff;
+            background-image: none;
+            border: 1px solid #d9d9d9;
+            border-radius: 2px;
+            transition: all 0.3s;
+            display: inline-flex;
+          }
         }
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 423px;
 
             .ant-input {
-              width:355px;
+              width: 355px;
             }
 
             .ant-input-textarea-show-count {
diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 329c4ca3..3c66d2a2 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -1,45 +1,28 @@
 <!-- 评估管理-创建评估页面 -->
 <template>
   <a-drawer
-    :visible="createVoteVisible"
-    class="drawerStyle createvoteDrawer"
-    width="100%"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
+      :visible="createVoteVisible"
+      class="drawerStyle createvoteDrawer"
+      width="100%"
+      placement="right"
+      @after-visible-change="afterVisibleChange"
   >
     <div class="researchadd">
       <div class="header">
         <div class="headerTitle">{{ ballotId ? "编辑投票题干" : "创建投票题干" }}</div>
         <img
-          style="width: 29px; height: 29px; cursor: pointer"
-          src="../../assets/images/basicinfo/close.png"
-          @click="closeDrawer"
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
         />
       </div>
       <div class="main_left">
-        <!-- <div class="main_item">
-       
-          <div class="signbox">
-            <div class="sign">
-              <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
-            </div>
-            <span style="margin-right: 3px">投票名称：</span>
-          </div>
-          <div class="btnbox">
-            <a-input
-              v-model:value="ballotName"
-              style="width: 424px; height: 32px"
-              placeholder="请输入任务名称"
-              maxlength="20"
-            />
-          </div>
-        </div>-->
         <div class="main_item">
           <div class="signbox">
             <div class="sign">
               <img
-                src="@/assets/images/coursewareManage/asterisk.png"
-                alt="asterisk"
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt="asterisk"
               />
             </div>
             <span>创建题干：</span>
@@ -48,40 +31,38 @@
             <button class="xkbtn" @click="handleTypes">添加题干</button>
           </div>
         </div>
-        <!-- 创建投票侧弹窗 -->
       </div>
-
       <div
-        v-for="(item, index) in allFormsData"
-        :key="index + new Date().getTime()"
+          v-for="(item, index) in allFormsData"
+          :key="index + new Date().getTime()"
       >
-        <VoteQuestion :item="item" @del="handleDel" />
+        <VoteQuestion :item="item" @del="handleDel"/>
       </div>
 
       <div class="footer">
         <div class="btn">
           <a-button
-            type="primary"
-            style="
+              type="primary"
+              style="
               width: 100px;
               height: 40px;
               border-radius: 8px;
               background-color: #4ea6ff;
             "
-            @click="handleSave"
+              @click="handleSave"
           >
             保存
           </a-button>
           <a-button
-            type="primary"
-            ghost
-            style="
+              type="primary"
+              ghost
+              style="
               width: 100px;
               height: 40px;
               margin-left: 14px;
               border-radius: 8px;
             "
-            @click="handleAllCancel"
+              @click="handleAllCancel"
           >
             取消
           </a-button>
@@ -91,19 +72,11 @@
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, toRef, watch } from "vue";
-import { message } from "ant-design-vue";
-// import { createResearch } from "../../api/indexResearch";
+import {reactive, toRefs, toRef, watch} from "vue";
+import {message} from "ant-design-vue";
 import VoteQuestion from "./VoteQuestion.vue";
-
-import { sortBy, traverseArr } from "../../utils/utils";
-
-//import store from "@/store";
+import {sortBy, traverseArr} from "../../utils/utils";
 import * as api from "@/api/indexVote";
-//import { useRouter } from "vue-router";
-import {} from "@/api/indexResearch";
-
-//import { message } from "ant-design-vue";
 
 export default {
   name: "CreateVote",
@@ -115,37 +88,26 @@ export default {
       type: Boolean,
       default: false,
     },
-    ballotId: {
+    voteId: {
       type: Number,
       default: null,
     },
-    ballot_name: {
-      type: String,
-      default: null,
-    },
-    editChild: {
-      type: Boolean,
-      default: false,
-    },
   },
   setup(props, ctx) {
-    const ballotIdWatch = toRef(props, "ballotId");
+    const ballotIdWatch = toRef(props, "voteId");
     const state = reactive({
-      ballotId: "",
-      ballotName: "",
+      voteId: "",
       allFormsData: [],
     });
     watch(ballotIdWatch, (newValue) => {
       if (!newValue) {
-        state.ballotId = "";
-        state.ballotName = "";
+        state.voteId = "";
         state.allFormsData = [];
       }
     });
 
-    // const router = useRouter();
     const afterVisibleChange = () => {
-      if (props.ballotId) {
+      if (props.voteId) {
         getInfoDate();
       } else {
         handleTypes();
@@ -154,22 +116,14 @@ export default {
     const closeDrawer = () => {
       handleAllCancel();
       ctx.emit("update:createVoteVisible", false);
-      ctx.emit("update:ballotId", state.ballotId);
-      ctx.emit("update:ballot_name", state.ballotName);
+      ctx.emit("update:voteId", state.voteId);
     };
     // 详情
     const getInfoDate = async () => {
-      console.log("props.editChild=====", props.editChild);
-      if (props.ballotId) {
-        console.log("props.editChild2=====", props.editChild);
-        let res = await api.queryStemByStemId(props.ballotId).then((res) => {
-          if (res.data.code === 200) {
-            return res.data.data;
-          }
-        });
-        state.ballotId = res.ballotId;
-        state.ballotName = res.ballotName;
-        let renderArr = [...res.voteStemVoList];
+      if (props.voteId) {
+        let res = await api.queryStemByStemId(props.voteId).then((res) => res.data.data);
+        state.voteId = res.id;
+        let renderArr = [...res.voteStemDtoList];
         sortBy(renderArr, "orderNumber"); //序号
         state.allFormsData = parseData(renderArr);
       }
@@ -264,7 +218,7 @@ export default {
       state.allFormsData.push(obj);
     };
 
-    const handleDel = ({ id, curItem }) => {
+    const handleDel = ({id, curItem}) => {
       if (state.allFormsData.length > 1) {
         // 接口删除
         if (curItem.voteStemId) {
@@ -292,57 +246,24 @@ export default {
     };
 
     const handleSave = () => {
-      let resultPost = {};
       let filterData = restData(state.allFormsData);
-      console.log("555555555555555555", filterData);
-
-      // 校验
-
       if (!checkVal(filterData)) {
         return false;
       }
-
-      if (state.ballotId) {
-        resultPost = {
-          ballotId: state.ballotId,
-          ballotName: state.ballotName,
-          voteStemDtoList: filterData,
-        };
-        console.log("resultPostresultPost");
-        console.log(resultPost);
-        api.updateStemMessage(resultPost).then((res) => {
-          if (res.data.code === 200) {
-            state.ballotId = res.data.data.ballotId;
-            console.log("res.data.data==============", res.data.data);
-            console.log("res.state.ballotId==============", state.ballotId);
-            message.success("编辑成功");
-            closeDrawer();
-          }
-        });
-      } else {
-        resultPost = {
-          ballotName: state.ballotName,
-          voteStemDtoList: filterData,
-        };
-        console.log("=========", resultPost);
-        api.createStemMessage(resultPost).then((res) => {
-          if (res.data.code === 200) {
-            state.ballotId = res.data.data.ballotId;
-            console.log("res.data.data2==============", res.data.data);
-            console.log("res.state.ballotId=2s=============", state.ballotId);
-            message.success("创建成功");
-            closeDrawer();
-          }
-        });
-      }
+      api.createStemMessage({
+        id: state.voteId,
+        voteStemDtoList: filterData,
+      }).then((res) => {
+        message.success(state.voteId ? "修改成功" : "创建成功");
+        state.voteId = res.data.data.id;
+        closeDrawer();
+      });
     };
     const handleAllCancel = () => {
       state.allFormsData = [];
     };
 
     const checkVal = (filterData) => {
-      console.log("filterData.====", filterData);
-
       for (let item of filterData) {
         if (!item.voteStemName) {
           message.error("题干为必填 请确认");

From b03d9d8051e49a2e4f3dd7190eeddb02bfab7cf3 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 13 Feb 2023 19:22:52 +0800
Subject: [PATCH 09/10] =?UTF-8?q?--fix=20=E6=B7=BB=E5=8A=A0=E6=8A=95?=
 =?UTF-8?q?=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexVote.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 36877226..0fc677c9 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -83,7 +83,7 @@ export const fileUp = (obj) =>
   http.post("/file/upload", obj, qs.stringify({ obj }));
 //根据题干ID获取投票任务
 export const queryVoteDetailById = (voteID) =>
-  http.post(`/vote/queryVoteById?voteId=${voteID}`);
+  http.get(`/vote/queryVoteById?voteId=${voteID}`);
 
 // 测试方法
 // import * as api from '../../api/index'

From a763754e4f39d1cfad21e2a034c373b0408e1e4d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Mon, 13 Feb 2023 19:25:35 +0800
Subject: [PATCH 10/10] =?UTF-8?q?--fix=20=E6=B7=BB=E5=8A=A0=E6=8A=95?=
 =?UTF-8?q?=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/CreateVote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/vote/CreateVote.vue b/src/components/vote/CreateVote.vue
index 3c66d2a2..162af968 100644
--- a/src/components/vote/CreateVote.vue
+++ b/src/components/vote/CreateVote.vue
@@ -62,7 +62,7 @@
               margin-left: 14px;
               border-radius: 8px;
             "
-              @click="handleAllCancel"
+              @click="closeDrawer"
           >
             取消
           </a-button>