Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/components/vote/AddVote.vue

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: 32px"
-                  placeholder="请输入投票名称"
-                  maxlength="20"
+                v-model:value="inputV1"
+                style="width: 424px; height: 32px"
+                placeholder="请输入投票名称"
+                maxlength="20"
               />
             </div>
           </div>
@@ -42,8 +42,8 @@
             <div class="signbox">
               <div class="sign">
                 <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
+                  src="@/assets/images/coursewareManage/asterisk.png"
+                  alt=""
                 />
               </div>
               <span>创建投票：</span>
@@ -61,16 +61,16 @@
               </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:ballotId="ballotId"
+                  v-model:editChild="editChild"
+                  v-model:ballot_name="ballot_name"
                 />
               </div>
               <button
-                  class="xkbtn"
-                  :style="{ display: creVote ? 'block' : 'none' }"
-                  @click="showDrawerCreVote"
+                class="xkbtn"
+                :style="{ display: creVote ? 'block' : 'none' }"
+                @click="showDrawerCreVote"
               >
                 编辑投票
               </button>
@@ -85,9 +85,9 @@
             <!-- 创建投票侧弹窗 -->
             <div>
               <create-vote
-                  v-model:crevoteVisible="crevotevisible"
-                  @getData="getStemId"
-                  v-model:ballotId="ballotId"
+                v-model:crevoteVisible="crevotevisible"
+                @getData="getStemId"
+                v-model:ballotId="ballotId"
               />
             </div>
             <!-- 创建投票侧弹窗 -->
@@ -96,17 +96,17 @@
             <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-range-picker
-                  style="width: 424px"
-                  v-model:value="time"
-                  :placeholder="['      开始时间', '        结束时间']"
+                style="width: 424px"
+                v-model:value="time"
+                :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
           </div>
@@ -114,8 +114,8 @@
             <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>
@@ -129,13 +129,22 @@
                 action="/manageApi/vote/baseVoteupload"
                 v-model:file-list="fileList"
               > -->
-              <a-upload
-                  :before-upload="beforeUpload"
-                  :multiple="false"
-                  :max-count="1"
-                  v-model:file-list="fileList"
-              >
+              <a-upload :before-upload="beforeUpload" :max-count="1">
                 <button class="xkbtn">点击上传</button>
+                <template #itemRender="{ file, actions }">
+                  <a-space v-if="file.type.indexOf('sheet') > -1">
+                    <span :style="file.status === 'error' ? 'color: red' : ''">
+                      {{ file.name }}
+                    </span>
+                    <a href="javascript:;" @click="actions.remove">
+                      <img
+                        src="../../assets/del.png"
+                        alt="del"
+                        style="width: 12px; height: 12px"
+                      />
+                    </a>
+                  </a-space>
+                </template>
               </a-upload>
               <div v-if="voteCount > 0">
                 <a-tag color="processing">
@@ -160,11 +169,11 @@
             </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>
@@ -178,15 +187,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",
@@ -266,11 +275,11 @@ export default {
     });
     const closeDrawer = () => {
       (state.inputV1 = ""),
-          (state.textV1 = ""),
-          (state.time = undefined),
-          (state.basevote = ""),
-          (state.ballotId = ""),
-          ctx.emit("update:addvoteVisible", false);
+        (state.textV1 = ""),
+        (state.time = undefined),
+        (state.basevote = ""),
+        (state.ballotId = ""),
+        ctx.emit("update:addvoteVisible", false);
       ctx.emit("update:edit", false);
     };
     const afterVisibleChange = (bool) => {
@@ -288,41 +297,27 @@ export default {
 
     // 限制文件格式上传
     const beforeUpload = (file) => {
-      console.log(file);
       if (file.type.indexOf("sheet") == -1) {
         message.destroy();
         message.error("请上传正确的文件格式");
 
-        console.log(state.fileList);
-
         state.fileList = [];
-        return;
+        return false;
       }
 
-      // let resFileList = [...info.fileList];
-
-      // 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);
-      //     state.voteCount = file.response.data;
-      //   }
-      // });
-
       const formData = new FormData();
       formData.append("uploadFile", file);
       baseVoteupload(formData).then((res) => {
         if (res.data.code === 200) {
-          console.log(res);
+          state.basevote = res.data.data;
         }
       });
+      return false;
     };
 
     //删除题干信息接口
     const dleVoteStem = () => {
-      api.deleteVoteStem({voteStemId: state.ballotId}).then(() => {
+      api.deleteVoteStem({ voteStemId: state.ballotId }).then(() => {
         message.success("删除题干信息成功");
       });
     };
@@ -330,22 +325,22 @@ export default {
     //根据投票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"),
-              dayjs(res.data.data.voteEndTime, "YYYY-MM-DD"),
-            ];
-          })
-          .catch((err) => {
-            console.log("获取投票信息失败", err);
-          });
+        .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);
@@ -358,31 +353,31 @@ export default {
           routerTaskId: props.routerTaskId || 0,
           type: 12,
         })
-            .then(() => {
-              //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
-              ctx.emit("changeData", false);
-              state.addLoading = false;
-            })
-            .catch(() => {
-              //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
-            });
+          .then(() => {
+            //message.success(`${props.edit ? '编辑' : '新增'}关卡任务成功`)
+            ctx.emit("changeData", false);
+            state.addLoading = false;
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
+          });
       } 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 ? '编辑' : '新增'}阶段任务失败`)
-            });
+          .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 ? '编辑' : '新增'}阶段任务失败`)
+          });
       } else if (props.isLevel == 3) {
         addTempTask({
           courseId: res.data.data.voteId,
@@ -392,24 +387,24 @@ export default {
           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 ? "编辑" : "新增"}阶段任务成功`);
+          })
+          .catch(() => {
+            //message.error(`${props.edit ? "编辑" : "新增"}阶段任务失败`);
+          });
       }
     };
     //修改投票信息接口
     const updateVoteInfo = () => {
       if (!state.inputV1) {
         message.destroy();
-        return message.info("请输入投票名称");
+        return message.warning("请输入投票名称");
       }
       if (!state.ballotId) {
         message.destroy();
-        return message.info("请创建题干信息");
+        return message.warning("请创建题干信息");
       }
 
       if (!state.time) {
@@ -417,7 +412,7 @@ export default {
         return message.warning("请输入直播时间");
       }
       if (!state.basevote) {
-        return message.info("请上传投票基数");
+        return message.warning("请上传投票基数");
       }
       if (state.time != undefined) {
         state.startTime = dayjs(state.time[0]).format("YYYY-MM-DD");
@@ -435,31 +430,31 @@ export default {
       };
       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("修改投票信息失败");
-            });
+          .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("创建投票信息失败");
-            });
+          .createVote(obj)
+          .then(async (res) => {
+            await updateToTask(res);
+            closeDrawer();
+            message.destroy();
+            message.success("创建投票信息成功");
+          })
+          .catch(() => {
+            message.destroy();
+            message.error("创建投票信息失败");
+          });
       }
     };
     const queryStem = () => {
@@ -522,8 +517,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%
             );
           }
 
@@ -707,7 +702,6 @@ export default {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
-
           .textarea {
             width: 423px;