feat:合并

2025-12-08 10:26:44 +08:00 · 2023-02-13 20:42:19 +08:00
parent c601a46b47 a763754e4f
commit e1a45d38e1
8 changed files with 207 additions and 350 deletions
--- 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.get(`/vote/queryVoteById?voteId=${voteID}`);

 // 测试方法
 // import * as api from '../../api/index'
--- 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>
--- 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 || "-",
--- 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)
    };

  
--- 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 {
--- 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="closeDrawer"
          >
            取消
          </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("题干为必填 请确认");
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1590,7 +1590,7 @@ import {
  list,
  edit,
  detail,
-  detailPlan,
+  // detailPlan,
  handle,
  deletePlan,
  planList,
@@ -3751,18 +3751,10 @@ export default defineComponent({
    };

    //编辑开课
-    const handelEditStu = async (itm) => {
-      console.log("编辑开课", itm);
+    const handelEditStu = async (item) => {
+      state.offcourseId = item.offcourseId;
+      state.offcoursePlanId = item.id;

-      state.offcourseId = itm.offcourseId;
-      state.offcoursePlanId = itm.id;
-
-      const item = await detailPlan({
-        offcoursePlanId: Number(state.offcoursePlanId),
-      }).then((res) => {
-        if (res.data.code === 200) return res.data.data;
-      });
-      console.log("测评", item);
      if (item.evaluateId) {
        api
          .queryAppraiseDetailById({ assessmentId: item.evaluateId })
@@ -3785,7 +3777,7 @@ export default defineComponent({
      }

      console.log("res");
-      console.log("获取面授课详情", item);
+      console.log("获取面授课开课详情", item);

      state.xjkkinputV2 = item.address;
      state.checked1 = item.applyFlag === 1 ? true : false;
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -171,14 +171,14 @@
                  <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>
                  </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 } }">
@@ -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>
@@ -611,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">
@@ -619,7 +616,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 +1029,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 +1887,8 @@ export default {

      closedeleteAll,
      subdeleteAll,
-      saveUnlock
+      saveUnlock,
+      closeUnlockModal
    };
  },
 };