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

src/components/drawers/AddHomework.vue

@@ -3,7 +3,7 @@
 		@after-visible-change="afterVisibleChange">
 		<div class="drawerMain">
 			<div class="header">
-				<div class="headerTitle">{{ edit ? "编辑" : "添加" }}作业</div>
+				<div class="headerTitle">{{ edit ? "编辑" : "添加" }}任务</div>
 				<img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
 					@click="closeDrawer2" />
 			</div>

src/components/drawers/AddTest.vue

@@ -391,6 +391,7 @@ export default {
       id: "",
       testName: "",
       TestName: "",
+ 
       testObj: {
         name: "",
         paperId: "",
@@ -511,6 +512,19 @@ export default {
         (state.test.examinationPaperId = state.paperId);
       //TODO缺少paperName字段
       state.test.examinationTestName = state.paperName;
+      //考试推送
+        state.test.targetId = 0;
+          state.test.type = 0;
+        if(props.isLevel == 1){
+          state.test.targetId = props.routerId;
+          state.test.type = 1;
+
+        }else if(props.isLevel == 2){
+          state.test.targetId = props.projectId;
+          state.test.type = 2;
+
+        }
+   
 
       if (props.EditTestId > 0) {
         // 编辑任务

src/components/student/TableStudent.vue

@@ -128,6 +128,10 @@ const props = defineProps({
   stage: {
     type: Array,
     default: () => [],
+  }, 
+  visable: {
+    type: Boolean,
+    default:false,
   },
 });
 const tablecolumns = ref([
@@ -202,8 +206,15 @@ onMounted(() => {
 });
 
 watch(props, () => {
+  if(!props.visable){
+    stuSelectKeys.value =[];
+    console.log("关闭了");
+  }
+  console.log("props.visable",props.visable)
   tableParam.value.pid = props.id;
   getStuList();
+ 
+    
 });
 
 function onStuSelectChange(e) {