feat:合并

2025-12-11 03:46:45 +08:00 · 2022-11-14 21:15:37 +08:00
parent 4574d93c96 b66a453d49
commit d362f3db09
14 changed files with 960 additions and 647 deletions
--- a/src/api/indexProjStu.js
+++ b/src/api/indexProjStu.js
@@ -22,4 +22,7 @@ export const studentProcess = (obj) => http.get('/admin/project/studentProcess',
 export const topStudent = (obj) => http.post('/admin/project/topStudent', obj)

 //项目概览
-export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
+export const overview = (obj) => http.get('/admin/project/overview', { params: obj })
+
+//设置项目积分规则
+export const setScoreRule = (obj) => http.post('/admin/project/setScoreRule', obj)
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -65,7 +65,7 @@
              </button>
              <div :style="{ display: creVote ? 'block' : 'none' }">
                <div class="fileTigan">
-                  <span style="color: #388be1">{{voteStemName}}</span>
+                  <span style="color: #388be1">{{ballotName}}</span>
                  <div class="delBox" @click="dleVoteStem()"></div>
                </div>
              </div>
@@ -76,6 +76,7 @@
                v-model:crevoteVisible="crevotevisible"
                @getData="getStemId"
                v-model:voteStemId="voteStemId"
+                v-model:editStem="editStem"
              />
            </div>
            <!-- 创建投票侧弹窗 -->
@@ -122,7 +123,7 @@
      </div>
      <div class="main_btns">
        <button class="btn1">取消</button>
-        <button class="btn2" @click="createVoteText()">确定</button>
+        <button class="btn2" @click="creoredi()">确定</button>
      </div>
    </div>
  </a-drawer>
@@ -184,6 +185,14 @@ export default {
      type: Number,
      default: null,
    },
+    voteId: {
+      type: Number,
+      default: null,
+    },
+    ballotId: {
+      type: Number,
+      default: null,
+    }
  },
  setup(props, ctx) {
    const state = reactive({
@@ -199,34 +208,52 @@ export default {
      voteStemId: null,
      voteId:"",
      voteStemName:"",
+      ballotName: "",
+      editStem: false,  //编辑状态
+      ballotId: "", //题干id
+      optionId: "", //删除，修改选项id
    });
    const closeDrawer = () => {
+      state.inputV1 = "",
+        state.textV1 = "",
+        state.startTimes = "",
+        state.time = undefined,
+        state.endTimes = "",
+        state.basevote = "",
      ctx.emit("update:addvoteVisible", false);
      ctx.emit("update:edit", false);
    };
    const afterVisibleChange = (bool) => {
      console.log("state", bool);
+      // if (props.edit == true) {
+      //   queryVoteText()
+      // }
    };
    const showDrawerCreVote = () => {
      state.crevotevisible = true;
+      if (state.creVote == true) {
+        state.editStem = true
+      }
    };
    const getStemId = (data) => {
+      state.ballotName = data.ballotName;
      state.voteStemName = data.voteStemName;
      state.voteStemId = Number(data.voteStemId);
+      state.ballotId = Number(data.ballotId)
      state.creVote = data.creVote;
      console.log('state.voteStemId', state.voteStemId);
      console.log('state.voteStemId', state.creVote);
    }
    //暂时没用 之前给子用传参来着
-    const changeVData = (data) => {
-      console.log("111", data);
-      state.creVote = data.creVote;
-      state.ascriptionId = data.ascriptionId;
-      state.voteStemId = data.voteStemId;
-      state.voteStemName = data.voteStemName;
-      console.log("222", state.creVote);
-      console.log("333", state.ascriptionId);
-    };
+    // const changeVData = (data) => {
+    //   console.log("111", data);
+    //   state.creVote = data.creVote;
+    //   state.ascriptionId = data.ascriptionId;
+    //   state.voteStemId = data.voteStemId;
+    //   state.voteStemName = data.voteStemName;
+    //   console.log("222", state.creVote);
+    //   console.log("333", state.ascriptionId);
+    // };
    const delBox = () => {
      state.creVote = false;
    };
@@ -247,6 +274,16 @@ export default {
          delBox()
      })
    }
+
+    //新建还是编辑方法
+    const creoredi = () => {
+      if (props.eidt == false) {
+        createVoteText()
+      }
+      else {
+        changeVoteText()
+      }
+    }
    //创建投票信息
    const createVoteText = () => {
      if (!state.inputV1) {
@@ -271,25 +308,34 @@ export default {


      let obj = {
-        ascriptionId: state.ascriptionId,
+        ballotId: state.ballotId,
        baseVote: state.basevote,
+        createTime: "",
        createUser: 0,
+        updateTime: "",
        updateUser: 0,
        voteEndTime: state.endTimes,
        voteExplain: state.textV1,
        voteFlag: "",
+        voteId: 0,
        voteName: state.inputV1,
        voteStartTime: state.startTimes,
-        voteTag: "",
+        voteTag: ""
+
      };
      api
        .createVote(obj)
        .then((res) => {
          console.log("创建成功123", res);
          message.success("创建成功");
-          ctx.emit("getData", res.data.data.voteId);
+          let changeVoteId = {
+            voteId: res.data.data.voteId,
+            ballotId: state.ballotId,
+          }
+          ctx.emit("getData", changeVoteId);
          closeDrawer();
          if (props.learn == 0)
+            //添加到项目任务列表
            apitaskadd
              .addTask({
                courseId: 0,
@@ -330,18 +376,71 @@ export default {
          console.log("创建失败", err);
        });
    };
+
+    //根据投票id获取投票信息
+    // const queryVoteText = ()=>{
+    //   let objqurvt = {
+    //     voteStemId:state.voteStemId
+    //     //没有接口 个人认为应该是这个id
+    //   }
+    //   api
+    //   //目前没接口 大概写的
+    //   .queryVoteText(objqurvt)
+    //   .then((res)=>{
+    //     console.log('获取投票信息成功',res);
+    //      state.inputV1 = res.data.data.voteName
+    //      state.endTimes = res.data.data.voteEndTime
+    //      state.startTimes = res.data.data.voteStartTime
+    //      state.textV1 = res.data.data.voteExplain
+    //      state.baseVote = res.data.data.baseVote
+    //      state.ascriptionId = res.data.data.ascriptionId
+    //      state.ballotId = res.data.data.ballotId
+    //   })
+    //   .catch((err)=>{
+    //     console.log('获取投票信息失败',err);
+    //   })
+    // }
+    //修改投票信息接口
+    const changeVoteText = () => {
+      let objcvt = {
+        ballotId: state.ballotId,
+        baseVote: state.basevote,
+        createTime: "",
+        createUser: 0,
+        updateTime: "",
+        updateUser: 0,
+        voteEndTime: state.endTimes,
+        voteExplain: state.textV1,
+        voteFlag: "",
+        voteId: state.voteId,
+        voteName: state.inputV1,
+        voteStartTime: state.startTimes,
+        voteTag: ""
+      }
+      api
+        .editVote(objcvt)
+        .then((res) => {
+          console.log('修改投票信息成功', res);
+        })
+        .catch((err) => {
+          console.log('修改投票信息失败', err);
+        })
+    }
    return {
      ...toRefs(state),
      showDrawerCreVote,
      afterVisibleChange,
      closeDrawer,
      getStemId,
-      changeVData,
+      // changeVData,
      rowSelection,
      options1,
      dleVoteStem,
+      creoredi,
      createVoteText,
+      changeVoteText,
      delBox,
+      // queryVoteText,
      updateTableData,
    };
  },
--- a/src/components/drawers/CreVote.vue
+++ b/src/components/drawers/CreVote.vue
@@ -9,7 +9,8 @@
  >
    <div class="drawerMain">
      <div class="header">
-        <div class="headerTitle">创建投票</div>
+        <div v-if="editStem" class="headerTitle">编辑投票</div>
+        <div v-else class="headerTitle">创建投票</div>
        <img
          style="width: 29px; height: 29px; cursor: pointer"
          src="../../assets/images/basicinfo/close.png"
@@ -106,7 +107,7 @@
      </div>
      <div class="main_btns">
        <button class="btn1">取消</button>
-        <button class="btn2" @click="createQueTit">确定</button>
+        <button class="btn2" @click="creoredi()">确定</button>
      </div>
    </div>
  </a-drawer>
@@ -122,6 +123,10 @@ export default {
      type: Boolean,
      default: false,
    },
+    editStem: {
+      type: Boolean,
+      default: false,
+    },
  },
  setup(props, ctx) {
    const state = reactive({
@@ -178,12 +183,40 @@ export default {
      value.splice(value[index],1)
    }
    const closeDrawer = () => {
+      state.inputV1 ="",
+      state.questions=[
+        {
+          stemTit: "题干",
+          inputV: "",
+          options: [
+            {
+              title: "选项",
+              opvalue: "",
+            },
+            {
+              title: "选项",
+              opvalue: "",
+            },
+          ],
+        },
+      ],
      ctx.emit("update:crevoteVisible", false);
    };
    const afterVisibleChange = (bool) => {
      console.log("state", bool);
+      if (props.editStem == true) {
+        queryStemText()
+      }
    };
-
+    //创建题干还是编辑题干
+    const creoredi = () => {
+      if (props.eidtStem == false) {
+        createQueTit()
+      }
+      else {
+        changeStemText()
+      }
+    }
    //创建题干接口
    const createQueTit = () => {
      if (!state.inputV1) {
@@ -258,8 +291,10 @@ export default {
          // console.log('state.questions[0].inputV',state.questions[0].inputV);
          message.success("创建成功");
          let objstem = {
+            ballotName: state.inputV1,
            voteStemName: state.questions[0].inputV,
            voteStemId: res.data.data.voteStemVoList[0].voteStemId,
+            ballotId: res.data.data.ballotId,
            creVote: true,
          };
          ctx.emit("getData", objstem);
@@ -269,6 +304,82 @@ export default {
          console.log(err);
        });
    };
+    //删除选项信息
+    const delOptText = () => {
+      let objdelopt = {
+        // optionId: optionId
+      }
+      api
+        .deleteVoteStemOption(objdelopt)
+        .then((res) => {
+          console.log('删除选项信息成功', res);
+        })
+        .catch((err) => {
+          console.log('删除选项信息失败', err);
+        });
+    }
+    //根据id获取题干信息
+    const queryStemText = () => {
+      let objqurst = {
+        stemId: 1,
+        ballotId: "",
+      }
+      api
+        .queryStemByStemId(objqurst)
+        .then((res) => {
+          console.log('获取题干信息成功', res);
+          state.inputV1 = res.data.data.voteName
+        })
+        .catch((err) => {
+          console.log('获取题干信息失败', err);
+        })
+    }
+    //编辑题干信息
+    const changeStemText = () => {
+      let objcst = {
+        "ballotId": 0,
+        "ballotName": "",
+        "createTime": "",
+        "createUser": 0,
+        "updateTime": "",
+        "updateUser": 0,
+        "voteStemDtoList": [
+          {
+            "ballotId": 0,
+            "createTime": "",
+            "createUser": 0,
+            "optionDetailList": [
+              {
+                "createTime": "",
+                "createUser": 0,
+                "optionFlag": "",
+                "optionId": 0,
+                "optionName": "",
+                "optionOrderNum": "",
+                "optionPictureAddress": "",
+                "stem": "",
+                "updateTime": "",
+                "updateUser": 0,
+                "voteStemId": 0
+              }
+            ],
+            "orderNumber": "",
+            "updateTime": "",
+            "updateUser": 0,
+            "voteStemFlag": "",
+            "voteStemId": 0,
+            "voteStemName": ""
+          }
+        ]
+      }
+      api.updateStemMessage(objcst)
+        .then((res) => {
+          console.log('修改题干信息成功', res);
+        })
+        .catch((err) => {
+          console.log('修改题干信息失败', err);
+        })
+    }
    return {
      ...toRefs(state),
      afterVisibleChange,
@@ -277,7 +388,9 @@ export default {
      delQue,
      addOpt,
      delOpt,
+      creoredi,
      createQueTit,
+      delOptText,
    };
  },
 };
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -362,7 +362,7 @@ export default {
    let timer;
    onMounted(() => {
      setTimeout(() => {
-        getManageList();
+      //  getManageList();
      }, 1000);
      timer = setInterval(() => {
        state.open = false;
--- a/src/components/drawers/ProjectScore.vue
+++ b/src/components/drawers/ProjectScore.vue
@@ -164,8 +164,50 @@
                ><span class="scoretext">{{ score1 }} </span><span>积分</span>
              </div>
              <div class="content">
-                <span>优秀学员可获得 </span
-                ><span class="scoretext">{{ score2 }}</span
+                <span>完成在线课程获得 </span
+                ><span class="scoretext">{{ done }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成面授课程获得 </span
+                ><span class="scoretext">{{ done1 }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成作业成绩不低于 </span
+                ><span class="scoretext">{{ done2 }}</span
+                ><span>分获得</span>
+                <span class="scoretext">{{ done3 }}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>前</span
+                ><span class="scoretext">{{ four1}}</span
+                ><span>名学完在线课程获得</span>
+                <span class="scoretext">{{ four2}}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>前</span
+                ><span class="scoretext">{{ four3}}</span
+                ><span>名提交作业且成绩不低于</span>
+                <span class="scoretext">{{ four4}}</span
+                ><span >分获得</span>
+                <span class="scoretext">{{ four5}}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考试成绩高于</span
+                ><span class="scoretext">{{ five1 }}</span
+                ><span>分获得</span>
+                <span class="scoretext">{{ five2 }}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考勤正常学员获得 </span
+                ><span class="scoretext">{{ six1}}</span
+                ><span>积分</span>
+              </div>
+              <div class="content">
+                <span>成为小组长获得</span
+                ><span class="scoretext">{{ seven1 }}</span
+                ><span style="margin-right:50px">积分</span>
+                <span>优秀学员可获得</span>
+                <span class="scoretext">{{ seven2 }}</span
                ><span>积分</span>
              </div>
            </div>
@@ -186,11 +228,82 @@
                ><span>积分</span>
              </div>
              <div class="content">
-                <span>优秀学员可获得 </span
+                <span>完成在线课程获得 </span
                ><span
-                  ><a-input v-model:value="score2" :bordered="false" /></span
-                ><span>积分</span>
+                  ><a-input v-model:value="done" :bordered="false" /></span
+                ><span style="margin-right:50px">积分</span>
+                <span>完成面授课程获得 </span
+                ><a-input
+                    v-model:value="done1"
+                    :bordered="false"
+                  />
+                  <span style="margin-right:50px">积分</span>
+                  <span>完成作业成绩不低于 </span
+                ><a-input
+                    v-model:value="done2"
+                    :bordered="false"
+                  /><span>分获得</span>
+                  <a-input
+                    v-model:value="done3"
+                    :bordered="false"
+                  /><span>积分</span>
              </div>
+              <div class="content">
+                <span>前</span
+                ><a-input
+                    v-model:value="four1"
+                    :bordered="false"
+                  /><span>名学完在线课程获得</span>
+                  <a-input
+                    v-model:value="four2"
+                    :bordered="false"
+                  /><span style="margin-right:50px">积分</span>
+                <span>前</span
+                ><a-input
+                    v-model:value="four3"
+                    :bordered="false"
+                  /><span>名提交作业且成绩不低于</span>
+                  <a-input
+                    v-model:value="four4"
+                    :bordered="false"
+                  /><span >分获得</span>
+                  <a-input
+                    v-model:value="four5"
+                    :bordered="false"
+                  /><span>积分</span>
+
+              </div>
+              <div class="content">
+                <span>考试成绩高于</span
+                ><a-input
+                    v-model:value="five1"
+                    :bordered="false"
+                  /><span>分获得</span>
+                  <a-input
+                    v-model:value="five2"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              <div class="content">
+                <span>考勤正常学员获得 </span
+                ><a-input
+                    v-model:value="six1"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              <div class="content">
+                <span>成为小组长获得</span
+                ><a-input
+                    v-model:value="seven1"
+                    :bordered="false"
+                  /><span style="margin-right:50px">积分</span>
+                <span>优秀学员可获得</span>
+                <a-input
+                    v-model:value="seven2"
+                    :bordered="false"
+                  /><span>积分</span>
+              </div>
+              
            </div>
          </div>
        </div></a-tab-pane
@@ -372,6 +485,20 @@ export default {
      Svisible: false,
      score1: 5,
      score2: 5,
+      done:null,
+      done1:null,
+      done2:null,
+      done3:null,
+      four1:null,
+      four2:null,
+      four3:null,
+      four4:null,
+      four5:null,
+      five1:null,
+      five2:null,
+      six1:null,
+      seven1:null,
+      seven2:null,
      edit: true,
      searchRankName:null,//榜单搜索名称
    });
--- a/src/components/drawers/StuAdd.vue
+++ b/src/components/drawers/StuAdd.vue
@@ -1081,6 +1081,7 @@ export default {
      // console.log("selectedRowKeys changed: ", selectedRowKeys,item);
      state.selectedRowKeys = selectedRowKeys;
      state.choosepeople = item.reverse();
+      console.log(item, "选中你了！", state.choosepeople);
      selectedsHeight();
    };
    //单个删除选中的人
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -291,7 +291,7 @@ export default {
    let timer;
    onMounted(() => {
      setTimeout(() => {
-        getManageList();
+        // getManageList();
      }, 1000);
      timer = setInterval(() => {
        state.open = false;
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -291,7 +291,7 @@ export default {
    let timer;
    onMounted(() => {
      setTimeout(() => {
-        getManageList();
+      //  getManageList();
      }, 500);
      timer = setInterval(() => {
        state.open = false;
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -312,7 +312,7 @@ export default {

    onMounted(() => {
      setTimeout(() => {
-        getManageList();
+       // getManageList();
      }, 1000);
    });
    return {
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -263,6 +263,7 @@
              </router-link>
            </div>
            <!-- 无数据显示快速创建 -->
+            <div v-show="!taskSyllabus.length">
            <router-link :to="{ path: '/leveladddetail' }">
              <div
                class="taskbox"
@@ -283,6 +284,7 @@
                <div class="centermain">快速创建关卡任务</div>
              </div>
            </router-link>
+          </div>
            <!-- 无数据显示快速创建 -->

            <!-- 有数据-->
@@ -396,7 +398,7 @@
                        class="operation"
                        style="cursor: pointer"
                        :style="{
-                          display: item.course === '面授' ? 'flex' : 'none',
+                          display: item.type === 2 ? 'flex' : 'none',
                        }"
                        @click="showFS"
                      >
@@ -405,10 +407,10 @@
                      <div
                        class="operation"
                        style="cursor: pointer"
-                        @click="showAA(item.course, item.name)"
+                        @click="showAA(item.type, item.name)"
                        :style="{
                          display:
-                            item.course === '直播' || item.course === '活动'
+                            item.type === 6 || item.type === 9
                              ? 'flex'
                              : 'none',
                        }"
@@ -420,19 +422,19 @@
                        style="cursor: pointer"
                        :style="{
                          display:
-                            item.course === '直播' ||
-                            item.course === '活动' ||
-                            item.course === '面授'
+                            item.type === 6 ||
+                            item.type === 9 ||
+                            item.type === 2
                              ? 'flex'
                              : 'none',
                        }"
                        @click="
-                          item.course === '面授'
-                            ? showCopyModal(item.course)
-                            : item.course === '直播'
-                            ? showzhibModal(item.course)
-                            : item.course === '活动'
-                            ? showhuodModal(item.course)
+                          item.type ===2
+                            ? showCopyModal(item.type)
+                            : item.type === 6
+                            ? showzhibModal(item.type)
+                            : item.type === 9
+                            ? showhuodModal(item.type)
                            : null
                        "
                      >
@@ -442,21 +444,21 @@
                        class="operation"
                        style="cursor: pointer; margin-right: 35px"
                        @click="
-                          item.course === '在线' ||
-                          item.course === '案例' ||
-                          item.course === '外链' ||
-                          item.course === '讨论' ||
-                          item.course === '直播' ||
-                          item.course === '评估' ||
-                          item.course === '投票' ||
-                          item.course === '活动'
-                            ? showTime(item.course, item.name)
-                            : item.course === '考试' || item.course === '测评'
-                            ? showTest(item.course, item.name)
-                            : item.course === '面授'
-                            ? showFace(item.course)
-                            : item.course === '作业'
-                            ? showWork(item.course)
+                          item.type === 1 ||
+                          item.type === 3 ||
+                          item.type === 7 ||
+                          item.type === 8 ||
+                          item.type === 6 ||
+                          item.type === 11 ||
+                          item.type === 12 ||
+                          item.type === 9
+                            ? showTime(item.type, item.name)
+                            : item.type === 5 || item.type === 10
+                            ? showTest(item.type, item.name)
+                            : item.type === 2
+                            ? showFace(item.type)
+                            : item.type === 4
+                            ? showWork(item.type)
                            : null
                        "
                      >
@@ -638,81 +640,7 @@
                  </div>
                </div>
              </div>
-              <div class="Gcon">
-                <div class="pad"></div>
-                <div class="Gin" style="margin-top: 0px">
-                  <div class="headone">
-                    <div class="box"></div>
-                    <div class="onetitle">关卡晋级规则</div>
-                  </div>
-                  <div class="twomain clearfix">
-                    <a-switch
-                      size="small"
-                      v-model:checked="checked2"
-                      style="margin-top: -5px"
-                    />
-                    <span class="info">启用关卡自动规则加入</span>
-                    <div class="infor">
-                      若开启“新建/编辑关卡-添加学员”支持设定自动加入规则，将于每日8点同步数据
-                    </div>
-                    <div :class="[checked2 ? 'chooseshow' : 'choo']">
-                      <div class="fane">选择范围</div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="projectName"
-                          style="
-                            width: 250px;
-                            border-radius: 8px;
-                            margin-top: 15px;
-                          "
-                          placeholder="请选择部门"
-                          :options="projectNameList"
-                          @change="selectProjectName3"
-                          allowClear
-                          showSearch
-                        ></a-select>
-                      </div>
-                      <div class="select">
-                        <a-select
-                          v-model:value="projectName2"
-                          style="
-                            width: 250px;
-                            border-radius: 8px;
-                            margin-top: 15px;
-                          "
-                          placeholder="请选择岗位"
-                          :options="projectNameList2"
-                          @change="selectProjectName2"
-                          allowClear
-                          showSearch
-                        ></a-select>
-                      </div>
-                    </div>
-                    <div class="btm">
-                      <div class="bmo">关卡学习方案展示设置</div>
-                      <div class="bmt">仅支持移动端</div>
-                      <div class="chosecon">
-                        <div class="chose">
-                          <input
-                            type="checkbox"
-                            name="cb1"
-                            value="lieb"
-                            class="inl"
-                          /><span class="sh">列表展示</span>
-                        </div>
-                        <div class="chose" style="margin-left: 20px">
-                          <input
-                            type="checkbox"
-                            name="cb1"
-                            value="lieb"
-                            class="inl"
-                          /><span class="sh">路径展示</span>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
+              
            </div>
          </a-tab-pane>

@@ -1010,79 +938,6 @@ export default {
      ], 
      huodModal: false,
      zhibModal: false,
-      projectNameListt: [
-        {
-          id: 1,
-          value: "导出信息",
-          label: "导出信息",
-        },
-        {
-          id: 2,
-          value: "批量调整关卡",
-          label: "批量调整关卡",
-        },
-        {
-          id: 3,
-          value: "批量删除",
-          label: "批量删除",
-        },
-      ],
-      projectNameList: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList2: [
-        {
-          id: 1,
-          value: "项目一",
-          label: "项目一",
-        },
-        {
-          id: 2,
-          value: "项目二",
-          label: "项目二",
-        },
-        {
-          id: 3,
-          value: "项目三",
-          label: "项目三",
-        },
-        {
-          id: 4,
-          value: "项目四",
-          label: "项目四",
-        },
-      ],
-      projectNameList4: [
-        {
-          id: 1,
-          value: "关卡1",
-          label: "关卡1",
-        },
-        {
-          id: 2,
-          value: "关卡2",
-          label: "关卡2",
-        },
-      ],
      //任务大纲列表
      taskSyllabus: [
        {
@@ -1109,7 +964,6 @@ export default {
      nubvalue3: ref("4"),
      nubvalue1: ref("4"),
      fileList:ref([]),
-      checked2: false,
      docChecked:true,
      currentPage: 1,
      tableDataTotal: 100,
@@ -1263,22 +1117,6 @@ export default {
      ]
    })

-    // console.log("store", state.routerId);
-    const selectProjectName = (value, index) => {
-      console.log("value", value, index);
-      if (value === "批量删除") {
-        showDeleteALLModal();
-      }
-    };
-    const selectProjectName2 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName3 = (value, index) => {
-      console.log("value", value, index);
-    };
-    const selectProjectName4 = (value, index) => {
-      console.log("value", value, index);
-    };
    const tableDataFunc = () => {
      const columns = [
        {
@@ -1601,10 +1439,6 @@ export default {
    return {
      ...toRefs(state),
      ...toRefs(levelList),
-      selectProjectName,
-      selectProjectName2,
-      selectProjectName3,
-      selectProjectName4,
      showDeleteALLModal,
      closeDeleteALLModal,
      tableDataFunc,
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -1244,18 +1244,21 @@ export default {
    };
    //测试评估投票抽屉
    const showDrawerAddEval = (id, eleId) => {
-      state.addevalVisible = true;
+      // state.addevalVisible = true;
+      state.addevalvisible = true;
      state.EditEvalId = id;
      state.routerTaskId = eleId;
    };
    const showDrawerAddInvist = (id, eleId) => {
-      state.addinvistVisible = true;
+      // state.addinvistVisible = true;
+      state.addinvistvisible = true;
      state.routerTaskId = eleId;
      state.EditInvistId =id;
     
    };
    const showDrawerAddVote = (id, eleId) => {
-      state.addhomeworkvisible = true;
+      // state.addhomeworkvisible = true;
+      state.addvotevisible = true;
      state.EditVoteId = id;
      state.routerTaskId = eleId;
    };
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1161,7 +1161,6 @@ export default {
      getTableDate();
    };

-
    const searchSubmit = () => {
      console.log("点击了搜索");
      state.currentPage = 1;
@@ -2921,6 +2920,9 @@ export default {
                    data.subList.map((data2) => {
                      data2.paraentName = value.name + "/" + data.name;
                      data2.isbj = "class";
+                      storage.set("isbj", data.projectId);
+                      // console.log(data2.paraentName, "conme");
+                      storage.set("pN", data2.paraentName);
                    });
                    // console.log("lalallalaa", data);
                  } else {
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -303,7 +303,7 @@
              v-model:projectId="projectId"
              v-model:chooseStageId="chooseStageId"
              v-model:projectTaskId="projectTaskId"
-              v-model:EditInvistId = "EditInvistId"
+              v-model:EditInvistId="EditInvistId"
            />
          </div>
          <!-- 添加评估侧弹窗 -->
@@ -325,7 +325,9 @@
                v-model:projectId="projectId"
                v-model:chooseStageId="chooseStageId"
                v-model:projectTaskId="projectTaskId"
-                v-model:EditVoteId = "EditVoteId"
+                v-model:EditVoteId="EditVoteId"
+                v-model:voteId = "voteId"
+                v-model:ballotId = "ballotId"
              />
            </div>
            <!-- 添加投票侧弹窗 -->
@@ -337,7 +339,7 @@
          <div class="onerow">
            <div class="taskmain">任务列表</div>
            <button class="btn" @click="showChangeModal">移动任务到阶段</button>
-            <div class="edit" @click="deleteTaskAll">
+            <div class="edit" @click="showdeAll">
              <img
                class="editimg"
                src="../../assets/images/projectadd/delete.png"
@@ -787,6 +789,35 @@
        </div>
      </div>
    </a-modal>
+    <a-modal
+      v-model:visible="deAll"
+      :footer="null"
+      :closable="cC"
+      wrapClassName="ConfirmModal"
+      centered="true"
+    >
+      <div class="delete">
+        <div class="del_header"></div>
+        <div class="del_main">
+          <div class="header">
+            <div class="icon"></div>
+            <span>提示</span>
+            <div class="close_exit" @click="closeDeAll"></div>
+          </div>
+          <div class="body">
+            <span>您确定要批量删除任务吗</span>
+          </div>
+          <div class="del_btnbox">
+            <div class="del_btn btn1">
+              <div class="btnText" @click="closeDeAll">取消</div>
+            </div>
+            <div class="del_btn btn2">
+              <div class="btnText" @click="deleteTaskAll">确定</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-modal>
    <!-- 移动任务到阶段 -->
    <a-modal
      style="padding: 0"
@@ -850,7 +881,6 @@ import * as apimove from "../../api/indexMovetask";
 import draggable from "vuedraggable";
 import { storage } from "../../api/storage";

-
 const drawercolumns = [
  {
    title: "项目名称",
@@ -920,13 +950,15 @@ export default {
      isLiveEdit: false, //直播编辑
      EditRefId: null, //要编辑的外链的id
      EditLiveId: null, //要编辑的直播的ids
+      deAll: false,
      EditDiscussId:null,//要编辑的讨论的id
      EditActiveId:null,//要编辑的活动id
      EditWorkId:null, // 要编辑的作业id
      EditTestId: null,// 要编辑的考试id
      EditEvalId:null,
      EditInvistId:null,
-      EditVoteId:null,
+      EditVoteId: null, //编辑需要投票的id
+      ballotId: "", //编辑需要的题干id
      projectTaskId:null, // 要编辑的具体任务id
      projectNameList: [
        {
@@ -1325,7 +1357,6 @@ export default {
            // console.log("22222", res.data.data.stageList);
            let leng = res.data.data.stageList.length;
            if (leng > 0) {
-     
              let arr = res.data.data.stageList[0].taskList;
              console.log("任务列表", arr);
              getTableData(arr);
@@ -1353,17 +1384,18 @@ export default {



-    //获取删除id（投票)
+    //获取修改、删除id（投票)
    const changeVData = (data) => {
-      console.log("8989", data);
+      console.log("获取修改、删除id投票", data);
      state.voteId = data.voteId;
+      state.ballotId = data.ballotId;
    };
    //数据变化
    const updateTableData = (data) => {
      console.log("添加数据", data);
      getTask(data);
    };
-    
+
    //删除任务
    const deleteTask = () => {
      let obj = { projectTaskIds: state.deleteID };
@@ -1420,8 +1452,11 @@ export default {
          })
          .catch((err) => {
            console.log(err);
+            message.destroy();
+            message.warning("批量删除失败");
          });
      });
+      state.deAll = false;
    };
    const onSelectChange = (selectedRowKeys) => {
      console.log("selectedRowKeys changed: ", selectedRowKeys);
@@ -1502,12 +1537,12 @@ export default {
      state.projectTaskId = eleId;
      state.adddiscussvisible = true;
    };
-   
+
    const showDrawerAddActive = (id, eleId) => {
      state.addactivevisible = true;
      state.EditActiveId = id;
      state.projectTaskId = eleId;
-      console.log("active=======",id);
+      console.log("active=======", id);
    };
    const showDrawerAddEval = (id, eleId) => {
      state.addevalvisible = true;
@@ -1519,9 +1554,12 @@ export default {
      state.projectTaskId = eleId;
    };
    const showDrawerAddVote = (id, eleId) => {
+      console.log(id, eleId, '95835325932953295325');
      state.addvotevisible = true;
      state.EditVoteId = id;
      state.projectTaskId = eleId;
+      // voteId = state.voteId;
+      // ballotId = state.ballotId;
    };
    const showConfirm = () => {
      state.confirmModal = true;
@@ -1566,6 +1604,8 @@ export default {
        });
      }
      state.selectRow = arr;
+      console.log(state.selectRow, "xuanzhong");
+      console.log(Object.prototype.toString.call(state.selectRow));
      //判断是否是全部选择或者是全部未选择来修改selectAll框的样式
      if (arr.length !== 0) {
        if (arr.length === state.tableData.length) {
@@ -1607,8 +1647,7 @@ export default {
    const changeCourseType = (id) => {
      console.log("任务id", id);
    };
- 
- 
+
    //打开测评的弹窗
    const showEditEvalDrawer = (id, eleId) => {
      console.log("222222222222222222222", id);
@@ -1641,6 +1680,17 @@ export default {
        showDrawerAddTest(id, eleId);
      }
    };
+    const showdeAll = () => {
+      if(state.selectRow.length==0){
+        message.destroy()
+        return message.warning("请选择要删除的任务")
+      }else{
+        state.deAll = true;
+      }
+    };
+    const closeDeAll = () => {
+      state.deAll = false;
+    };
    return {
      ...toRefs(state),
      selectProjectName,
@@ -1688,8 +1738,8 @@ export default {
      moveTask,
      deleteTaskAll,
      decideType,
-      
-      
+      showdeAll,
+      closeDeAll,
    };
  },
 };
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue