diff --git a/src/App.vue b/src/App.vue
index 3fdca7d2..d054fbda 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore();
const isLogin = ref(false);
// console.log("router", router.getRoutes(), route);
- console.log("版本2.1.0------------");
+ console.log("版本2.1.1------------");
const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink);
});
diff --git a/src/components/drawers/ActiveAttendance.vue b/src/components/drawers/ActiveAttendance.vue
index e41f7511..4b51a340 100644
--- a/src/components/drawers/ActiveAttendance.vue
+++ b/src/components/drawers/ActiveAttendance.vue
@@ -59,7 +59,6 @@
:options="projectNameList2"
@change="selectProjectName2"
allowClear
- showSearch
>
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index 4e2c0011..c501c212 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -31,35 +31,12 @@
name="uploadFile"
:multiple="false"
@change="handleChange"
- :data="
- courseType == 1
- ? {
+ :data="{
targetId: Number(courseId),
- type: 3,
+ type: courseType,
userId: userInfo.id,
userName: userInfo.realName,
- }
- : courseType == 3
- ? {
- targetId: Number(courseId),
- type: 1,
- userId: userInfo.id,
- userName: userInfo.realName,
- }
- : courseType == 4
- ? {
- targetId: Number(courseId),
- type: 2,
- userId: userInfo.id,
- userName: userInfo.realName,
- }
- : {
- targetId: Number(courseId),
- type: 3,
- userId: userInfo.id,
- userName: userInfo.realName,
- }
- "
+ } "
:showUploadList="false"
>
diff --git a/src/components/drawers/ChangeGroup.vue b/src/components/drawers/ChangeGroup.vue
index 9c952210..8ebf6a93 100644
--- a/src/components/drawers/ChangeGroup.vue
+++ b/src/components/drawers/ChangeGroup.vue
@@ -23,7 +23,6 @@
style="width: 264px; border-radius: 8px"
:options="stugroupList"
allowClear
- showSearch
@change="handleChange"
/>
diff --git a/src/components/drawers/FaceManage.vue b/src/components/drawers/FaceManage.vue
index 3a4f29f9..5cfe8a12 100644
--- a/src/components/drawers/FaceManage.vue
+++ b/src/components/drawers/FaceManage.vue
@@ -36,7 +36,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/FaceStu.vue b/src/components/drawers/FaceStu.vue
index 58a2c390..c9dba9b0 100644
--- a/src/components/drawers/FaceStu.vue
+++ b/src/components/drawers/FaceStu.vue
@@ -61,7 +61,6 @@
:options="projectNameList2"
@change="selectProjectName2"
allowClear
- showSearch
>
diff --git a/src/components/drawers/NoticeHis.vue b/src/components/drawers/NoticeHis.vue
index 289f1834..7e02a166 100644
--- a/src/components/drawers/NoticeHis.vue
+++ b/src/components/drawers/NoticeHis.vue
@@ -9,14 +9,15 @@
-
+ /> -->
+
{{item.content}}
{{ item.pubtime }}
@@ -138,7 +139,7 @@ export default {
margin-top: 20px;
margin-left: 32px;
.item {
- height: 66px;
+ // height: 66px;
width: 74%;
display: flex;
justify-content: space-between;
diff --git a/src/components/drawers/NoticePub.vue b/src/components/drawers/NoticePub.vue
index 1f437cf8..59d3deef 100644
--- a/src/components/drawers/NoticePub.vue
+++ b/src/components/drawers/NoticePub.vue
@@ -17,13 +17,14 @@
-
+ /> -->
+ {{noticeContent1}}
@@ -33,19 +34,13 @@
-
+ {{noticeContent1}}
编辑新公告:
取消
diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue
index 4ba67bdc..4990c0a2 100644
--- a/src/components/drawers/TestManage.vue
+++ b/src/components/drawers/TestManage.vue
@@ -37,7 +37,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/TimeManage.vue b/src/components/drawers/TimeManage.vue
index a1e1cd65..6fab5795 100644
--- a/src/components/drawers/TimeManage.vue
+++ b/src/components/drawers/TimeManage.vue
@@ -37,7 +37,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/WorkManage.vue b/src/components/drawers/WorkManage.vue
index d84af08e..61f4aa8f 100644
--- a/src/components/drawers/WorkManage.vue
+++ b/src/components/drawers/WorkManage.vue
@@ -37,7 +37,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 24594d6a..b65fed0c 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -37,7 +37,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue
index c09d3bba..5ac697ef 100644
--- a/src/components/drawers/project/ProjectFaceStu.vue
+++ b/src/components/drawers/project/ProjectFaceStu.vue
@@ -186,7 +186,7 @@
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="projectTaskInfo.courseId"
- :courseType="2"
+ :courseType="3"
/>
{
console.log("获取面授管理学员", res);
@@ -866,7 +866,7 @@ export default {
function exportTaskStu() {
console.log("props.projectTaskInfo", props.projectTaskInfo);
window.open(
- `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=${1}&taskId=${props.projectTaskInfo.projectTaskId}&pid=${props.projectTaskInfo.projectId}&taskType=2&thirdType=2`
+ `${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.projectTaskInfo.stageId}&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=6`
);
// api
// .exportTaskStudent({
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue
index 0d26edaf..e549f790 100644
--- a/src/components/drawers/project/ProjectFaceTaskManage.vue
+++ b/src/components/drawers/project/ProjectFaceTaskManage.vue
@@ -48,7 +48,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
@@ -613,23 +612,23 @@ export default {
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId,
- type: 1,
- pid: props.projectTaskInfo.projectId,
+ type: 3,
+ pid: props.projectTaskInfo.courseId,
status: state.projectName,
studentName: state.name,
- taskId: props.projectTaskInfo.projectTaskId,
+ // taskId: props.projectTaskInfo.projectTaskId,
});
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.projectTaskInfo.stageId,
- type: 1,
- pid: props.projectTaskInfo.projectId,
+ type: 3,
+ pid: props.projectTaskInfo.courseId,
status: state.projectName,
studentName: state.name,
- taskId: props.projectTaskInfo.projectTaskId,
- taskType: props.projectTaskInfo.type,
+ // taskId: props.projectTaskInfo.projectTaskId,
+ // taskType: props.projectTaskInfo.type,
})
.then((res) => {
console.log("获取面授管理学员", res);
@@ -733,9 +732,7 @@ export default {
`${
process.env.VUE_APP_BASE_API}/admin/student/exportHomeWork?currentStageId=${
props.projectTaskInfo.stageId
- }&type=${1}&pid=${props.projectTaskInfo.projectId}&taskId=${
- props.projectTaskInfo.projectTaskId
- }&taskType=${props.projectTaskInfo.type}`
+ }&type=3&pid=${props.projectTaskInfo.courseId}&thirdType=4`
);
}
diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue
index 0dccaaaa..829ee738 100644
--- a/src/components/drawers/project/ProjectHomeWorkManage.vue
+++ b/src/components/drawers/project/ProjectHomeWorkManage.vue
@@ -49,7 +49,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue
index 416557ff..63cd9666 100644
--- a/src/components/drawers/project/ProjectOnlineManage.vue
+++ b/src/components/drawers/project/ProjectOnlineManage.vue
@@ -65,7 +65,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
@@ -385,7 +384,7 @@ export default {
"status": state.projectName,
"studentName": state.name,
"targetId":props.datasource.projectId,
- "taskId": props.datasource.projectTaskId,
+ "taskId": props.datasource.courseId,
"thirdId": props.datasource.targetId,
"type": 1
});
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue
index dad2f39a..84f11ede 100644
--- a/src/components/drawers/router/RouterCommonManage.vue
+++ b/src/components/drawers/router/RouterCommonManage.vue
@@ -387,7 +387,7 @@ export default {
"chapterId": props.datasource.chapterId,
"status": state.projectName,
"studentName": state.name,
- "taskId": props.datasource.routerTaskId,
+ "taskId": props.datasource.courseId,
"thirdId": props.datasource.targetId,
"type": 1
});
diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue
index 50f2943f..b52580b4 100644
--- a/src/components/drawers/router/RouterEvaluationManage.vue
+++ b/src/components/drawers/router/RouterEvaluationManage.vue
@@ -48,7 +48,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index 3f88909f..cc194838 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -37,7 +37,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue
index 54117863..bfad31e0 100644
--- a/src/components/drawers/router/RouterFaceStu.vue
+++ b/src/components/drawers/router/RouterFaceStu.vue
@@ -63,7 +63,6 @@
:options="projectNameList2"
@change="selectProjectName2"
allowClear
- showSearch
>
@@ -181,7 +180,7 @@
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="datasource.courseId"
- :courseType="1"
+ :courseType="3"
/>
{
console.log("获取面授管理学员", res);
@@ -822,7 +821,7 @@ export default {
process.env.VUE_APP_BASE_API
}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId
- }&type=${2}&pid=${props.datasource.routerId}&taskType=2&thirdType=2&taskId=${props.datasource.routerTaskId}`
+ }&type=3&pid=${props.datasource.courseId}&thirdType=7&taskId=${props.datasource.routerTaskId}`
);
// api
// .exportTaskStudent({
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue
index 9213d019..62af9cae 100644
--- a/src/components/drawers/router/RouterFaceTeachManage.vue
+++ b/src/components/drawers/router/RouterFaceTeachManage.vue
@@ -43,7 +43,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
@@ -549,26 +548,15 @@ export default {
// 获取数据
//获取学员
const getStudent = () => {
- console.log("我是传递的查询参数", {
- pageNo: state.currentPage,
- pageSize: state.pageSize,
- currentStageId: props.datasource.chapterId,
- type: 2,
- pid: props.datasource.routerId,
- taskId: props.datasource.routerTaskId,
- taskType: props.datasource.type,
- status: state.projectName,
- studentName: state.name,
- });
api
.AssessmentManagementMessage({
pageNo: state.currentPage,
pageSize: state.pageSize,
currentStageId: props.datasource.chapterId,
- type: 2,
- pid: props.datasource.routerId,
- taskId: props.datasource.routerTaskId,
- taskType: props.datasource.type,
+ type: 3,
+ pid: props.datasource.courseId,
+ // taskId: props.datasource.routerTaskId,
+ // taskType: props.datasource.type,
status: state.projectName,
studentName: state.name,
})
@@ -622,7 +610,7 @@ export default {
`${
process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${
props.datasource.chapterId
- }&type=${2}&pid=${props.datasource.routerId}&taskType=${2}&taskId=${props.datasource.routerTaskId}`
+ }&type=3&pid=${props.datasource.courseId}`
);
// api
// .exportTaskStudent({
@@ -647,10 +635,10 @@ export default {
state.downloadUrl = null;
let obj = {
currentStageId: props.datasource.chapterId,
- pid: props.datasource.routerId,
- taskId: props.datasource.routerTaskId,
- taskType: props.datasource.type,
- type: 2,
+ pid: props.datasource.courseId,
+ // taskId: props.datasource.routerTaskId,
+ // taskType: props.datasource.type,
+ type: 3,
};
api
.exportHomeWork(obj)
@@ -679,7 +667,7 @@ export default {
props.datasource.chapterId
}&type=${2}&pid=${props.datasource.routerId}&taskId=${
props.datasource.routerTaskId
- }&taskType=${props.datasource.type}`
+ }&taskType=${props.datasource.type}&thirdType=5`
);
}
return {
diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue
index 26150e06..fff442af 100644
--- a/src/components/drawers/router/RouterHomeworkManage.vue
+++ b/src/components/drawers/router/RouterHomeworkManage.vue
@@ -44,7 +44,6 @@
:options="projectNameList"
@change="selectProjectName"
allowClear
- showSearch
>
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 7378abe7..2e234d49 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -362,7 +362,7 @@
v-model:AddImpStuvisible="AddImpStuvisible"
@AddImpStuvisibleClose="AddImpStuvisibleClose"
:courseId="id"
- :courseType="type === 1 ? 3 : 4"
+ :courseType="type"
/>