From eb1721d263d99ffa224692d6da4db834862293f8 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Wed, 30 Nov 2022 23:41:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8A=95=E7=A5=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=A3=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/indexVote.js            |   2 +-
 src/components/vote/AddVote.vue | 324 ++++++++++++++++----------------
 2 files changed, 159 insertions(+), 167 deletions(-)

diff --git a/src/api/indexVote.js b/src/api/indexVote.js
index 9cacddc1..0f91f1bb 100644
--- a/src/api/indexVote.js
+++ b/src/api/indexVote.js
@@ -82,7 +82,7 @@ export const updateStemMessage = (obj) => http.post('/vote/updateStemMessage', o
 //上传组件
 export const fileUp = (obj) => http.post('/file/upload', obj, qs.stringify({ obj }));
 //根据题干ID获取投票任务
-export const queryVoteDetailById = (obj) => http.post('/vote/queryVoteDetailById', obj)
+export const queryVoteDetailById = (voteID) => http.post(`/vote/queryVoteDetailById?voteId=${voteID}`)
 
 // 测试方法
 // import * as api from '../../api/index'
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index 5aa04497..e49bb756 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -1,83 +1,54 @@
 <template>
-  <a-drawer
-    :visible="addvoteVisible"
-    class="drawerStyle addvoteDrawer"
-    width="80%"
-    title="添加投票"
-    placement="right"
-    @after-visible-change="afterVisibleChange"
-  >
+  <a-drawer :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"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
+                <img 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: 32px"
-                placeholder="请输入投票名称"
-                maxlength="20"
-              />
+              <a-input v-model:value="inputV1" 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=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span>创建投票：</span>
             </div>
             <div class="btnbox">
-              <button
-                class="xkbtn"
-           
-                @click="showDrawerCreVote"
-              >
-              {{ ballotId ? "编辑" : "添加" }}投票
-               
+              <button class="xkbtn" @click="showDrawerCreVote">
+                {{ ballotId ? "编辑" : "添加" }}投票
+
               </button>
-              <div v-if = "ballotId>0">
-              <a-tag  closable   color="processing" @close="log">
-            <span style="font-size:14px;line-height: 33px;" >删除投票</span>
-            </a-tag></div>
+              <div v-if="ballotId > 0">
+                <a-tag closable color="processing" @close="log">
+                  <span style="font-size:14px;line-height: 33px;">删除投票</span>
+                </a-tag>
+              </div>
               <div>
-            <CreateVote
-              v-model:createVoteVisible="createVoteVisible"
-              v-model:ballotId="ballotId"
-              v-model:editChild="editChild"
-            />
-          </div>
-              <button
-                class="xkbtn"
-                :style="{ display: creVote ? 'block' : 'none' }"
-                @click="showDrawerCreVote"
-              >
+                <CreateVote v-model:createVoteVisible="createVoteVisible" v-model:ballotId="ballotId"
+                  v-model:editChild="editChild" />
+              </div>
+              <button class="xkbtn" :style="{ display: creVote ? 'block' : 'none' }" @click="showDrawerCreVote">
                 编辑投票
               </button>
               <div :style="{ display: creVote ? 'block' : 'none' }">
                 <div class="fileTigan">
-                  <span style="color: #388be1">{{ballotName}}</span>
+                  <span style="color: #388be1">{{ ballotName }}</span>
                   <div class="delBox" @click="dleVoteStem()"></div>
                 </div>
               </div>
@@ -85,11 +56,7 @@
 
             <!-- 创建投票侧弹窗 -->
             <div>
-              <create-vote
-                v-model:crevoteVisible="crevotevisible"
-                @getData="getStemId"
-                v-model:ballotId="ballotId"
-              />
+              <create-vote v-model:crevoteVisible="crevotevisible" @getData="getStemId" v-model:ballotId="ballotId" />
             </div>
             <!-- 创建投票侧弹窗 -->
           </div>
@@ -98,11 +65,7 @@
               <span style="margin-right: 3px">起止时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
-                style="width: 424px"
-                v-model:value="time"
-                :placeholder="['      开始时间', '        结束时间']"
-              />
+              <a-range-picker style="width: 424px" v-model:value="time" :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
           <div class="main_item">
@@ -110,15 +73,12 @@
               <span style="margin-right: 3px">基础投票数：</span>
             </div>
             <div class="btnbox">
-              <a-upload
-                @change="handleChange"
-                :multiple="true"
-                :max-count="1"
-                action="/manageApi/vote/baseVoteupload"
-                v-model:file-list="fileList"
-              >
-              <button class="xkbtn">点击上传</button></a-upload>
-          <div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;" >{{voteCount}}票</span></a-tag></div>
+              <a-upload @change="handleChange" :multiple="true" :max-count="1" action="/manageApi/vote/baseVoteupload"
+                v-model:file-list="fileList">
+                <button class="xkbtn">点击上传</button></a-upload>
+              <div v-if="voteCount > 0"><a-tag color="processing"> <span style="font-size:14px;line-height: 33px;">{{
+                  voteCount
+              }}票</span></a-tag></div>
             </div>
           </div>
           <div class="main_item" style="margin-top: -25px">
@@ -132,12 +92,7 @@
               <span style="margin-right: 3px">投票说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                v-model:value="textV1"
-                placeholder="请输入投票说明"
-                allow-clear
-                maxlength="150"
-              />
+              <a-textarea v-model:value="textV1" placeholder="请输入投票说明" allow-clear maxlength="150" />
             </div>
           </div>
         </div>
@@ -150,7 +105,7 @@
   </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";
@@ -206,7 +161,7 @@ export default {
       type: Number,
       default: null,
     },
-    projectTemplateId:{
+    projectTemplateId: {
       type: Number,
       default: null,
     }
@@ -219,101 +174,101 @@ export default {
       textV1: "",
       createVoteVisible: false,
       time: undefined,
-      startTime:"",
-      endTime:"",
+      startTime: "",
+      endTime: "",
       basevote: "",
       ascriptionId: "",
       voteStemId: null,
-      EditVoteId:"",
-      voteStemName:"",
+      EditVoteId: "",
+      voteStemName: "",
       ballotName: "",
       editStem: false,  //编辑状态
       ballotId: 0, //题干id
       optionId: "", //删除，修改选项id
-      addStemVisible:false, //
-      editChild:false,
+      addStemVisible: false, //
+      editChild: false,
       fileList: [],
-      voteCount:null,
-      projectTemplateId:null,
-     
+      voteCount: null,
+      projectTemplateId: null,
+
     });
     const closeDrawer = () => {
-        state.inputV1 = "",
+      state.inputV1 = "",
         state.textV1 = "",
         state.time = undefined,
         state.basevote = "",
-        state.ballotId ="", 
-      ctx.emit("update:addvoteVisible", false);
+        state.ballotId = "",
+        ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
-      if(props.edit&&bool){
+      if (props.edit && bool) {
         queryVoteInfo();
       }
       state.projectTemplateId = props.projectTemplateId;
-      console.log("projectTemplateId visible====",state.projectTemplateId);
-       
+      console.log("projectTemplateId visible====", state.projectTemplateId);
+
     };
 
 
     const showDrawerCreVote = () => {
       state.createVoteVisible = true;
       state.editChild = props.edit;
-      
+
 
     };
 
     const handleChange = info => {
       let resFileList = [...info.fileList];
 
-    
-     resFileList.map(file => {
+
+      resFileList.map(file => {
         if (file.response) {
           // Component will show file.url as link
           file.url = file.response.url;
-          console.log("file========",file);
-          console.log("file========",file.response);
+          console.log("file========", file);
+          console.log("file========", file.response);
           state.voteCount = file.response.data;
         }
-       
+
       });
       //fileList.value = resFileList;
     };
- 
+
     //删除题干信息接口
     const dleVoteStem = () => {
-      api.deleteVoteStem({voteStemId:state.ballotId})
+      api.deleteVoteStem({ voteStemId: state.ballotId })
         .then(() => {
           message.success('删除题干信息成功')
-          
-      })
+
+        })
     }
 
     //根据投票id获取投票信息
-     const queryVoteInfo = ()=>{
-    
-      api.queryVoteDetailById({voteId: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 = [
+    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"),
             dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
           ];
-       })
-       .catch((err)=>{
-         console.log('获取投票信息失败',err);
-       });
-       
-      
-     }
-     const updateToTask =(res)=>{
-      console.log("props.isLevel=====",props.isLevel);
-      if(props.isLevel ==1){
+        })
+        .catch((err) => {
+          console.log('获取投票信息失败', err);
+        });
+
+
+    }
+    const updateToTask = (res) => {
+      console.log("props.isLevel=====", props.isLevel);
+      if (props.isLevel == 1) {
         RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.voteId,
@@ -325,15 +280,15 @@ export default {
           .then(() => {
             //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
             ctx.emit("changeData", false);
-            state.addLoading = false;               
+            state.addLoading = false;
           })
-          .catch(( ) => {
+          .catch(() => {
             //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
           });
-      }else if(props.isLevel ==2){
+      } else if (props.isLevel == 2) {
         apiTask
           .addTask({
-            courseId:res.data.data.voteId,
+            courseId: res.data.data.voteId,
             name: res.data.data.voteName,
             projectId: props.projectId,
             projectTaskId: props.projectTaskId || 0,
@@ -342,13 +297,13 @@ export default {
           })
           .then(() => {
             //message.success(`${props.edit ? '编辑' : '新增'}阶段任务成功`)
-            ctx.emit("changeData", false);   
+            ctx.emit("changeData", false);
           })
           .catch(() => {
             ////message.error(`${props.edit ? '编辑' : '新增'}阶段任务失败`)
           });
-      }else if (props.isLevel == 3) {
-      
+      } else if (props.isLevel == 3) {
+
         addTempTask({
           courseId: res.data.data.voteId,
           name: res.data.data.voteName,
@@ -371,7 +326,7 @@ export default {
       if (!state.inputV1) {
         message.destroy();
         return message.info("请输入投票名称");
-      } 
+      }
       if (!state.ballotId) {
         message.destroy();
         return message.info("请创建题干信息");
@@ -380,50 +335,50 @@ export default {
       if (state.basevote == "") {
         state.basevote = 1;
       }
-      if(state.time != undefined){
+      if (state.time != undefined) {
         state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
         state.endTime = dayjs(state.time[1]).format("YYYY-MM-DD");
       }
 
       let obj = {
-        voteId: props.edit?props.EditVoteId : 0,
+        voteId: props.edit ? props.EditVoteId : 0,
         voteName: state.inputV1,
         voteStartTime: dayjs(state.time[0]).format("YYYY-MM-DD"),
         voteEndTime: dayjs(state.time[1]).format("YYYY-MM-DD"),
         ballotId: state.ballotId,
         baseVote: state.basevote,
-        voteExplain: state.textV1, 
-       
+        voteExplain: state.textV1,
+
       }
-      if(props.edit){
+      if (props.edit) {
         api
-        .editVote(obj)
-        .then((res) => {
-          console.log("updte======");
-          updateToTask(res);
-          closeDrawer();
-          message.destroy();
-          message.success("修改投票信息成功")
-        })
-        .catch(() => {
-          message.destroy();
-          message.error("修改投票信息失败")
-        })
-      }else{
+          .editVote(obj)
+          .then((res) => {
+            console.log("updte======");
+            updateToTask(res);
+            closeDrawer();
+            message.destroy();
+            message.success("修改投票信息成功")
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("修改投票信息失败")
+          })
+      } else {
         api
-        .createVote(obj)
-        .then((res) => {
-          updateToTask(res);
-          closeDrawer();
-          message.destroy();
-          message.success("创建投票信息成功")
-        })
-        .catch(() => {
-          message.destroy();
-          message.error("创建投票信息失败")
-        })
+          .createVote(obj)
+          .then((res) => {
+            updateToTask(res);
+            closeDrawer();
+            message.destroy();
+            message.success("创建投票信息成功")
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("创建投票信息失败")
+          })
       }
-      
+
     }
     const queryStem = () => {
       state.addStemVisible = true;
@@ -432,7 +387,7 @@ export default {
       state.addStemVisible = false;
     };
     const log = e => {
-      state.ballotId=null;
+      state.ballotId = null;
       console.log(e);
     };
     return {
@@ -456,13 +411,16 @@ export default {
   .ant-modal {
     width: 424px !important;
     height: 258px !important;
+
     .ant-modal-content {
       width: 424px !important;
       height: 258px !important;
+
       .ant-modal-body {
         width: 424px !important;
         height: 258px !important;
         padding: 0 !important;
+
         .delete {
           z-index: 999;
           width: 424px;
@@ -470,24 +428,26 @@ export default {
           background: #ffffff;
           box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
           border-radius: 4px;
+
           .del_header {
             position: absolute;
             width: calc(100%);
             height: 40px;
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
+            background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+                rgba(78, 166, 255, 0) 100%);
           }
+
           .del_main {
             width: 100%;
             position: relative;
+
             .header {
               display: flex;
               align-items: center;
               padding-top: 20px;
               padding-left: 26px;
               font-size: 16px;
+
               .icon {
                 width: 16px;
                 height: 16px;
@@ -495,6 +455,7 @@ export default {
                 background-image: url(@/assets/images/coursewareManage/QR.png);
                 background-size: 100% 100%;
               }
+
               .close_exit {
                 position: absolute;
                 right: 42px;
@@ -505,6 +466,7 @@ export default {
                 background-size: 100% 100%;
               }
             }
+
             .body {
               width: 100%;
               margin: 34px auto 56px auto;
@@ -513,6 +475,7 @@ export default {
               align-items: center;
               flex-direction: column;
               position: relative;
+
               .back {
                 position: absolute;
                 top: 30px;
@@ -521,10 +484,12 @@ export default {
                 color: #666666;
               }
             }
+
             .del_btnbox {
               display: flex;
               margin: 30px auto;
               justify-content: center;
+
               .del_btn {
                 width: 100px;
                 height: 40px;
@@ -535,17 +500,20 @@ export default {
                 justify-content: center;
                 flex-shrink: 0;
                 cursor: pointer;
+
                 .btnText {
                   font-size: 14px;
                   font-weight: 400;
                   line-height: 40px;
                 }
               }
+
               .btn1 {
                 border: 1px solid rgba(64, 158, 255, 1);
                 color: #4ea6ff;
                 margin-right: 14px;
               }
+
               .btn2 {
                 background-color: #4ea6ff;
                 color: #ffffff;
@@ -557,9 +525,11 @@ export default {
     }
   }
 }
+
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
+
 .addvoteDrawer {
   .drawerMain {
     .header {
@@ -569,6 +539,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       flex-shrink: 0;
+
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
@@ -577,31 +548,38 @@ export default {
         margin-left: 24px;
       }
     }
+
     .contentMain {
       display: flex;
       justify-content: space-between;
+
       .main_left {
         padding-right: 30px;
         flex: 1;
         border-right: 1px solid #e8e8e8;
         margin-top: 32px;
+
         .main_item {
           display: flex;
           align-items: center;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .btnbox {
             display: flex;
             flex: 1;
             align-items: center;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -613,14 +591,17 @@ export default {
               color: #fff;
               margin-right: 10px;
             }
+
             .fileTigan {
               display: flex;
               align-items: center;
               padding: 3px 5px;
               background-color: rgba(42, 103, 209, 0.4);
+
               span {
                 margin-right: 5px;
               }
+
               .delBox {
                 width: 13px;
                 height: 13px;
@@ -631,28 +612,34 @@ export default {
             }
           }
         }
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .signbox {
             width: 120px;
             display: flex;
             justify-content: end;
             align-items: center;
+
             .sign {
               margin-right: 5px;
             }
           }
+
           .kqszbox {
             .qdqtbox {
               margin-left: 56px;
             }
+
             .setbox {
               display: flex;
               flex-wrap: wrap;
               margin-top: 10px;
               margin-bottom: 24px;
+
               .timerbox {
                 margin-top: 6px;
                 margin-right: 32px;
@@ -662,10 +649,12 @@ export default {
               }
             }
           }
+
           .btnbox2 {
             display: flex;
             flex-direction: column;
             justify-content: flex-start;
+
             .xkbtn {
               cursor: pointer;
               width: 130px;
@@ -682,6 +671,7 @@ export default {
         }
       }
     }
+
     .main_btns {
       height: 72px;
       width: 100%;
@@ -691,6 +681,7 @@ export default {
       align-items: center;
       justify-content: center;
       box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16);
+
       .btn1 {
         width: 100px;
         height: 40px;
@@ -700,6 +691,7 @@ export default {
         background-color: #fff;
         cursor: pointer;
       }
+
       .btn2 {
         cursor: pointer;
         width: 100px;