From cd94fe07d38fa9470a259f9bec24a21c458cf006 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Sun, 11 Dec 2022 14:47:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=BB=9F=E4=B8=80=E4=B8=BA?=
 =?UTF-8?q?=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OpenPages.vue                     | 10 +++++-----
 src/components/drawers/AddActive.vue             |  2 +-
 src/components/drawers/AddEval.vue               |  4 ++--
 src/components/drawers/AddHomework.vue           |  6 +++---
 src/components/drawers/AddLive.vue               |  4 ++--
 src/components/drawers/AddOnline.vue             |  4 ++++
 src/components/drawers/AddTest.vue               |  6 +++---
 src/views/courselibrary/CoursewareManage.vue     |  2 +-
 src/views/courselibrary/CoursewareManage_Old.vue |  2 +-
 src/views/learningpath/LearningPath.vue          |  2 +-
 src/views/learningpath/LevelAdd.vue              |  9 +++++----
 src/views/learningpath/LevelAddDetail.vue        |  4 ++--
 src/views/projectcenter/TaskAdd.vue              |  2 +-
 src/views/projectcenter/TaskPage.vue             |  4 +++-
 src/views/projectcenter/temTask.vue              |  2 +-
 15 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue
index e1a2f9f1..44077ee3 100644
--- a/src/components/OpenPages.vue
+++ b/src/components/OpenPages.vue
@@ -115,16 +115,16 @@ export default {
   }
 
   .close {
-    width: 16px;
-    height: 16px;
-    border-radius: 8px;
+    width: 50px;
+    height: 50px;
+  
 
     position: absolute;
     display: flex;
     align-items: center;
     justify-content: center;
-    top: 17px;
-    right: 27px;
+    top: 0px;
+    right: 0px;
   }
 
   .close:hover {
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index f23cd6a5..a23dde18 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -52,7 +52,7 @@
             <div class="btnbox">
               <a-range-picker
                 show-time
-                format="YYYY-MM-DD hh:mm"
+                format="YYYY-MM-DD HH:mm:ss"
                 style="width: 400px; height: 40px; border-radius: 8px;"
                 v-model:value="time"
                 :placeholder="['      开始时间', '        结束时间']"
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index be1abeb4..2569d3d3 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -51,7 +51,7 @@
             <div class="btnbox">
               <a-range-picker 
                 show-time
-                style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm"
+                style="width: 400px; height: 40px; border-radius: 8px;" v-model:value="time" format="YYYY-MM-DD HH:mm:ss"
                 :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
@@ -75,7 +75,7 @@
     <EvList v-model:EvalListVisible="EvalListVisible" v-model:evaluationTypeName="evaluationTypeName"
       @getEvListData="checkFinish" />
     <!-- <div class="aeLoading" :style="{display:addLoading?'flex':'none'}">
-      <a-spin :spinning="addLoading" tip="添加中..." />
+      <a-spin :spinning="addLoading" tip="" />
     </div> -->
   </a-drawer>
 </template>
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index e0582979..24ef538a 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -109,7 +109,7 @@
     </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-      <a-spin :spinning="addLoading" tip="添加中..." />
+      <a-spin :spinning="addLoading" tip="" />
     </div>
   </a-drawer>
 </template>
@@ -328,8 +328,8 @@ export default {
     // 新增任务
     const updteHomeWork = () => {
       let obj = {
-        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD hh:mm:ss"),
-        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD hh:mm:ss"),
+        submitEndTime: dayjs(formState.choosedTime[1]).format("YYYY-MM-DD HH:mm:ss"),
+        submitStartTime: dayjs(formState.choosedTime[0]).format("YYYY-MM-DD HH:mm:ss"),
         workEnclosureAddress: state.workEnclosureAddress
           ? state.workEnclosureAddress
           : "",
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 9321387f..a9ddda1d 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -517,8 +517,8 @@ export default {
           console.log("获取的数据", res);
           state.inputV1 = res.data.data.liveName;
           state.time = [
-            dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm"),
-            dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm"),
+            dayjs(res.data.data.liveStartTime, "YYYY-MM-DD HH:mm:ss"),
+            dayjs(res.data.data.liveEndTime, "YYYY-MM-DD HH:mm:ss"),
           ];
           console.log(state.time);
 
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index e1f4f43e..0b09deaf 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -227,6 +227,10 @@ export default {
       type: Number,
       default: null,
     },
+    projectTemplateId: {
+      type: Number,
+      default: null,
+    },
   },
   setup(props, ctx) {
     const state = reactive({
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 7e4a9e89..ac4f92fd 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -320,7 +320,7 @@
         </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-      <a-spin :spinning="addLoading" tip="添加中..." />
+      <a-spin :spinning="addLoading" tip="" />
     </div>
 
     <!-- 选择考试抽屉 -->
@@ -483,8 +483,8 @@ export default {
           state.test.scoringModel =Number(state.test.scoringModel);
           state.test.questionArrangement =Number(state.test.questionArrangement);
           state.test.chooseTime = [
-            dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm"),
-            dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm"),
+            dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
+            dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
           ];
           state.paperName = state.test.examinationTestName;
           // state.paperId=dayjs
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 4464452a..3ccd1162 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -1900,7 +1900,7 @@
               <a-range-picker
                 style="width: 440px; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                format="YYYY-MM-DD HH:mm:ss"
                 v-model:value="xjkkinputV3"
                 separator="至"
                 :placeholder="['        开始时间', '        结束时间']"
diff --git a/src/views/courselibrary/CoursewareManage_Old.vue b/src/views/courselibrary/CoursewareManage_Old.vue
index 38a619bb..b6e969d1 100644
--- a/src/views/courselibrary/CoursewareManage_Old.vue
+++ b/src/views/courselibrary/CoursewareManage_Old.vue
@@ -2242,7 +2242,7 @@
               <a-range-picker
                 style="width: 440px; height: 40px; border-radius: 8px"
                 :show-time="{ format: 'HH:mm' }"
-                format="YYYY-MM-DD HH:mm"
+                format="YYYY-MM-DD HH:mm:ss"
                 v-model:value="xjkkinputV3"
                 separator="至"
                 :placeholder="['        开始时间', '        结束时间']"
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 098977fc..9bb65f9a 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -237,7 +237,7 @@
               class="aeLoading"
               :style="{ display: lpLoading ? 'flex' : 'none' }"
           >
-            <a-spin :spinning="lpLoading" tip="添加中..."/>
+            <a-spin :spinning="lpLoading" tip=""/>
           </div>
         </div>
       </div>
diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue
index 60f22527..03bfe99b 100644
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -29,7 +29,7 @@
        </div>
         <div class="line"></div>
         <router-link to="/learningpath"
-          ><div style="display: flex">
+          ><div style="display: flex; ">
             <img class="img2" src="../../assets/images/leveladd/back.png" />
             <div class="return">返回</div>
           </div>
@@ -441,7 +441,6 @@
                       </div>
                     </div>
                     <div class="operations">
-                      <!-- 2022-12-2注释 后面放开 -->
                       <!-- <div
                         class="operation"
                         style="cursor: pointer"
@@ -575,6 +574,8 @@
                   </a-select> -->
                 </div>
               </div>
+                  <!-- 2022-12-11注释 后面放开 -->
+                 <!--
               <div class="talk">
                 <img class="im" src="../../assets/images/leveladd/gan.png" />
                 <div class="xu">
@@ -588,12 +589,12 @@
                   <span class="yi"> 条</span>
                 </div>
                 <div class="clear" @click="clearChooseStu">清空</div>
-              </div>
+              </div>-->
               <div class="tableBox" style="margin-top: 30px">
                 <a-table
                   style="border: 1px solid #f2f6fe"
                   :columns="tableDataFunc()"
-                  :scroll="{ x: 1500, y: 235 }"
+                  :scroll="{ x: 1500, y: 160 }"
                   :data-source="tableData"
                   :loading="tableDataTotal === -1 ? true : false"
                   expandRowByClick="true"
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 89f6199d..3bd17c62 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -174,7 +174,7 @@
         >
           <a-spin
             :spinning="addLoading"
-            :tip="updateChapterID ? '修改中...' : '添加中...'"
+            :tip="updateChapterID ? '修改中...' : ''"
           />
         </div>
       </a-modal>
@@ -206,7 +206,7 @@
               <router-link to="/leveladd">
                 <div style="display: flex">
                   <img
-                    class="img2"
+                    class="img2" style="margin-right:22px;"
                     src="../../assets/images/leveladd/back.png"
                   />
                   <div class="return">返回</div>
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 93406853..c54eddcf 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -828,7 +828,7 @@
         >
           <a-spin
             :spinning="addLoading"
-            :tip="updateStageID ? '修改中...' : '添加中...'"
+            :tip="updateStageID ? '修改中...' : ''"
           />
         </div>
       </a-modal>
diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index f134b2e0..0ab90d04 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -798,6 +798,8 @@
                     <span class="btn2text">批量删除</span>
                   </div>
                 </div>
+                 <!-- 2022-12-11注释 后面放开 -->
+                 <!--
                 <div class="talk">
                   <img class="im" src="../../assets/images/leveladd/gan.png" />
                   <div class="xu">
@@ -811,7 +813,7 @@
                     <span class="yi">条</span>
                   </div>
                   <div class="clear" @click="clearChooseStu">清空</div>
-                </div>
+                </div>-->
                 <div class="tab" style="margin: 20px 32px 30px 32px">
                   <a-table
                     style="border: 1px solid #f2f6fe"
diff --git a/src/views/projectcenter/temTask.vue b/src/views/projectcenter/temTask.vue
index 26d410ae..243088dc 100644
--- a/src/views/projectcenter/temTask.vue
+++ b/src/views/projectcenter/temTask.vue
@@ -851,7 +851,7 @@
         >
           <a-spin
             :spinning="addLoading"
-            :tip="updateStageID ? '修改中...' : '添加中...'"
+            :tip="updateStageID ? '修改中...' : ''"
           />
         </div>
       </a-modal>