update

src/main/java/cn/com/qmth/examcloud/tool/service/create_random_paper_template/CreateRandomPaperTemplateTask.java

@@ -77,7 +77,7 @@ public class CreateRandomPaperTemplateTask {
             index++;
 
             if (this.existRandomPaperTemplate(user, course.getCourseId())) {
-                String msg = String.format("【%s】 课程代码:%s 已存在随机抽卷模板！", index, course.getCourseCode());
+                String msg = String.format("【%s】 课程代码：%s 已存在随机抽卷模板！", index, course.getCourseCode());
                 messages.add(msg);
                 log.warn(msg);
                 continue;
@@ -86,7 +86,7 @@ public class CreateRandomPaperTemplateTask {
             // 获取试卷结构
             String paperStructId = this.getPaperStructId(user, course.getCourseCode(), structType, structName);
             if (paperStructId == null) {
-                String msg = String.format("【%s】 课程代码:%s 未找到试卷结构！", index, course.getCourseCode());
+                String msg = String.format("【%s】 课程代码：%s 未找到试卷结构！", index, course.getCourseCode());
                 messages.add(msg);
                 log.warn(msg);
                 continue;
@@ -95,7 +95,7 @@ public class CreateRandomPaperTemplateTask {
             // 获取试卷列表
             List<String> paperIds = this.getPapers(user, course.getCourseCode(), questionPool, paperKeywords);
             if (paperIds.isEmpty()) {
-                String msg = String.format("【%s】 课程代码:%s 未找到相关试卷！", index, course.getCourseCode());
+                String msg = String.format("【%s】 课程代码：%s 未找到相关试卷！", index, course.getCourseCode());
                 messages.add(msg);
                 log.warn(msg);
                 continue;
@@ -105,14 +105,14 @@ public class CreateRandomPaperTemplateTask {
             try {
                 this.saveRandomPaperTemplate(user, course, structType, paperStructId, questionPool, paperIds);
             } catch (Exception e) {
-                String msg = String.format("【%s】 课程代码:%s 处理失败！%s", index, course.getCourseCode(),
+                String msg = String.format("【%s】 课程代码：%s 处理失败！%s", index, course.getCourseCode(),
                         e.getMessage());
                 messages.add(msg);
                 log.warn(msg);
                 continue;
             }
 
-            String msg = String.format("【%s】 课程代码:%s 处理完成！", index, course.getCourseCode());
+            String msg = String.format("【%s】 课程代码：%s 处理完成！", index, course.getCourseCode());
             log.info(msg);
         }
 

src/main/resources/templates/admin/taskList.ftlh

@@ -35,33 +35,48 @@
                 </el-form>
 
                 <el-table v-loading="loading" :data="tableData" border stripe>
-                    <el-table-column label="ID" prop="id" width="60px"></el-table-column>
-                    <el-table-column label="任务类型" width="210px">
+                    <el-table-column label="ID" prop="id" width="80px"></el-table-column>
+                    <el-table-column label="任务类型">
                         <template slot-scope="scope">
                             <span>{{ taskTypeTitle(scope.row.type) }}</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="任务状态" width="90px">
                         <template slot-scope="scope">
-                            <span v-if="scope.row.status!='ERROR'">{{ taskStatusTitle(scope.row.status) }}</span>
-                            <el-popover trigger="hover" placement="right" v-if="scope.row.status=='ERROR'">
-                                <p style="color: red;max-width: 500px">{{ scope.row.description }}&nbsp;</p>
-                                <div slot="reference">
-                                    <span style="color: red;cursor: pointer">{{ taskStatusTitle(scope.row.status) }}</span>
-                                </div>
-                            </el-popover>
+                            <span>{{ taskStatusTitle(scope.row.status) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="任务参数" prop="params"></el-table-column>
                     <el-table-column label="开始时间" prop="startTime" width="160px"></el-table-column>
                     <el-table-column label="结束时间" prop="endTime" width="160px"></el-table-column>
                     <el-table-column label="创建时间" prop="creationTime" width="160px"></el-table-column>
-                    <el-table-column label="操作者" prop="operatorName" width="120px"></el-table-column>
-                    <el-table-column label="操作" width="100px" fixed="right">
+                    <el-table-column label="操作者" prop="operatorName" width="150px"></el-table-column>
+
+                    <el-table-column label="操作" width="280px" fixed="right">
                         <template slot-scope="scope">
-                            <el-button v-show="!disableDownload(scope.row)" @click="download(scope.row)" size="mini"
-                                       type="primary" icon="el-icon-download" plain>下载
-                            </el-button>
+                            <div style="float: left;margin-left: 10px">
+                                <el-popover trigger="hover" placement="left">
+                                    <p style="color: #999999;max-width: 900px">{{ scope.row.params }}&nbsp;</p>
+                                    <div slot="reference">
+                                        <el-button size="mini" type="info" icon="el-icon-more" plain>参数</el-button>
+                                    </div>
+                                </el-popover>
+                            </div>
+
+                            <div style="float: left;margin-left: 10px">
+                                <el-popover trigger="hover" placement="left">
+                                    <p style="color: orange;max-width: 900px">{{ scope.row.description }}&nbsp;</p>
+                                    <div slot="reference">
+                                        <el-button size="mini" type="warning" icon="el-icon-view" plain>日志</el-button>
+                                    </div>
+                                </el-popover>
+                            </div>
+
+                            <div style="float: left;margin-left: 10px">
+                                <el-button disabled="!disableDownload(scope.row)" @click="download(scope.row)"
+                                           size="mini"
+                                           type="primary" icon="el-icon-download" plain>下载
+                                </el-button>
+                            </div>
                         </template>
                     </el-table-column>
                 </el-table>