diff --git a/.gitignore b/.gitignore index 92a8e40b..0c497e78 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ src/api/config.js src/api/config.js src/api/config.js src/api/config.js +fe-manage-develop.iml diff --git a/src/App.vue b/src/App.vue index b419c233..92479de6 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("版本1.01------------"); + console.log("版本1.02------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 1c6a53e8..9c3a38d6 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -3,7 +3,7 @@ @after-visible-change="afterVisibleChange">
-
{{ edit ? "编辑" : "添加" }}作业
+
{{ edit ? "编辑" : "添加" }}任务
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 97649ceb..555d0d77 100644 --- a/src/components/drawers/AddTest.vue +++ b/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) { // 编辑任务 diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 556c407f..5985f976 100644 --- a/src/components/student/TableStudent.vue +++ b/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) { diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 837c45dc..fac81c10 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -638,6 +638,12 @@
+
+ asterisk +
课程简介
@@ -681,7 +687,7 @@
-
+
{{imgList}}
@@ -4988,7 +4995,6 @@ export default defineComponent({ const sm_exit = () => { state.sm_hs = false; state.hideshow = true; - state.tableData7 = []; }; const clear_valueE1 = (value) => { @@ -5592,7 +5598,8 @@ export default defineComponent({ // }); // console.log(state.filesList); console.log(res.data.data); - state.filesList = [res.data.data]; + state.filesList.push([res.data.data]); + // state.hasImgName = res.data.data; } }); diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue index 59f30734..dbc8c1e0 100644 --- a/src/views/courselibrary/courseModal.vue +++ b/src/views/courselibrary/courseModal.vue @@ -837,6 +837,7 @@ export default defineComponent({ postData.categoryId, postData.teacherId, postData.picUrl, + postData.qdms_inputV6, ]; if (!checkVal(checkList)) { message.destroy(); diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index f6279f78..184cb4d4 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -1,3 +1,5 @@ + + img