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

# Conflicts:
#	src/components/student/TableStudent.vue

src/components/drawers/AddTest.vue

@@ -538,11 +538,13 @@ export default {
       //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 = 2;
+        state.test.targetId = 0;
+          state.test.type = 0;
+          state.test.chapterId=0;
+        if(props.isLevel == 1){
+          state.test.targetId = props.routerId;
+          state.test.chapterId = props.isactive;
+          state.test.type = 2;
 
       } else if (props.isLevel == 2) {
         state.test.targetId = props.projectId;

src/components/student/TableStudent.vue

@@ -459,7 +459,7 @@ const projectId = ref(null)
   background: linear-gradient(rgba(78, 166, 255, 0.2) 0%, rgba(78, 166, 255, 0) 100%);
 }
 
-.delete {
+/*.delete {
   z-index: 9999;
   width: 424px;
   background: #ffffff;
@@ -682,4 +682,5 @@ const projectId = ref(null)
   width: 424px !important;
   height: 258px !important;
 }
+ */
 </style>