Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

src/components/student/TableStudent.vue

@@ -231,7 +231,13 @@
               type="link"
               >拒绝</a-button
             >
-            <a-button v-if="checkPer(permissions)" @click="del(record.id)" type="link" danger>删除</a-button>
+            <a-button
+              v-if="checkPer(permissions)"
+              @click="del(record.id)"
+              type="link"
+              danger
+              >删除</a-button
+            >
           </a-space>
         </template>
       </a-table>
@@ -368,7 +374,7 @@ const props = defineProps({
   type: Number,
   permissions: {
     type: String,
-    default: ''
+    default: "",
   },
   id: String,
   columns: {
@@ -533,8 +539,6 @@ const stuRowSelection = computed(() => ({
   preserveSelectedRowKeys: true,
 }));
 
-
-
 //显示学员换组弹窗
 function showChangeGroupModal() {
   // debugger
@@ -547,12 +551,12 @@ function exportTaskStu() {
   window.open(
     `${
       process.env.VUE_APP_BASE_API
-    }/admin/student/exportTaskStudent?type=${1}&pid=${props.targetId}`
+    }/admin/student/exportTaskStudent?type=${1}&pid=${props.id}`
   );
 }
 
 function exportTaskStuRouter() {
-  console.log("props.datasource", props);
+  console.log("props.datasource", props, props.id);
   window.open(
     `${
       process.env.VUE_APP_BASE_API
@@ -619,7 +623,7 @@ function bathDel() {
     return message.warning("请先选中学员");
   }
   tableData.value.loading = true;
-  delStudentList({ids: stuSelectKeys.value,}).then(() => getStuList());
+  delStudentList({ ids: stuSelectKeys.value }).then(() => getStuList());
 }
 
 function del(id) {
@@ -761,7 +765,6 @@ const exportStu = () => {
       }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
     );
   }
-
 };
 
 //批量操作 结业、通过、拒绝等
@@ -803,11 +806,11 @@ const AddImpStuvisibleClose = (isget) => {
   if (isget) {
     getStuList();
   }
-}
+};
 function startLoading() {
   tableData.value.loading = true;
 }
-defineExpose({getStuList,startLoading})
+defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss">
 .TableStudent {