提交

src/components/growthpath/GrowthProject.vue

@@ -240,7 +240,6 @@ async function confirm(record) {
   dialog({
     content: "确定选择该项目吗？",
     ok: async () => {
-      formData.value.offteachers.splice(index, 1);
       // 新增
       if (!selectData?.value?.id) {
         await saveTask({

src/components/growthpath/StudentManage.vue

@@ -251,6 +251,7 @@
       </a-table>
     </div>
   </div>
+
   <!-- 查看学员 传入查看学员的id-->
   <see-stu :permissions="permissions" ref="seeStuRef" />
 
@@ -630,6 +631,7 @@ function closeDrawer() {
   GrowthDrawerRef.value.closeDrawer();
 }
 function confirmDrawer(selectList) {
+  closeDrawer();
   tableData.value.loading = true;
   addLearners({
     growthId: props.id,
@@ -639,7 +641,6 @@ function confirmDrawer(selectList) {
       tableData.value.loading = false;
       message.success("添加成功");
       getStuList();
-      closeDrawer()
     })
     .catch((err) => {
       tableData.value.loading = false;

src/views/growthpath/GrowthPath.vue

@@ -232,26 +232,6 @@
               </a-radio-group>
             </div>
           </div>
-          <div class="bg_body_bt" style="align-items: flex-start">
-            <div class="bg_body_bttext">
-              <div class="bg_body_btimg">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span>选择模板</span>
-            </div>
-            <div class="bg_body_input">
-              <a-radio-group v-model:value="template">
-                <div style="display: flex">
-                  <a-radio value="1" style="margin-bottom: 15px">路径图</a-radio
-                  ><br />
-                  <a-radio value="2">任务列表</a-radio>
-                </div>
-              </a-radio-group>
-            </div>
-          </div>
           <div class="bg_body_bt" style="align-items: flex-start">
             <div class="bg_body_bttext">
               <span>说明</span>
@@ -376,7 +356,6 @@ export default {
       statusPost: null,
       matchRules: "1",
       matchRulesVisible: false,
-      template: "2",
       statusPostMaps: [],
       statusPosts: null,
       editId: null,
@@ -522,7 +501,6 @@ export default {
       state.pathWays = record.description;
       state.band = record.band;
       state.matchRules = record.matchRules || "1";
-      state.template = state.template || "2";
       state.bg_check = true;
     };
 
@@ -547,7 +525,6 @@ export default {
         description: state.pathWays,
         matchRules: state.matchRules,
         id: state.editId ? state.editId : null,
-        template: state.template,
         keepLearner: state.keepLearner,
       };
       updatePostInfomation(params)

src/views/growthpath/PathManage.vue

@@ -489,6 +489,23 @@
                     </div>
                   </template>
                 </Draggable>
+                <!-- <div class="tableBox">
+                  <div class="pa">
+                    <a-pagination
+                      v-if="total > 1"
+                      :showSizeChanger="true"
+                      show-quick-jumper
+                      :hideOnSinglePage="false"
+                      :pageSize="pageSize"
+                      :current="pageNum"
+                      :show-total="(total) => `共 ${total} 条`"
+                      :total="total"
+                      layout="total, sizes, prev, pager, next, jumper"
+                      class="pagination"
+                      @change="getListTask"
+                    />
+                  </div>
+                </div> -->
               </div>
               <!-- 有数据-->
               <div style="display: flex; height: 20px"></div>
@@ -649,6 +666,9 @@ export default {
       commonData: null,
       showTimeText: null,
       onlineVisible: false,
+      total: 0,
+      pageSize: 99999,
+      pageNum: 1,
       spinning: false,
       tabFlag: true,
       homeworkData: {},
@@ -909,7 +929,7 @@ export default {
           "&chapterOrStageId=" +
           0 +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
       // 考试 停用
       if (item.taskType == 5) {
@@ -926,7 +946,7 @@ export default {
             item.id +
             "&chapterOrStageId=0" +
             "&infoId=" +
-            state.routerId;
+            route.query.id;
         } else {
           codeUrl =
             window.location.protocol +
@@ -935,88 +955,81 @@ export default {
         }
       }
       // 直播结束时间
-      if (item.type == 6) {
+      if (item.taskType == 6) {
-        let date1 = new Date(item.endTime).getTime();
+        let date1 = new Date(item.info.liveEndTime).getTime();
         let date2 = new Date().getTime();
         if (date1 < date2) return message.warning("当前直播已结束");
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/liveboradcast?courseId=" +
-          item.courseId +
+          item.info.id +
-          "&type=2&id=" +
+          "&type=4&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
       // 外链
-      if (item.type == 7) {
+      if (item.taskType == 7) {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/outerchain?courseId=" +
-          item.courseId +
+          item.info.id +
-          "&type=2&id=" +
+          "&type=4&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
       //讨论
-      if (item.type == 8) {
+      if (item.taskType == 8) {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/discusspage?courseId=" +
-          item.courseId +
+          item.info.id +
-          "&type=2&id=" +
+          "&type=4&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
       //活动
-      if (item.type == 9) {
+      if (item.taskType == 9) {
-        let date1 = new Date(item.endTime).getTime();
+        let date1 = new Date(item.info.activityEndTime).getTime();
         let date2 = new Date().getTime();
         if (date1 < date2) return message.warning("当前活动已结束");
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/activitiespage?courseId=" +
-          item.courseId +
+          item.info.id +
-          "&type=2&id=" +
+          "&type=4&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
-      //活动
+      //测评
-      if (item.type == 10) {
+      if (item.taskType == 10) {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/evaluation?courseId=" +
-          item.courseId +
+          item.info.id +
-          "&evaType=" +
+          "&type=4&targetId=" +
-          item.evaType +
+          item.info.evaluationTypeId +
-          "&type=2&targetId=" +
-          item.targetId +
           "&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
 
       // 评估 停用
-      if (item.type == 11) {
+      if (item.taskType == 11) {
         // if (item.taskStatus == 1 || item.taskStatus == 2)
         //   return message.error("该任务无法学习，请联系管理员进行替换。");
         console.log("item", item);
@@ -1024,41 +1037,38 @@ export default {
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/investigatpage?courseId=" +
-          item.courseId +
+          item.info.id +
-          "&type=2&id=" +
+          "&type=4&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
           "&infoId=" +
-          state.routerId;
+          route.query.id;
       }
       // 投票
-      if (item.type == 12) {
+      if (item.taskType == 12) {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/ballotpage?courseId=" +
-          item.courseId +
+          item.info.id +
           "&btype=2&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
+          "&type=4&infoId=" +
-          "&type=2&infoId=" +
+          route.query.id;
-          state.routerId;
       }
       // 项目
-      if (item.type == 13) {
+      if (item.taskType == 13) {
         codeUrl =
           window.location.protocol +
           process.env.VUE_APP_H5 +
           "/projectdetails?type=2&projectId=" +
-          item.courseId +
+          item.taskId +
           "&id=" +
           item.id +
-          "&chapterOrStageId=" +
+          "&chapterOrStageId=0" +
-          item.chapterId +
+          "&type=4&infoId=" +
-          "&type=2&infoId=" +
+          route.query.id;
-          state.routerId;
       }
       state.codevisible = true;
       let obj = {
@@ -1091,7 +1101,7 @@ export default {
     };
     const showOnline = (item) => {
       console.log(item, "item");
-      item.targetId = state.routerId;
+      item.targetId = route.query.id;
       state.showTimeText = item.name;
       state.commonData = item;
       state.onlineVisible = true;
@@ -1103,13 +1113,13 @@ export default {
         state.TMvisibleExternal = true;
         state.examData = data;
         state.showTestText = data.name;
-        state.targetId = state.routerId;
+        state.targetId = route.query.id;
       } else {
         // 系统考试抽屉显示
         state.TMvisible = true;
         state.examData = data;
         state.showTestText = data.name;
-        state.targetId = state.routerId;
+        state.targetId = route.query.id;
       }
     };
     onMounted(() => {
@@ -1123,12 +1133,17 @@ export default {
     const getListTask = () => {
       state.spinning = true;
       taskOutline({
-        growthId: state.routerId,
+        growthId: route.query.id,
         type: state.courseType,
+        pageSize: state.pageSize,
+        pageNum: state.pageNum,
       })
         .then((res) => {
           if (res.data.code == 200) {
             state.listTaskData = res.data.data.records;
+            // state.total = res.data.data.total;
+            // state.pageSize = res.data.data.pageSize;
+            // state.pageNum = res.data.data.pageNum;
           }
           state.spinning = false;
         })
@@ -1938,5 +1953,35 @@ export default {
       }
     }
   }
+  .tableBox {
+    padding-bottom: 20px;
+    margin: 20px 38px 30px;
+    ::v-deep .ant-select {
+      min-height: 32px;
+      .ant-select-selector {
+        min-height: 32px;
+      }
+      .ant-select-selection-item {
+        line-height: 32px;
+      }
+    }
+    ::v-deep .ant-pagination-options .ant-select-arrow {
+      display: block;
+    }
+    ::v-deep .ant-select-dropdown {
+      display: inline-block;
+    }
+    ::v-deep .ant-select-selection-item {
+      margin-left: 3px;
+    }
+    ::v-deep .ant-pagination-options-size-changer.ant-select {
+      width: 92px;
+    }
+    .pa {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+    }
+  }
 }
 </style>