Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-manage into develop

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,6 +208,7 @@ const closeDrawer = () => {
 function timeChange(time, timeStr) {
   formData.value.activityStartTime = timeStr[0]
   formData.value.activityEndTime = timeStr[1]
+  formData.value.activityDuration || (formData.value.activityDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 
 const disabledDate = (current) => {

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"

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="['      开始时间', '        结束时间']"

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"

src/components/drawers/AddLevelImportStu.vue

@@ -206,11 +206,7 @@ export default {
   setup(props, ctx) {
     const store = useStore();
     const state = reactive({
-      locationHref:
+      locationHref: process.env.VUE_APP_FILE_PATH,
-        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_TEMPLATE,
       importStudent:
         process.env.VUE_APP_BASE_API + "/admin/student/importStudent",

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.value.liveDuration || (formData.value.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 const disabledDate = (current) => {
   return current && current < dayjs().startOf("day");

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.value.duration || (formData.value.duration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute'))
 }
 
 function search() {

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' }"
+              <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"
-                :disabled-date="disabledDate" format="YYYY-MM-DD HH:mm" valueFormat="YYYY-MM-DD HH:mm"
                 v-model:value="dateTime" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>

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"

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"

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,
     });

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,
     });

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();
+      return new Date().getSeconds()+''+Math.round(Math.random()*100);
-      URL.revokeObjectURL(temp_url);
+      // const temp_url = URL.createObjectURL(new Blob());
-      return uuid.substr(uuid.lastIndexOf("/") + 1);
+      // const uuid = temp_url.toString();
+      // URL.revokeObjectURL(temp_url);
+      // return uuid.substr(uuid.lastIndexOf("/") + 1);
     }
     //展示要增加的小组
     const showAddGroup = () => {

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,
     });

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"

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
     };
   },
 });

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,
 
       //目标任务

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,

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"/>

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"

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"

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"

src/views/report/Operational.vue

@@ -207,7 +207,6 @@
                 :placeholder="['      开始时间', '        结束时间']"
                 @openChange="onOpenChange"
                 @calendarChange="onCalendarChange"
-                :disabled-date="disabledDate"
               />
               <a-range-picker
                 v-if="threeLeftType == 1"