From 3622863cbd2cdffc0aec3032145fcff8b52c7c46 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 4 Nov 2021 10:26:40 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/list/index.vue | 31 ++++++++++++++++++++--------
 src/pages/assessment/list/index.vue  |  2 +-
 src/pages/evaluation/list/index.vue  | 12 ++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/pages/achievement/list/index.vue b/src/pages/achievement/list/index.vue
index 0da7e08..be5eeab 100644
--- a/src/pages/achievement/list/index.vue
+++ b/src/pages/achievement/list/index.vue
@@ -8,7 +8,18 @@
                     <el-radio-group v-model="month" @change="initData">
                         <el-radio v-for="(item,index) in dateList" :key="index" :label="item.id" border>{{ item.name }}</el-radio>
                     </el-radio-group>
-                    <el-date-picker v-model="date" align="right" unlink-panels type="daterange" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" clearable></el-date-picker>
+                    <el-date-picker
+                        v-model="date"
+                        align="right"
+                        unlink-panels
+                        type="daterange"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd"
+                        clearable
+                        style="width: 300px"
+                    ></el-date-picker>
                 </li>
                 <li>
                     <label>实验项目分类</label>
@@ -27,10 +38,6 @@
                         ></el-option>
                     </el-select>
                 </li>
-            </ul>
-        </div>
-        <div class="tool mul">
-            <ul class="filter">
                 <li>
                     <label>课程</label>
                     <el-select v-model="curriculumId" @change="initData">
@@ -47,15 +54,19 @@
                     <el-input placeholder="请输入实验项目名称" prefix-icon="el-icon-search" v-model="keyword" clearable></el-input>
                 </li>
             </ul>
+        </div>
+        <div class="tool mul">
+            <ul class="filter">
 
-            <div>
+            </ul>
+            <div style="margin-bottom: 24px">
                 <el-button v-if="auth('批量删除')" type="primary" @click="delAllData">批量删除</el-button>
             </div>
         </div>
 
         <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
             <el-table-column type="selection" width="55" align="center" :reserve-selection="true" :selectable="disabledSelection"></el-table-column>
-            <el-table-column type="index" width="100" label="序号" align="center">
+            <el-table-column type="index" width="60" label="序号" align="center">
                 <template slot-scope="scope">
                     {{ scope.$index + (page - 1) * pageSize + 1 }}
                 </template>
@@ -64,8 +75,7 @@
                 <el-table-column prop="className" label="班级" align="center"></el-table-column>
                 <el-table-column prop="experimentalName" label="实验名称" align="center"></el-table-column>
             </template>
-            <el-table-column prop="projectName" label="项目名称" align="center">
-            </el-table-column>
+            <el-table-column prop="projectName" label="项目名称" align="center" min-width="400"></el-table-column>
             <el-table-column prop="projectPermissions" label="分类" align="center">
                 <template slot-scope="scope">
                     {{ scope.row.permissions == 2 ? "竞赛" : projectType.find(n => n.id === scope.row.permissions).name }}
@@ -291,4 +301,7 @@ export default {
 .el-radio.is-bordered + .el-radio.is-bordered {
     margin-left: 0;
 }
+.el-radio-group {
+    white-space: nowrap;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index ee3b783..e0c175a 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -405,7 +405,7 @@ export default {
             this.getData();
         },
         transferTime(date) {
-            if (date == "0000-00-00 00:00:00") return "---";
+            if (date == "0000-00-00 00:00:00" || !date) return "---";
             return date;
         }
     }
diff --git a/src/pages/evaluation/list/index.vue b/src/pages/evaluation/list/index.vue
index d38f21d..0ca59d8 100644
--- a/src/pages/evaluation/list/index.vue
+++ b/src/pages/evaluation/list/index.vue
@@ -454,7 +454,7 @@ export default {
                 if (i.includes("isTrue")) this.topicForm[i] = false;
             }
         },
-        submitSetEva() {
+        submitSetEva() { // 提交测评设置
             let info = this.info;
             if (info.evaluationType == 0) {
                 let allEmpty = true;
@@ -483,7 +483,7 @@ export default {
                 console.log(err);
             });
         },
-        saveTopics() {
+        saveTopics() { // 提交新增/编辑题目
             this.$refs.topicForm.validate((valid) => {
                 if (valid) {
                     let topicForm = this.topicForm;
@@ -509,7 +509,7 @@ export default {
 
                     if (this.topicForm.id) {
                         this.$post(this.api.questionsUpdate, this.topicForm).then(res => {
-                            util.successMsg("提交成功！");
+                            util.successMsg("编辑成功！");
                             this.NewTopics = false;
                             this.getData();
                         }).catch(err => {
@@ -517,9 +517,11 @@ export default {
                         });
                     } else {
                         this.$post(this.api.questionsSave, this.topicForm).then(res => {
-                            util.successMsg("提交成功！");
+                            util.successMsg("新增成功！");
                             this.NewTopics = false;
-                            this.getData();
+                            this.subject = "";
+                            this.keyword = "";
+                            this.initData();
                         }).catch(err => {
                             console.log(err);
                         });