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>
@@ -247,9 +253,9 @@
 
   <!-- 换组弹窗 -->
   <ChangeGroupModal
-          v-model:changegroupV="checkgroupParam.changegroupV"
+    v-model:changegroupV="checkgroupParam.changegroupV"
-          :groupList="checkgroupParam.checkgroupList"
+    :groupList="checkgroupParam.checkgroupList"
-          :checkgroupStuId="checkgroupParam.checkgroupStuId"
+    :checkgroupStuId="checkgroupParam.checkgroupStuId"
   />
   <!-- 批量调整关卡弹窗 -->
   <!-- 取消学员弹窗 -->
@@ -362,13 +368,13 @@ import ExportHomeWork from "../Modals/ExportHomeWork.vue";
 import * as api from "../../api/index1";
 import ImpStu from "../drawers/AddLevelImportStu";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
-import {checkPer} from "@/utils/utils";
+import { checkPer } from "@/utils/utils";
 
 const props = defineProps({
   type: Number,
-  permissions:{
+  permissions: {
     type: String,
-    default: ''
+    default: "",
   },
   id: String,
   columns: {
@@ -455,7 +461,7 @@ const tablecolumns = ref([
     title: "所属小组",
     dataIndex: "groupName",
     key: "groupName",
-    width: props.type===1?100:0,
+    width: props.type === 1 ? 100 : 0,
     align: "center",
     className: "h",
     ellipsis: true,
@@ -533,10 +539,8 @@ const stuRowSelection = computed(() => ({
   preserveSelectedRowKeys: true,
 }));
 
-
-
 //显示学员换组弹窗
-function showChangeGroupModal  () {
+function showChangeGroupModal() {
   // debugger
   checkgroupParam.value.changegroupV = true;
 }
@@ -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) {
@@ -631,7 +635,7 @@ function del(id) {
     okType: "danger",
     cancelText: () => "取消",
     onOk() {
-      if(id){
+      if (id) {
         tableData.value.loading = true;
         delStudentList({ ids: [id] }).then(() => getStuList());
       }
@@ -754,14 +758,13 @@ const exportHomeWorkShow = () => {
 //导出
 const exportStu = () => {
   console.log("props.datasource", props);
-  if (props.id!=undefined) {
+  if (props.id != undefined) {
     window.open(
-    `${
+      `${
-      process.env.VUE_APP_BASE_API
+        process.env.VUE_APP_BASE_API
-    }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
+      }/admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2`
-  );
+    );
   }
-
 };
 
 //批量操作 结业、通过、拒绝等
@@ -803,11 +806,11 @@ const AddImpStuvisibleClose = (isget) => {
   if (isget) {
     getStuList();
   }
-}
+};
-function startLoading(){
+function startLoading() {
   tableData.value.loading = true;
 }
-defineExpose({getStuList,startLoading})
+defineExpose({ getStuList, startLoading });
 </script>
 <style lang="scss">
 .TableStudent {