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

src/components/drawers/router/RouterFaceTeachManage.vue

@@ -145,7 +145,12 @@
     v-model:getStudent="getStudent"
   />
   <!-- 录入成绩抽屉 -->
-  <entry-scores v-model:Evisible="Evisible" />
+  <EScore
+    v-model:eScorevisible="Evisible"
+    :type="2"
+    :id="datasource?.routerTaskId"
+    v-model:searchTaskList="searchTaskList"
+  />
   <!-- 查看作业抽屉 -->
   <CKWork v-model:CWvisible="CWvisible" />
   <!-- 查看答卷抽屉 -->
@@ -163,14 +168,14 @@ import { message } from "ant-design-vue";
 import ASOver from "../AllStuOver.vue";
 import CKWork from "../CheckWork.vue";
 import CQue from "../CheckQue.vue";
-import EntryScores from "../EntryScores.vue";
+import EScore from "../ExportScore.vue";
 // import * as api from "../../../api/index";
 import * as api from "../../../api/index1";
 import ExportHomeWork from "../../Modals/ExportHomeWork.vue";
 export default {
   name: "RouterFaceTeachManage",
   components: {
-    EntryScores,
+    EScore,
     CKWork,
     CQue,
     ASOver,