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

src/components/drawers/ActiveAttendance.vue

@@ -243,7 +243,6 @@ export default {
   },
 
   setup(props, ctx) {
-    debugger
     const state = reactive({
       Evisible: false, //录入成绩抽屉
       name: null,
@@ -394,10 +393,11 @@ export default {
     };
 
     const getTableData = () => {
+      debugger
       // debugger
-      console.log('当前是项目还是路径图 1 路径图 2 项目', props)
-      console.log('当前是项目还是路径图 1 路径图 2 项目', props.types)
-      if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) {
+      console.log('当前是项目还是路径图 1 项目 2 路径图', props)
+      console.log('当前是项目还是路径图 1 项目 2 路径图', props.types)
+      if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) {
         // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
         console.log("我是传递的查询参数", {
           pageNo: state.currentPage,
@@ -442,14 +442,14 @@ export default {
             state.tableDataTotalLoading = false;
             state.tableData = [];
           });
-      } else if (props.datasource.type == 6 && props.types == 2 || props.datasource.type == 9 && props.types == 2) {
+      } else if (props.datasource.type == 6 && props.types == 1 || props.datasource.type == 9 && props.types == 1) {
         // 此处为获取评估学员的接口 - 如后续还有用到此接口的公共任务可直接在if里面加||判断即可
         console.log("我是传递的查询参数", {
           pageNo: state.currentPage,
           pageSize: state.pageSize,
           currentStageId: props.datasource.stageId,
           type: 1,
-          pid: props.datasource.projectId,
+          pid: props.datasource.id,
           taskId: props.datasource.id,
           taskType: props.datasource.type,
           status: state.projectName,
@@ -718,7 +718,7 @@ export default {
                     // 1是项目 2路径图 3开课
                     console.log(obj1, obj2)
                     state.tableDataTotalLoading = true;
-                    api.AttendanceSign(props.types === 1 ? obj1 : obj2).then(res => {
+                    api.AttendanceSign(props.types === '1' ? obj1 : obj2).then(res => {
                       console.log('res----签到是否成功', res)
                       message.destroy()
                       message.info('签到成功')

src/components/drawers/MemberList.vue

@@ -64,7 +64,7 @@
                   style="margin-right: 10px"
                   src="../../assets/images/courseManage/add0.png"
               /></template>
-              添加组员
+              添加组员1
             </a-button></CommonStudent
           >
           <div class="btn btn2" @click="showModal">
@@ -72,10 +72,10 @@
             <div class="wz">批量删除</div>
           </div>
           <!-- 2022-11-30注释 后面放开 -->
-          <!-- <div class="btn btn2">
+           <div class="btn btn2">
             <div class="img2"></div>
-            <div class="wz">导出信息</div>
-          </div> -->
+            <div class="wz">导出组员</div>
+          </div>
         </div>
         <div class="line">
           <div class="inline">

src/views/learningpath/LevelAdd.vue

@@ -324,7 +324,7 @@
           <!-- 路径管理 -->
           <div style="flex: 1">
             <div class="onerow">
-              <div class="taskmain">任务大纲2</div>
+              <div class="taskmain">任务大纲</div>
               <ImpoterGroupLeader title="批量面授报名" :data="{targetId:routerId,type:2}" :url="`/admin/offcourse/importCourse`" :template-url="`/admin/router/exportTaskCoursePlan/${routerId}?type=1&taskType=2&thirdType=3`">
                 <button class="btn">批量面授报名</button>
               </ImpoterGroupLeader>

src/views/projectcenter/TaskPage.vue

@@ -444,7 +444,7 @@
           <div style="flex: 1">
             <div class="split"></div>
             <div class="onerow">
-              <div class="taskmain">任务大纲1</div>
+              <div class="taskmain">任务大纲</div>
               <ImpoterGroupLeader
                 title="批量面授报名"
                 :data="{ targetId: projectId, type: 1 }"