diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 6b9fd477..fc0bcc0c 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -51,7 +51,8 @@
{ + const result = []; + + for (let i = start; i < end; i++) { + result.push(i); + } + + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log('1111', dayjs().endOf('day')) + return current && current < dayjs().startOf('day'); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; + return { ...toRefs(state), afterVisibleChange, @@ -531,6 +555,10 @@ export default { closeDrawer1, cloradio1, updateActivityInfo, + disabledDateTime, + disabledDate + + }; }, }; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 4e8da429..eb7a63d8 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -51,6 +51,7 @@
@@ -357,7 +358,28 @@ export default { prohibitClick.value = false; }); }; + const range = (start, end) => { + const result = []; + for (let i = start; i < end; i++) { + result.push(i); + } + + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log('1111', dayjs().endOf('day')) + return current && current < dayjs().startOf('day'); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; return { ...toRefs(state), afterVisibleChange, @@ -370,7 +392,9 @@ export default { queryInvistById, editInvistText, showEvalDrawer, - updateTask + updateTask, + disabledDate, + disabledDateTime }; }, }; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 7f737f2a..f0ab3ba6 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -103,6 +103,7 @@
{ queryMember(); }; + const range = (start, end) => { + const result = []; + + for (let i = start; i < end; i++) { + result.push(i); + } + + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log('1111', dayjs().endOf('day')) + return current && current < dayjs().startOf('day'); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; + return { ...toRefs(state), FILE_UPLOAD_URL, @@ -851,9 +875,11 @@ export default { updateFaceTeach, exitAdd, updateTask, + disabledDateTime, clear, handleChange, showAssessment, + disabledDate, // change, options, diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index 9c3a38d6..31ccc205 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -23,7 +23,7 @@
- diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue index ed1ed819..7f66403e 100644 --- a/src/components/drawers/AddLive.vue +++ b/src/components/drawers/AddLive.vue @@ -71,6 +71,7 @@
{ + const result = []; + for (let i = start; i < end; i++) { + result.push(i); + } + + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log('1111', dayjs().endOf('day')) + return current && current < dayjs().startOf('day'); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; return { ...toRefs(state), afterVisibleChange, @@ -904,6 +926,8 @@ export default { handleSearch, showAssessment, removePG, + disabledDateTime, + disabledDate }; }, }; diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 555d0d77..0fa0fe7c 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -102,7 +102,8 @@
{ + const result = []; + for (let i = start; i < end; i++) { + result.push(i); + } + + return result; + }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log('1111', dayjs().endOf('day')) + return current && current < dayjs().startOf('day'); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; + return { afterVisibleChange, closeDrawer, @@ -671,7 +695,7 @@ export default { cloradio2, cloradio3, cloradio4, - + disabledDateTime, clearAll, delTag, @@ -683,7 +707,7 @@ export default { chooseTest, closeTag, getData, - + disabledDate, ...toRefs(state), }; }, diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue index c9f8b7e4..3f2118dc 100644 --- a/src/components/vote/AddVote.vue +++ b/src/components/vote/AddVote.vue @@ -105,6 +105,7 @@
-->
- 附件 +
- -
-
- -
- 上传附件 -
- - + +
@@ -2810,6 +2791,7 @@ import { toRefs, defineComponent, ref, + shallowRef, onMounted, onBeforeUnmount, @@ -2817,7 +2799,6 @@ import { } from "vue"; import * as api from "../../api/indexInvist.js"; - import { message } from "ant-design-vue"; import { useRouter, useRoute } from "vue-router"; // import StuAdd from "../../components/drawers/StuAdd"; @@ -2839,6 +2820,7 @@ import { exportP, deletePlan, planList, + editPlan, studentList, addStudent, @@ -2873,6 +2855,7 @@ import { queryExaminationDetailById } from "@/api/indexExam"; import AddHomework from "../../components/drawers/AddHomework.vue"; import AddTest from "../../components/drawers/AddTest.vue"; import TableStudent from "@/components/student/TableStudent"; +import FJUpload from "@/components/common/FJUpload"; //列表表格 const columns1 = [ // { @@ -3382,6 +3365,7 @@ export default defineComponent({ Toolbar, SeeModal, CourseModal, + FJUpload, // StuAdd, ProjectManager, ProjOwnerShip, @@ -4617,6 +4601,22 @@ export default defineComponent({ // label: "专业力", // }, ]); + // 删除文件返回参数 + const changevalue = (e) => { + let arr = state.attach.split(',') + let newarr = [] + for(let i=0;i { @@ -5768,11 +5768,32 @@ export default defineComponent({ } } ); + const range = (start, end) => { + const result = []; + for (let i = start; i < end; i++) { + result.push(i); + } + + return result; + }; const closeOnlineCoursevisible = () => { console.log("执行"); getTableDate(); }; + const disabledDate = (current) => { + // Can not select days before today and today + console.log('1111', dayjs().endOf('day')) + return current && current < dayjs().startOf('day'); + }; + + const disabledDateTime = () => { + return { + disabledHours: () => range(0, 24).splice(4, 20), + disabledMinutes: () => range(30, 60), + disabledSeconds: () => [55, 56], + }; + }; return { ...toRefs(state), @@ -5780,6 +5801,8 @@ export default defineComponent({ getdateToDateFn, moment, + disabledDate, + disabledDateTime, getdateToTimeFn, handlePostSure, handleDeleteKaike, @@ -5805,6 +5828,7 @@ export default defineComponent({ handleOpen, handleEdit, handleDelete, + changevalue, columns1, columns2, columns4, diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index e337e5f2..5ce487ac 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -47,6 +47,7 @@
创建时间：