From 914d9a09d169fd9f3d680625cfe599a59d54b26c Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 8 Jun 2023 17:16:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?---=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue            |  5 +++--
 src/components/drawers/AddEval.vue              |  2 --
 src/components/drawers/AddFaceteach.vue         |  2 --
 src/components/drawers/AddHomework.vue          |  2 --
 src/components/drawers/AddLevelImportStu.vue    |  6 +-----
 src/components/drawers/AddLive.vue              |  3 ++-
 src/components/drawers/AddOpenCourse.vue        |  2 +-
 src/components/drawers/AddTest.vue              |  3 +--
 src/components/drawers/CommonHomework.vue       |  1 -
 src/components/drawers/CommonTest.vue           |  1 -
 src/components/drawers/ExportAchievement.vue    |  3 ---
 src/components/drawers/ImportStu.vue            |  3 ---
 src/components/drawers/SubsetManage.vue         | 10 ++++++----
 src/components/drawers/TaskFaceIn.vue           |  3 ---
 src/components/vote/AddVote.vue                 |  1 -
 src/views/courselibrary/CoursewareManage.vue    |  7 ++++++-
 src/views/courselibrary/components/seeModal.vue |  3 ---
 src/views/learningpath/LevelAdd.vue             |  3 ---
 src/views/projectcenter/ProjectManage.vue       |  1 -
 src/views/projectcenter/SonProject.vue          |  2 --
 src/views/projectcenter/templateAdd.vue         |  2 --
 src/views/report/Operational.vue                |  1 -
 22 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index a0741fb5..02ef7963 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -32,7 +32,7 @@
               <span style="margin-right: 3px">活动时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker :disabled-date="disabledDate" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
+              <a-range-picker :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
                 style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" @change="timeChange"
                 :placeholder="['      开始时间', '        结束时间']" />
             </div>
@@ -208,9 +208,10 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.activityStartTime = timeStr[0]
   formData.value.activityEndTime = timeStr[1]
+  formData.activityDuration || (formData.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
 }
 
-const disabledDate = (current) => {
+const disabledDate = (current) => {¡¡
   return current && current < dayjs().startOf('day');
 };
 
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 6fca26f1..fef32ad7 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -75,8 +75,6 @@
             <div class="btnbox">
               <a-range-picker
                 :show-time="{ format: 'HH:mm' }"
-                :disabled-date="disabledDate"
-                :disabled-time="disabledRangeTime"
                 style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="dateTime"
                 format="YYYY-MM-DD HH:mm"
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 1b5fc4ea..194ba671 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -105,8 +105,6 @@
             <div class="select">
               <a-range-picker style="width: 400px;"
                               :show-time="{ format: 'HH:mm' }"
-                              :disabled-date="disabledDate" 
-                             
                               format="YYYY/MM/DD HH:mm"
                               v-model:value="chooseTime"
                               :placeholder="['      开始时间', '        结束时间']"
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index b6c6c2e2..ecd6d451 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -43,8 +43,6 @@
               <a-range-picker
                 style="width: 400px; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'hh:mm' }"
-                :disabled-date="disabledDate"
-
                 v-model:value="dateTime"
                 format="YYYY-MM-DD HH:mm"
                 @change="timeChange"
diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue
index e30cdf98..2a8e2f4e 100644
--- a/src/components/drawers/AddLevelImportStu.vue
+++ b/src/components/drawers/AddLevelImportStu.vue
@@ -206,11 +206,7 @@ export default {
   setup(props, ctx) {
     const store = useStore();
     const state = reactive({
-      locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +
-            process.env.VUE_APP_FILE_PATH,
+      locationHref: process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_TEMPLATE,
       importStudent:
         process.env.VUE_APP_BASE_API + "/admin/student/importStudent",
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 693cf4a5..e9cfb512 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -47,7 +47,7 @@
               <span style="margin-right: 3px">直播时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker :show-time="{ format: 'HH:mm' }" :disabled-date="disabledDate"
+              <a-range-picker :show-time="{ format: 'HH:mm' }"
                 style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" format="YYYY-MM-DD HH:mm"
                 valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
             </div>
@@ -336,6 +336,7 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.liveStartTime = timeStr[0];
   formData.value.liveEndTime = timeStr[1];
+  formData.liveDuration || (formData.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
 }
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 34fe03ad..7c02bb97 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -127,7 +127,6 @@
               <a-range-picker
                 style="width: 88%; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                :disabled-date="disabledDate"
                 format="YYYY-MM-DD HH:mm"
                 valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="dateTime"
@@ -528,6 +527,7 @@ const { validate } = Form.useForm(formData, formDataRule);
 function timeChange(time, timeStr) {
   formData.value.beginTime = timeStr[0];
   formData.value.endTime = timeStr[1];
+  formData.duration || (formData.duration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
 }
 
 function search() {
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 1e8c605d..2ed7e82d 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -83,8 +83,7 @@
               <span style="margin-right: 3px">考试时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'hh:mm' }"
-                :disabled-date="disabledDate" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
+              <a-range-picker style="width: 400px; height: 40px; border-radius: 8px" :show-time="{ format: 'hh:mm' }" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="dateTime" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
diff --git a/src/components/drawers/CommonHomework.vue b/src/components/drawers/CommonHomework.vue
index e4875a63..68a6ef6d 100644
--- a/src/components/drawers/CommonHomework.vue
+++ b/src/components/drawers/CommonHomework.vue
@@ -42,7 +42,6 @@
               <a-range-picker
                   style="width: 400px; height: 40px; border-radius: 8px"
                   :show-time="{ format: 'hh:mm' }"
-                  :disabled-date="disabledDate"
                   v-model:value="dateTime"
                   format="YYYY-MM-DD HH:mm"
                   valueFormat="YYYY/MM/DD HH:mm"
diff --git a/src/components/drawers/CommonTest.vue b/src/components/drawers/CommonTest.vue
index 37201362..65368d44 100644
--- a/src/components/drawers/CommonTest.vue
+++ b/src/components/drawers/CommonTest.vue
@@ -117,7 +117,6 @@
               <a-range-picker
                   style="width: 400px; height: 40px; border-radius: 8px"
                   :show-time="{format:'hh:mm'}"
-                  :disabled-date="disabledDate"
                   format="YYYY-MM-DD HH:mm"
                   valueFormat="YYYY-MM-DD HH:mm"
                   v-model:value="dateTime"
diff --git a/src/components/drawers/ExportAchievement.vue b/src/components/drawers/ExportAchievement.vue
index 4b3abd7b..c516e392 100644
--- a/src/components/drawers/ExportAchievement.vue
+++ b/src/components/drawers/ExportAchievement.vue
@@ -252,9 +252,6 @@ export default {
       downloadErrUrl: null, //下载失败数据
       fileName: "",
       locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +
             process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
diff --git a/src/components/drawers/ImportStu.vue b/src/components/drawers/ImportStu.vue
index 58dbd0c3..dc3de36e 100644
--- a/src/components/drawers/ImportStu.vue
+++ b/src/components/drawers/ImportStu.vue
@@ -276,9 +276,6 @@ export default {
       downloadErrUrl: null, //下载失败数据
       fileName: "",
       locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +
             process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index b4f1f14d..71027a24 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -117,10 +117,12 @@ export default {
     //   state.Avisible = true;
     // };
     function uuid() {
-      const temp_url = URL.createObjectURL(new Blob());
-      const uuid = temp_url.toString();
-      URL.revokeObjectURL(temp_url);
-      return uuid.substr(uuid.lastIndexOf("/") + 1);
+      //获取当前时候
+      return new Date().getTime()+''+Math.round(Math.random()*100);
+      // const temp_url = URL.createObjectURL(new Blob());
+      // const uuid = temp_url.toString();
+      // URL.revokeObjectURL(temp_url);
+      // return uuid.substr(uuid.lastIndexOf("/") + 1);
     }
     //展示要增加的小组
     const showAddGroup = () => {
diff --git a/src/components/drawers/TaskFaceIn.vue b/src/components/drawers/TaskFaceIn.vue
index 9c33e242..7e4f4342 100644
--- a/src/components/drawers/TaskFaceIn.vue
+++ b/src/components/drawers/TaskFaceIn.vue
@@ -218,9 +218,6 @@ export default {
       downloadErrUrl: null, //下载失败数据
       fileName: "",
       locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +
             process.env.VUE_APP_FILE_PATH,
       template: process.env.VUE_APP_UP_LOAD_STUDENT_SCORE_TEMPLATE,
     });
diff --git a/src/components/vote/AddVote.vue b/src/components/vote/AddVote.vue
index ab3e790c..82cf01a7 100644
--- a/src/components/vote/AddVote.vue
+++ b/src/components/vote/AddVote.vue
@@ -53,7 +53,6 @@
             <div class="select">
               <a-range-picker
                   :show-time="{ format: 'HH:mm' }"
-                  :disabled-date="disabledDate"
                   format="YYYY-MM-DD HH:mm"
                   style="width: 424px"
                   v-model:value="dateTime"
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index eda88dd9..42565a85 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -947,9 +947,9 @@
               <a-range-picker
                 style="width: 440px; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                :disabled-date="disabledDate"
                 format="YYYY-MM-DD HH:mm"
                 v-model:value="xjkkinputV3"
+                @change="timeChange"
                 separator="至"
                 :placeholder="['        开始时间', '        结束时间']"
               />
@@ -2816,6 +2816,10 @@ export default defineComponent({
       codeType: null, //二维码类型
     });
 
+    function timeChange(time, timeStr) {
+      state.duration || (state.duration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
+    }
+
     function findClassFullName(list, classify, name = "") {
       return (
         (list &&
@@ -5016,6 +5020,7 @@ export default defineComponent({
       logW,
       logT,
       qrcodeVisible,
+      timeChange
     };
   },
 });
diff --git a/src/views/courselibrary/components/seeModal.vue b/src/views/courselibrary/components/seeModal.vue
index 6da1aa47..fb92a1b9 100644
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -383,9 +383,6 @@ export default defineComponent({
       imgList: [],
       categoryName: "",
       locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +
             process.env.VUE_APP_FILE_PATH,
 
       //目标任务
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 0ed36e39..2c02e5e7 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -1652,9 +1652,6 @@ export default {
 
       facestudent: "",
       locationHref:
-        location.href.indexOf("http://") !== -1
-          ? "http://43.143.139.204:12016/"
-          : location.href.slice(0, location.href.indexOf("/m")) +
             process.env.VUE_APP_FILE_PATH,
       isreload: true,
       TaskFaceImpStuvisible: false,
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 46aa4345..a44557fe 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -48,7 +48,6 @@
           <!--
           <a-range-picker
               :show-time="{ format: 'HH:mm' }"
-              :disabled-date="disabledDate" :disabled-time="disabledRangeTime"
               v-model:value="searchParam.valueDate"
               format="YYYY-MM-DD"
               style="border-radius: 8px; height: 40px; margin-left: 5px"
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 28e94c8d..cf9b4329 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -122,8 +122,6 @@
           <div class="in">
             <a-range-picker
               :show-time="{ format: 'HH:mm' }"
-              :disabled-date="disabledDate"
-              :disabled-time="disabledRangeTime"
               separator="至"
               :placeholder="['      开始时间', '        结束时间']"
               v-model:value="projectInfo.rangeTime"
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index a7b8e5fa..722d03bc 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -107,8 +107,6 @@
           <div class="in">
             <a-range-picker
               :show-time="{ format: 'HH:mm' }"
-              :disabled-date="disabledDate"
-              :disabled-time="disabledRangeTime"
               separator="至"
               :placeholder="['      开始时间', '        结束时间']"
               v-model:value="projectInfo.rangeTime"
diff --git a/src/views/report/Operational.vue b/src/views/report/Operational.vue
index 9ff17d62..0afc7969 100644
--- a/src/views/report/Operational.vue
+++ b/src/views/report/Operational.vue
@@ -207,7 +207,6 @@
                 :placeholder="['      开始时间', '        结束时间']"
                 @openChange="onOpenChange"
                 @calendarChange="onCalendarChange"
-                :disabled-date="disabledDate"
               />
               <a-range-picker
                 v-if="threeLeftType == 1"

From ee87c001616253e40482718de8f70a013dd62b2e Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 8 Jun 2023 17:19:15 +0800
Subject: [PATCH 2/5] =?UTF-8?q?---=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 02ef7963..e35fabaa 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -211,7 +211,7 @@ function timeChange(time, timeStr) {
   formData.activityDuration || (formData.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
 }
 
-const disabledDate = (current) => {¡¡
+const disabledDate = (current) => {
   return current && current < dayjs().startOf('day');
 };
 

From 94a12c80b9bf8aa003bf0f1558236754768b4404 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 8 Jun 2023 17:31:17 +0800
Subject: [PATCH 3/5] ---fix bug

---
 src/components/drawers/AddActive.vue         | 2 +-
 src/components/drawers/AddLive.vue           | 2 +-
 src/components/drawers/AddOpenCourse.vue     | 2 +-
 src/views/courselibrary/CoursewareManage.vue | 2 +-
 src/views/projectcenter/ProjectAdd.vue       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index e35fabaa..a51d0cb4 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -208,7 +208,7 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.activityStartTime = timeStr[0]
   formData.value.activityEndTime = timeStr[1]
-  formData.activityDuration || (formData.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
+  formData.activityDuration || (formData.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 
 const disabledDate = (current) => {
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index e9cfb512..de7334af 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -336,7 +336,7 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.liveStartTime = timeStr[0];
   formData.value.liveEndTime = timeStr[1];
-  formData.liveDuration || (formData.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
+  formData.liveDuration || (formData.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 7c02bb97..3df99c86 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -527,7 +527,7 @@ const { validate } = Form.useForm(formData, formDataRule);
 function timeChange(time, timeStr) {
   formData.value.beginTime = timeStr[0];
   formData.value.endTime = timeStr[1];
-  formData.duration || (formData.duration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
+  formData.duration || (formData.duration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 
 function search() {
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 42565a85..df8e3c16 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2817,7 +2817,7 @@ export default defineComponent({
     });
 
     function timeChange(time, timeStr) {
-      state.duration || (state.duration = dayjs(timeStr[1]).diff(dayjs(timeStr(0)),'minute'))
+      state.duration || (state.duration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
     }
 
     function findClassFullName(list, classify, name = "") {
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 5f5c07f2..406f6842 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -91,7 +91,7 @@
           <div class="in">
             <a-range-picker separator="至" :show-time="{ format: 'HH:mm' }"
                             :placeholder="['      开始时间', '        结束时间']"
-                            :disabledDate="disabledDate" v-model:value="timeRange" @calendarChange="calendarChange"
+                            v-model:value="timeRange" @calendarChange="calendarChange"
                             style="width: 100%; height: 40px; border-radius: 5px" :allowClear="false"
                             format="YYYY-MM-DD HH:mm"
                             valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :disabled="!!viewDetail"/>

From c574f0c55b4c6acc65149565e64d765e79874afe Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 8 Jun 2023 17:38:33 +0800
Subject: [PATCH 4/5] ---fix bug

---
 src/components/drawers/AddActive.vue     | 2 +-
 src/components/drawers/AddLive.vue       | 2 +-
 src/components/drawers/AddOpenCourse.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index a51d0cb4..b3aa725c 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -208,7 +208,7 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.activityStartTime = timeStr[0]
   formData.value.activityEndTime = timeStr[1]
-  formData.activityDuration || (formData.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
+  formData.value.activityDuration || (formData.value.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 
 const disabledDate = (current) => {
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index de7334af..55108875 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -336,7 +336,7 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.liveStartTime = timeStr[0];
   formData.value.liveEndTime = timeStr[1];
-  formData.liveDuration || (formData.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
+  formData.value.liveDuration || (formData.value.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");
diff --git a/src/components/drawers/AddOpenCourse.vue b/src/components/drawers/AddOpenCourse.vue
index 3df99c86..e7e37330 100644
--- a/src/components/drawers/AddOpenCourse.vue
+++ b/src/components/drawers/AddOpenCourse.vue
@@ -527,7 +527,7 @@ const { validate } = Form.useForm(formData, formDataRule);
 function timeChange(time, timeStr) {
   formData.value.beginTime = timeStr[0];
   formData.value.endTime = timeStr[1];
-  formData.duration || (formData.duration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
+  formData.value.duration || (formData.value.duration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 
 function search() {

From 9f3bd4b29aee2d6d3fd57e24a66f46565be27359 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 8 Jun 2023 17:42:16 +0800
Subject: [PATCH 5/5] ---fix bug

---
 src/components/drawers/SubsetManage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/drawers/SubsetManage.vue b/src/components/drawers/SubsetManage.vue
index 71027a24..c443768f 100644
--- a/src/components/drawers/SubsetManage.vue
+++ b/src/components/drawers/SubsetManage.vue
@@ -118,7 +118,7 @@ export default {
     // };
     function uuid() {
       //获取当前时候
-      return new Date().getTime()+''+Math.round(Math.random()*100);
+      return new Date().getSeconds()+''+Math.round(Math.random()*100);
       // const temp_url = URL.createObjectURL(new Blob());
       // const uuid = temp_url.toString();
       // URL.revokeObjectURL(temp_url);