Browse Source

修复JobList界面不排序问题

insomniaLee 5 years ago
parent
commit
892b6bea11

+ 3 - 1
src/main/java/com/mooctest/controller/JobController.java

@@ -74,9 +74,11 @@ public class JobController {
     @GetMapping(value = "/jobs")
     public String jobs (Model model){
         JSONArray jsonArray = jobService.getJobs(); // 所有的数据
+        List<JSONObject> list = new ArrayList<>();
         for (Object single : jsonArray){
             JSONObject temp = (JSONObject) single;
             temp.put("create_time",new Timestamp(Long.parseLong(temp.get("create_time").toString()))); // 修改创建时间的格式  以便前段展示
+            list.add(temp);
         }
 //        Collections.sort(jsonArray, new Comparator<Object>() {
 //            @Override
@@ -86,7 +88,7 @@ public class JobController {
 //                return ((Timestamp)jso1.get("create_time")).compareTo((Timestamp)jso2.get("create_time"));
 //            }
 //        });
-        model.addAttribute("tasks",jsonArray);
+        model.addAttribute("tasks",list);
         model.addAttribute("reportHost",reportHost);
         return "jobList";
     }

+ 22 - 12
src/main/resources/templates/jobList.html

@@ -41,14 +41,6 @@
 
             <!-- Sidebar Menu -->
             <ul class="sidebar-menu tree" data-widget="tree">
-                <!--                {% for task in app_list %}-->
-                <!--                <li th:each="task:${tasks}" >-->
-
-                <!--                    <a th:href="'/task_detail?examId='+${task.examId}+'&amp;caseId='+${task.caseId}" th:text="${task.name}">-->
-                <!--                        <i class="fa fa-link"></i>-->
-                <!--                    </a>-->
-                <!--                </li>-->
-                <!--                {% endfor %}-->
 
                 <li>
                     <a href="/addPaper">
@@ -155,11 +147,29 @@
 
 <script type="text/javascript">
     $(document).ready(function(){
-        $('[data-toggle="tooltip"]').tooltip();
-        var taskListTable = $('#task-list').DataTable({
+        // $('[data-toggle="tooltip"]').tooltip();
+        // var taskListTable = $('#task-list').DataTable({
+        //     searching: true,
+        //     pageLength: 100
+        // });
+
+        $('#task-list').DataTable({
+            'paging'      : true,
+            'lengthChange': false,
+            'searching'   : false,
+            'ordering'    : true,
+            'info'        : true,
+            'autoWidth'   : false,
+            // "columnDefs": [
+            //     {
+            //         'targets': [2],
+            //         "type":"date"
+            //     }
+            // ],
             searching: true,
-            pageLength: 25
-        });
+            pageLength: 20,
+            "order": []
+        })
     });