改bug

src/components/drawers/AddOpenCourse.vue

@@ -171,6 +171,7 @@
                 :open="openEnd"
                 @ok="onOkEnd"
                 :disabled-date="disabledDate"
+                :disabled-time="disabledDateTime"
               />
             </div>
           </div>
@@ -699,6 +700,10 @@ function onDateEnd(date) {
     const hour = String(date.$H).padStart(2, '0')
     const minute = String(date.$m).padStart(2, '0')
     dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
+    if(dateTime.value[0]==dateTime.value[1]){
+      const minute = String(date.$m+1).padStart(2, '0')
+      dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
+    }
   }
 function onFocusEnd(){
   openEnd.value = true
@@ -906,8 +911,21 @@ function openDrawer(row) {
   courseName.value = row.name;
   nextTick(tableRef.value.fetch);
 }
-
+const range = (start, end) => {
+      const result = [];
+      for (let i = start; i < end; i++) {
+        result.push(i);
+      }
+      return result;
+    };
 const disabledDate = (current) => current && current < dayjs(dateTime.value[0]);
+const disabledDateTime = () => {
+  const currentMinute = dayjs(dateTime.value[0]).minute();
+  return {
+    disabledHours: () => range(0, dayjs(dateTime.value[0]).hour()).splice(0, dayjs(dateTime.value[0]).hour()), 
+    disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), 
+  };
+};
 // 删除文件返回参数
 const changevalue = (e) => {
   let arr = formData.value.attach.split(",");

src/components/drawers/router/RouterFaceStu.vue

@@ -348,7 +348,11 @@ const ChoiceCourse = (n) => {
   params.value.pid = data.value[n].id;
   tableRef.value.fetch();
 };
-
+watch(()=>params.value.finishStatus,()=>{
+  if(params.value.finishStatus==undefined){
+    params.value.finishStatus=''
+  }
+})
 const removeStu=(id)=> dialog({
     content: "确定删除该学员吗？",
     ok: () => delStudentList({ ids: [id] }).then(() => fetchData())

src/views/courselibrary/CoursewareManage.vue

@@ -985,6 +985,7 @@
                 :open="openEnd"
                 @ok="onOkEnd"
                 :disabled-date="disabledDate"
+                :disabled-time="disabledDateTime"
               />
             </div>
           </div>
@@ -2938,6 +2939,10 @@ function onDateEnd(date) {
     const hour = String(date.$H).padStart(2, '0')
     const minute = String(date.$m).padStart(2, '0')
     state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
+    if(state.xjkkinputV3[0]==state.xjkkinputV3[1]){
+      const minute = String(date.$m+1).padStart(2, '0')
+      state.xjkkinputV3[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
+    }
   }
   const openEnd = ref(false)
 const onOkEnd = ()=>{
@@ -5070,10 +5075,10 @@ function onFocusEnd(){
     const disabledDate = (current) => current && current < dayjs(state.xjkkinputV3[0]);
 
     const disabledDateTime = () => {
+      const currentMinute = dayjs(state.xjkkinputV3[0]).minute();
       return {
-        disabledHours: () => range(0, 24).splice(4, 20),
-        disabledMinutes: () => range(30, 60),
-        disabledSeconds: () => [55, 56],
+        disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()), 
+        disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1), 
       };
     };