From c26b429dddd7ae80c2fe6f187e4b6f23df5cd3cc Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 6 Feb 2024 11:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=89=8B=E5=8A=A8=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddOpenCourse.vue     | 74 ++++++++++----------
 src/views/courselibrary/CoursewareManage.vue | 61 ++++++++--------
 2 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index a9ef65f3..41d4fed3 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -139,7 +139,7 @@
               <a-date-picker
                 style="width: 41%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                :format="['YYYY-MM-DD HH:mm','YYYY/MM/DD HH:mm']"
                 valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="dateTime[0]"
                 @change="timeChange"
@@ -148,8 +148,9 @@
                 @blur="onBlurStart"
                 @focus="onFocusStart"
                 @select="onDateSelect"
-                :open="openStart"
+                :open.sync="openStart"
                 @ok="onOkStart"
+                ref="datePicker"
               />
 
               <span style="margin: 0 10px;">至</span>
@@ -157,7 +158,7 @@
               <a-date-picker
                 style="width: 41%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                :format="['YYYY-MM-DD HH:mm','YYYY/MM/DD HH:mm']"
                 valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="dateTime[1]"
                 @change="timeChangeEnd"
@@ -657,36 +658,37 @@ function onDateSelect(date) {
   const minute = String(date.$D).padStart(2, '0')
   dateTime.value[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
 }
-// const openStart = ref(false)
-// const onOkStart = ()=>{
-//   openStart.value = false
-// }
-// function onBlurStart(e){
-//   dateTime.value[0]=e.target.value
-//   openStart.value = false
-// }
+const openStart = ref(false)
+const onOkStart = ()=>{
+  openStart.value = false
+}
+function onBlurStart(e){
+  dateTime.value[0]=e.target.value
+  openStart.value = false
+}
 function onFocusStart(){
-  // openStart.value = true
+  openStart.value = true
   if(!dateTime.value[0]){
-    let now=new Date()
-    let start=new Date(now.setFullYear(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0))
-    dateTime.value = [
-      moment(start).format('YYYY-MM-DD HH:mm'),
-      dateTime.value[1]
-    ];
+    // dateTime.value[0] = moment().format('YYYY-MM-DD HH:mm')
+  //   let now=new Date()
+  //   let start=new Date(now.setFullYear(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0))
+  //   dateTime.value = [
+  //     moment(start).format('YYYY-MM-DD HH:mm'),
+  //     dateTime.value[1]
+  //   ];
   }
 }
 function timeChangeEnd(timeStr){
   formData.value.endTime = timeStr;
 }
-// const openEnd = ref(false)
-// const onOkEnd = ()=>{
-//   openEnd.value = false
-// }
-// function onBlurEnd(e){
-//   dateTime.value[1]=e.target.value
-//   openEnd.value = false
-// }
+const openEnd = ref(false)
+const onOkEnd = ()=>{
+  openEnd.value = false
+}
+function onBlurEnd(e){
+  dateTime.value[1]=e.target.value
+  openEnd.value = false
+}
 function onDateEnd(date) {
     const month = String(date.$M+1).padStart(2, '0')
     const day = String(date.$D).padStart(2, '0')
@@ -695,16 +697,16 @@ function onDateEnd(date) {
     dateTime.value[1]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
 function onFocusEnd(){
-  // openEnd.value = true
-  if(!dateTime.value[1]){
-    let now=new Date()
-       let start=new Date()
-       let end=new Date(now.setFullYear(now.getFullYear()))
-       dateTime.value = [
-       dateTime.value[0],
-        moment(end).format('YYYY-MM-DD HH:mm')
-    ];
-  }
+  openEnd.value = true
+  // if(!dateTime.value[1]){
+  //   let now=new Date()
+  //      let start=new Date()
+  //      let end=new Date(now.setFullYear(now.getFullYear()))
+  //      dateTime.value = [
+  //      dateTime.value[0],
+  //       moment(end).format('YYYY-MM-DD HH:mm')
+  //   ];
+  // }
 }
 function search() {
   tableRef.value.fetch();
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 3c3942b1..83a70baa 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -956,7 +956,7 @@
               <a-date-picker 
                 style="width: 45%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                :format="['YYYY-MM-DD HH:mm','YYYY/MM/DD HH:mm']"
                 valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="xjkkinputV3[0]"
                 @change="timeChange"
@@ -972,7 +972,7 @@
               <a-date-picker
                 style="width: 45%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                :format="['YYYY-MM-DD HH:mm','YYYY/MM/DD HH:mm']"
                 valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="xjkkinputV3[1]"
                 @change="timeChangeEnd"
@@ -2902,24 +2902,24 @@ export default defineComponent({
     const minute = String(date.$D).padStart(2, '0')
     state.xjkkinputV3[0]=date.$y+'-'+month+'-'+day+' '+hour+':'+minute
   }
-//   const openStart = ref(false)
+  const openStart = ref(false)
 const onOkStart = ()=>{
-  // openStart.value = false
+  openStart.value = false
 }
 function onBlurStart(e){
-  // state.xjkkinputV3[0]=e.target.value
-  // openStart.value = false
+  state.xjkkinputV3[0]=e.target.value
+  openStart.value = false
 }
 function onFocusStart(){
-  // openStart.value = true
-  if(!state.xjkkinputV3[0]){
-    let now=new Date()
-    let start=new Date(now.setFullYear(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0))
-    state.xjkkinputV3 = [
-      moment(start).format('YYYY-MM-DD HH:mm'),
-      state.xjkkinputV3[1]
-    ];
-  }
+  openStart.value = true
+  // if(!state.xjkkinputV3[0]){
+  //   let now=new Date()
+  //   let start=new Date(now.setFullYear(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0))
+  //   state.xjkkinputV3 = [
+  //     moment(start).format('YYYY-MM-DD HH:mm'),
+  //     state.xjkkinputV3[1]
+  //   ];
+  // }
 }
 // function timeChangeEnd(timeStr){
 //   formData.value.endTime = timeStr;
@@ -2933,23 +2933,23 @@ function onDateEnd(date) {
   }
   const openEnd = ref(false)
 const onOkEnd = ()=>{
-  // openEnd.value = false
+  openEnd.value = false
 }
 function onBlurEnd(e){
-  // state.xjkkinputV3[1]=e.target.value
-  // openEnd.value = false
+  state.xjkkinputV3[1]=e.target.value
+  openEnd.value = false
 }
 function onFocusEnd(){
-  // openEnd.value = true
-  if(!state.xjkkinputV3[1]){
-    let now=new Date()
-       let start=new Date()
-       let end=new Date(now.setFullYear(now.getFullYear()))
-       state.xjkkinputV3 = [
-       state.xjkkinputV3[0],
-        moment(end).format('YYYY-MM-DD HH:mm')
-    ];
-  }
+  openEnd.value = true
+  // if(!state.xjkkinputV3[1]){
+  //   let now=new Date()
+  //      let start=new Date()
+  //      let end=new Date(now.setFullYear(now.getFullYear()))
+  //      state.xjkkinputV3 = [
+  //      state.xjkkinputV3[0],
+  //       moment(end).format('YYYY-MM-DD HH:mm')
+  //   ];
+  // }
 }
     const totalWeightSum = ref(0)
     function inputWeightChange(index) {
@@ -5235,13 +5235,14 @@ function onFocusEnd(){
 
       onDateSelect,
       onOkStart,
-      // openStart,
+      openStart,
       onBlurStart,
       onFocusStart,
       // timeChangeEnd,
       onDateEnd,
-      // onOkEnd,
+      onOkEnd,
       onFocusEnd,
+      openEnd,
       onBlurEnd,
       inputWeightChange,
       totalWeightSum,