--fix 添加投票

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'

src/components/vote/AddVote.vue

@@ -38,60 +38,6 @@
               />
             </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 ? "编辑" : "创建" }}投票题干
-              </button>
-              <div v-if="ballotId > 0">
-                <a-tag closable color="processing" @close="handlelog">
-                  <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"
-                  v-model:ballot_name="ballot_name"
-                />
-              </div>
-              <button
-                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>
-                  <div class="delBox" @click="dleVoteStem()"></div>
-                </div>
-              </div>
-            </div>
-
-            <!-- 创建投票侧弹窗 -->
-            <div>
-              <create-vote
-                v-model:crevoteVisible="crevotevisible"
-                @getData="getStemId"
-                v-model:ballotId="ballotId"
-              />
-            </div>
-            <!-- 创建投票侧弹窗 -->
-          </div>
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -113,7 +59,57 @@
               />
             </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">
+                {{ voteId ? "编辑" : "创建" }}投票题干
+              </button>
+              <div v-if="voteId">
+                <a-tag closable color="processing" @close="handlelog">
+                  <span style="font-size: 14px; line-height: 33px">
+                    删除投票题干
+                  </span>
+                </a-tag>
+              </div>
+              <div>
+                <CreateVote
+                    v-model:createVoteVisible="createVoteVisible"
+                    v-model:voteId="voteId"
+                />
+              </div>
+              <button
+                  class="xkbtn"
+                  :style="{ display: creVote ? 'block' : 'none' }"
+                  @click="showDrawerCreVote"
+              >
+                编辑投票
+              </button>
+              <div :style="{ display: creVote ? 'block' : 'none' }">
+                <div class="fileTigan">
+                  <span style="color: #4ea6ff">{{ voteName }}</span>
+                  <div class="delBox" @click="dleVoteStem()"></div>
+                </div>
+              </div>
+            </div>
 
+            <!-- 创建投票侧弹窗 -->
+            <div>
+              <create-vote
+                  v-model:crevoteVisible="crevotevisible"
+                  v-model:voteId="voteId"
+              />
+            </div>
+            <!-- 创建投票侧弹窗 -->
+          </div>
           <div class="main_item2">
             <div class="signbox">
               <span style="margin-right: 3px">投票说明：</span>
@@ -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,33 +265,25 @@ 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)
+      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.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"),
             ];
-          state.totalVoteNum = res.data.data.votesTotal; //总票数
-          state.partakeNum = res.data.data.numberOfInvolved; //参与数
-          state.browseNum = res.data.data.numberOfBrowse; //浏览数
           })
-        .catch((err) => {
-          console.log("获取投票信息失败", err);
-        });
     };
     const updateToTask = (res) => {
       console.log("props.isLevel=====", props.isLevel);
@@ -313,24 +294,18 @@ export default {
         }
         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 ? '编辑' : '新增'}关卡任务成功`)
+        }).then(() => {
               ctx.emit("changeData", false);
               state.addLoading = false;
             })
-          .catch(() => {
-            //message.error(`${props.edit ? '编辑' : '新增'}关卡任务失败`)
-          });
       } else if (props.isLevel == 2) {
-        apiTask
-          .addTask({
-            courseId: res.data.data.voteId,
+        apiTask.addTask({
+              courseId: res.data.data.id,
               name: res.data.data.voteName,
               projectId: props.projectId,
               projectTaskId: props.projectTaskId || 0,
@@ -338,15 +313,11 @@ export default {
               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,
+          courseId: res.data.data.id,
           name: res.data.data.voteName,
           projectTemplateId: props.projectTemplateId,
           projectTaskId: props.projectTaskId || 0,
@@ -357,9 +328,6 @@ export default {
               ctx.emit("changeData", false);
               //message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
             })
-          .catch(() => {
-            //message.error(`${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======");
+      api.editVote(obj).then(async (res) => {
         await updateToTask(res);
         closeDrawer();
         message.destroy();
-            message.success("修改投票信息成功");
+        message.success(props.edit ? "修改投票信息成功" : "添加投票信息成功");
       })
-          .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("创建投票信息失败");
-          });
-      }
     };
     const queryStem = () => {
       state.addStemVisible = true;
@@ -666,6 +603,7 @@ export default {
             }
           }
         }
+
         .in {
 
           element.style {
@@ -689,10 +627,12 @@ export default {
             display: inline-flex;
           }
         }
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
           margin-bottom: 32px;
+
           .textarea {
             width: 423px;
 

src/components/vote/CreateVote.vue

@@ -17,23 +17,6 @@
         />
       </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">
@@ -48,9 +31,7 @@
             <button class="xkbtn" @click="handleTypes">添加题干</button>
           </div>
         </div>
-        <!-- 创建投票侧弹窗 -->
       </div>
-
       <div
           v-for="(item, index) in allFormsData"
           :key="index + new Date().getTime()"
@@ -93,17 +74,9 @@
 <script>
 import {reactive, toRefs, toRef, watch} from "vue";
 import {message} from "ant-design-vue";
-// import { createResearch } from "../../api/indexResearch";
 import VoteQuestion from "./VoteQuestion.vue";
-
 import {sortBy, traverseArr} from "../../utils/utils";
-
-//import store from "@/store";
 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);
       }
@@ -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,
+      api.createStemMessage({
+        id: state.voteId,
         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("编辑成功");
+      }).then((res) => {
+        message.success(state.voteId ? "修改成功" : "创建成功");
+        state.voteId = res.data.data.id;
         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();
-          }
-        });
-      }
     };
     const handleAllCancel = () => {
       state.allFormsData = [];
     };
 
     const checkVal = (filterData) => {
-      console.log("filterData.====", filterData);
-
       for (let item of filterData) {
         if (!item.voteStemName) {
           message.error("题干为必填 请确认");