From cb0ffbf3634c098b11df2d5d4ad6fb851c6d2e76 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 21 Dec 2022 16:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=91=98=E7=AE=A1=E7=90=86=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AssessmentAll.vue  |  8 ++++----
 src/components/drawers/AssessmentList.vue |  4 ++--
 src/components/student/TableStudent.vue   | 14 +++++++++++---
 src/views/projectcenter/LibraryAdd.vue    |  4 +++-
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/components/drawers/AssessmentAll.vue b/src/components/drawers/AssessmentAll.vue
index 74fab40c..5549b39c 100644
--- a/src/components/drawers/AssessmentAll.vue
+++ b/src/components/drawers/AssessmentAll.vue
@@ -185,8 +185,8 @@ export default {
               assessmentId: info.assessmentId,
               name: info.assessmentName,
               num: num,
-              creator: info.createUser ? info.createUser : "-",
-              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+              creator: info.createUserName ? info.createUserName : "-",
+              time: dayjs(info.createTime).format("YYYY-MM-DD HH:mm"),
             };
             //更新讨论信息
             state.assessment = obj;
@@ -277,8 +277,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          creator: value.createUserName ? value.createUserName : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });
diff --git a/src/components/drawers/AssessmentList.vue b/src/components/drawers/AssessmentList.vue
index 5ee947cf..0566d5a6 100644
--- a/src/components/drawers/AssessmentList.vue
+++ b/src/components/drawers/AssessmentList.vue
@@ -202,8 +202,8 @@ export default {
           assessmentId: value.assessmentId,
           num: num,
           name: value.assessmentName ? value.assessmentName : "-",
-          creator: value.createUser ? value.createUser : "-",
-          time: dayjs(value.createTime).format("YYYY-MM-DD"),
+          creator: value.createUserName ? value.createUserName : "-",
+          time: dayjs(value.createTime).format("YYYY-MM-DD HH:mm"),
         };
         array.push(obj);
       });
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue
index 3bbe3583..96b19294 100644
--- a/src/components/student/TableStudent.vue
+++ b/src/components/student/TableStudent.vue
@@ -6,7 +6,7 @@
       style="padding-left: 20px; margin-right: 0px"
     >
       <a-col>
-        <a-form-item title="姓名：" @click="getStuList">
+        <a-form-item title="姓名：" >
           <a-input
             class="cus-input"
             v-model:value="tableParam.studentName"
@@ -15,7 +15,7 @@
         </a-form-item>
       </a-col>
       <a-col>
-        <a-button class="cus-btn" style="width: 100px">
+        <a-button class="cus-btn" style="width: 100px"  @click="getStuList">
           <template #icon>
             <img
               style="margin-right: 10px"
@@ -117,6 +117,7 @@ import { computed, defineProps, onMounted, ref, watch } from "vue";
 import { delStudentList, getStuPage } from "@/api/index1";
 import CommonStudent from "@/components/student/CommonStudent";
 import ChangeLevelModal from "./ChangeLevelModal.vue";
+import { message } from "ant-design-vue";
 const props = defineProps({
   type: Number,
   id: String,
@@ -232,9 +233,16 @@ function getStuList() {
   });
 }
 
-function reset() {}
+function reset() {
+  tableParam.value.studentName="";
+}
 
 function bathDel() {
+  if( stuSelectKeys.value &&
+    stuSelectKeys.value.length == 0){
+      message.destroy();
+    return message.warning("请先选中学员");
+  }
   stuSelectKeys.value &&
     stuSelectKeys.value.length &&
     delStudentList({
diff --git a/src/views/projectcenter/LibraryAdd.vue b/src/views/projectcenter/LibraryAdd.vue
index f3da9068..5c99aa3c 100644
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -332,7 +332,7 @@
             </a-tab-pane>
           </a-tabs>
         </a-tab-pane>
-
+<!--
         <a-tab-pane key="3" tab="项目积分">
           <div class="split"></div>
           <div class="projectscore">
@@ -478,6 +478,8 @@
             </div>
           </div>
         </a-tab-pane>
+-->
+
         <a-tab-pane key="4" tab="设置">
           <div class="split"></div>
           <a-tabs>