Merge branch 'dev' into test

src/main/resources/templates/agg_report_list.html

@@ -131,6 +131,14 @@
         // $('#crowdSidebar-reportReview').addClass('menu-open');
         // $('#crowdSidebar-reportReviewMenu').css("display","block");
         $("#crowdSidebar-reportReview-aggrReport").addClass('active');
+        var status = getQueryString('status');
+        if(status=='1'){
+            $('#crowdSidebar-reportReview-aggrReportMenu-yes').addClass('active')
+        }else if (status == '0'){
+            $('#crowdSidebar-reportReview-aggrReportMenu-no').addClass('active')
+        }else{
+            $('#crowdSidebar-reportReview-aggrReportMenu-all').addClass('active')
+        }
     });
     //显示大图
     function showimage(source) {
@@ -142,6 +150,12 @@
     function closeImageViewer() {
         $("#imgModal").modal('hide');
     }
+
+    function getQueryString(name) {
+        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+        var r = window.location.search.substr(1).match(reg);//search,查询？后面的参数，并匹配正则
+        if(r!=null)return  unescape(r[2]); return null;
+    }
 </script>
 <script src="/static/AdminLTE/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
 <script src="/static/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>

src/main/resources/templates/all_review_report.html

@@ -287,6 +287,34 @@
         // $('#crowdSidebar-reportReview').addClass('menu-open');
         // $('#crowdSidebar-reportReviewMenu').css("display","block");
         $("#crowdSidebar-reportReview-allReport").addClass('active');
+        $('#report-list').DataTable({
+            language: {
+                "sProcessing": "处理中...",
+                "sLengthMenu": "显示 _MENU_ 项数据",
+                "sZeroRecords": "没有匹配结果",
+                "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
+                "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
+                "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
+                "sInfoPostFix": "",
+                "sSearch": "搜索:",
+                "sUrl": "",
+                "sEmptyTable": "表中数据为空",
+                "sLoadingRecords": "载入中...",
+                "sInfoThousands": ",",
+                "oPaginate": {
+                    "sFirst": "首页",
+                    "sPrevious": "上页",
+                    "sNext": "下页",
+                    "sLast": "末页"
+                },
+                "oAria": {
+                    "sSortAscending": ": 以升序排列此列",
+                    "sSortDescending": ": 以降序排列此列"
+                }
+            },
+            searching: true,
+            pageLength: 25
+        });
     });
 
 

src/main/resources/templates/final_report_list.html

@@ -151,6 +151,35 @@
     $(document).ready(function(){
         $('#crowdSidebar').addClass('active');
         $('#crowdSidebar-finalReport').addClass('active');
+
+        $('#report-list').DataTable({
+            language: {
+                "sProcessing": "处理中...",
+                "sLengthMenu": "显示 _MENU_ 项数据",
+                "sZeroRecords": "没有匹配结果",
+                "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
+                "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
+                "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
+                "sInfoPostFix": "",
+                "sSearch": "搜索:",
+                "sUrl": "",
+                "sEmptyTable": "表中数据为空",
+                "sLoadingRecords": "载入中...",
+                "sInfoThousands": ",",
+                "oPaginate": {
+                    "sFirst": "首页",
+                    "sPrevious": "上页",
+                    "sNext": "下页",
+                    "sLast": "末页"
+                },
+                "oAria": {
+                    "sSortAscending": ": 以升序排列此列",
+                    "sSortDescending": ": 以降序排列此列"
+                }
+            },
+            searching: true,
+            pageLength: 25
+        });
     });
 
     function deleteReport(finalReportId) {

src/main/resources/templates/task_detail.html

@@ -56,12 +56,37 @@
                             <span>全部视图</span>
                         </a>
                     </li>
-                    <li id="crowdSidebar-reportReview-aggrReport">
+                    <li id="crowdSidebar-reportReview-aggrReport" >
                         <a th:href="'/agg_report_list?examId='+${examId}+'&amp;caseId='+${caseId}">
                             <i class="fa fa-sitemap " style="color: rgba(214,182,27,0.7)"></i>
                             <span>聚合视图</span>
                         </a>
+                        <ul class="treeview-menu"  id="crowdSidebar-reportReview-aggrReportMenu">
+                            <li id="crowdSidebar-reportReview-aggrReportMenu-all">
+                                <a th:href="'/agg_report_list?examId='+${examId}+'&amp;caseId='+${caseId}">
+                                    <i class="fa fa-circle-o"></i>
+                                    <span>全部报告</span>
+                                    <span class="badge pull-right all-number" th:text="${task.numOfTotalBug}">199</span>
+                                </a>
+                            </li>
+                            <li id="crowdSidebar-reportReview-aggrReportMenu-yes">
+                                <a th:href="'/agg_report_list?examId='+${examId}+'&amp;caseId='+${caseId}+'&amp;status=1'">
+                                    <i class="fa fa-check-circle-o text-success"></i>
+                                    <span>已审核报告</span>
+                                    <span class="badge badge-success pull-right assigned-number" th:text="${task.numOfTotalBug - task.numOfUndeal}">50</span>
+                                </a>
+                            </li>
+                            <li id="crowdSidebar-reportReview-aggrReportMenu-no">
+                                <a th:href="'/agg_report_list?examId='+${examId}+'&amp;caseId='+${caseId}+'&amp;status=0'">
+                                    <i class="fa fa-clock-o text-danger"></i>
+                                    <span>未审核报告</span>
+                                    <span class="badge badge-danger pull-right unassign-number" th:text="${task.numOfUndeal}">149</span>
+                                </a>
+                            </li>
+                        </ul>
+
                     </li>
+
                     <li id="crowdSidebar-reportReview-treeReport">
                         <a th:href="'/history/tree_list?examId='+${examId}+'&amp;caseId='+${caseId}">
                             <!--写死的参数，-->
@@ -336,5 +361,35 @@
     $(document).ready(function(){
         $('#crowdSidebar').addClass('active');
         $('#crowdSidebar-taskDetail').addClass('active');
+        $('#report-list').DataTable({
+            language: {
+                "sProcessing": "处理中...",
+                "sLengthMenu": "显示 _MENU_ 项数据",
+                "sZeroRecords": "没有匹配结果",
+                "sInfo": "显示第 _START_ 至 _END_ 项结果，共 _TOTAL_ 项",
+                "sInfoEmpty": "显示第 0 至 0 项结果，共 0 项",
+                "sInfoFiltered": "(由 _MAX_ 项结果过滤)",
+                "sInfoPostFix": "",
+                "sSearch": "搜索:",
+                "sUrl": "",
+                "sEmptyTable": "表中数据为空",
+                "sLoadingRecords": "载入中...",
+                "sInfoThousands": ",",
+                "oPaginate": {
+                    "sFirst": "首页",
+                    "sPrevious": "上页",
+                    "sNext": "下页",
+                    "sLast": "末页"
+                },
+                "oAria": {
+                    "sSortAscending": ": 以升序排列此列",
+                    "sSortDescending": ": 以降序排列此列"
+                }
+            },
+            searching: true,
+            pageLength: 25
+        });
     });
+
+
 </script>