--fix 添加投票

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 {