From 6220685ca866703e46b6a69ec3144556a6575fe3 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Thu, 22 Dec 2022 15:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E7=94=A8=E6=A8=A1=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=B8=8B=E9=A1=B9=E7=9B=AE=E4=BF=9D=E5=AD=98=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AssessmentAll.vue |  3 ++-
 src/components/student/TableStudent.vue  | 14 ++++++++------
 src/views/projectcenter/templateAdd.vue  | 14 ++++++++------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 7fe7da38..84755032 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -43,10 +43,11 @@
             >创建人：
             <span class="data">{{ assessment.creator }}</span>
           </span>
+        <!-- 
           <span class="title"
             >创建时间：
             <span class="data">{{ assessment.time }}</span>
-          </span>
+          </span>-->
         </div>
         <!--
                   <div v-else>
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 424de440..d1a257cf 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -63,12 +63,13 @@
           批量删除
         </a-button>
       </a-col>
+      <!--
       <a-col :span="1.5" v-if="type == 2">
         <a-button class="cus-btn white" @click="showChangeModal">
           <template #icon></template>
           批量调整关卡
         </a-button>
-      </a-col>
+      </a-col>-->
     </a-row>
     <div style="margin-top: 20px">
       <a-table
@@ -81,7 +82,7 @@
       >
         <template #action="{ record }">
           <div style="display: flex; justify-content: center">
-            <div
+           <!--  <div v-if="type == 2"
               @click="del(record.id)"
               style="
                 color: #4ea6ff;
@@ -93,6 +94,7 @@
             >
               查看
             </div>
+        
             <div
               @click="showChangeModal"
               style="
@@ -104,7 +106,7 @@
               "
             >
               调整
-            </div>
+            </div> -->
             <div
               @click="del(record.id)"
               style="
@@ -300,9 +302,9 @@ function submitCall(flag) {
 
 // 调整关卡;
 const visiblene = ref(false);
-const showChangeModal = () => {
-  visiblene.value = true;
-};
+//const showChangeModal = () => {
+ // visiblene.value = true;
+//};
 </script>
 <style>
 .studentopea1 {
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index b4186361..11556ece 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -78,6 +78,7 @@
 
           <div class="in">
             <a-range-picker
+                show-time
                 separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
                 v-model:value="projectInfo.rangeTime"
@@ -214,7 +215,7 @@ import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import ProjectLevel from "@/components/project/ProjectLevel";
-
+import dayjs from "dayjs";
 const route = useRoute();
 const router = useRouter();
 const store = useStore();
@@ -240,9 +241,8 @@ const getDetail = () =>
     route.query.projectTemplateId &&
     api.templateDetail(route.query.projectTemplateId).then((res) => {
       projectInfo.value = res.data.data.projectTemplateInfo;
-      projectInfo.value.rangeTime = [
-        projectInfo.value.beginTime,
-        projectInfo.value.endTime,
+      projectInfo.value.rangeTime = [dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"),
+        dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm"),
       ];
       projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
     });
@@ -253,8 +253,8 @@ const backPage = () => {
 
 function timeChange(e) {
   if (e && e.length === 2) {
-    projectInfo.value.beginTime = e[0];
-    projectInfo.value.endTime = e[1];
+    projectInfo.value.beginTime = dayjs(e[0]).format("YYYY-MM-DD HH:mm"), 
+    projectInfo.value.endTime =dayjs(e[1]).format("YYYY-MM-DD HH:mm")
   }
 }
 
@@ -281,6 +281,8 @@ const createProject = () => {
     }
   }
   projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
+  projectInfo.value.beginTime = dayjs(projectInfo.value.beginTime).format("YYYY-MM-DD HH:mm"), 
+  projectInfo.value.endTime =dayjs(projectInfo.value.endTime).format("YYYY-MM-DD HH:mm")
   api
       .templateEdit({
         ...projectInfo.value,