Bläddra i källkod

修改众测部分左边栏

insomniaLee 4 år sedan
förälder
incheckning
81381306a7

+ 1 - 1
src/main/java/com/mooctest/controller/ReportController.java

@@ -413,7 +413,7 @@ public class ReportController {
         model.addAttribute("task", task);
         model.addAttribute("examId", examId);
         model.addAttribute("caseId", caseId);
-        return "test";
+        return "all_review_report";
     }
 
     private void addDistinctFinalReport( List<FinalReportDTO>source , List<FinalReportDTO> adds ){

+ 2 - 1
src/main/resources/templates/add_excel_pro.html

@@ -278,7 +278,8 @@
 
     $(document).ready(function(){
         $('#crowdSidebarMenu-addExcel').addClass('active');
-        $("#crowdSidebar").addClass("menu-open","active");
+        $("#crowdSidebar").addClass("menu-open");
+        $("#crowdSidebar").addClass("active");
         $('#crowdSidebarMenu').css("display","block");
 
         $('[data-toggle="tooltip"]').tooltip();

+ 10 - 37
src/main/resources/templates/agg_report_list.html

@@ -12,43 +12,8 @@
 </head>
 <body>
 <th:block layout:fragment="sidebar">
-    <li>
-        <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="fa fa-calendar-check-o"></i>
-            <span>预交付报告</span>
-        </a>
-    </li>
-    <li class="treeview">
-        <a href="#">
-            <i class="fa fa-list"></i>
-            <span>Reports</span>
-            <span class="pull-right-container">
-			<i class="fa fa-angle-left pull-right"></i>
-		</span>
-        </a>
-        <ul class="treeview-menu" style="display: block;">
-            <li class="active">
-                <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>
-                <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>
-                <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 th:replace="task_detail::crowdSidebar">
+
     </li>
 </th:block>
 
@@ -159,6 +124,14 @@
     </div>
 </div>
 <script type="text/javascript">
+
+    $(document).ready(function(){
+        $('#crowdSidebar').addClass('active');
+        $('#crowdSidebar-reportReview').addClass('active');
+        // $('#crowdSidebar-reportReview').addClass('menu-open');
+        // $('#crowdSidebar-reportReviewMenu').css("display","block");
+        $("#crowdSidebar-reportReview-aggrReport").addClass('active');
+    });
     //显示大图
     function showimage(source) {
         $("#imgModal").find("#imgInModalID").attr("src", source);

+ 12 - 53
src/main/resources/templates/test.html → src/main/resources/templates/all_review_report.html

@@ -12,60 +12,10 @@
 </head>
 <body>
 <th:block layout:fragment="sidebar">
-    <li>
-        <a th:href="'/task_detail?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="glyphicon glyphicon-book"></i>
-            <span>
-                任务详情
-            </span>
-        </a>
-    </li>
-    <li>
-        <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="fa fa-calendar-check-o"></i>
-            <span>预交付报告</span>
-        </a>
-    </li>
-    <li>
-        <a th:href="'/review_report?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="glyphicon glyphicon-edit"></i>
-            <span>
-                报告审核
-            </span>
-        </a>
-    </li>
-    <li class="treeview">
-        <a href="#">
-            <i class="fa fa-list"></i>
-            <span>Reports</span>
-            <span class="pull-right-container">
-			<i class="fa fa-angle-left pull-right"></i>
-		</span>
-        </a>
-        <ul class="treeview-menu" style="display: block;">
-            <li class="active">
-                <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>
-                <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>
-                <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 th:replace="task_detail::crowdSidebar">
+
     </li>
+
 </th:block>
 
 <th:block layout:fragment="maincontent">
@@ -331,6 +281,15 @@
     </div>
 </div>
 <script type="text/javascript">
+    $(document).ready(function(){
+        $('#crowdSidebar').addClass('active');
+        $('#crowdSidebar-reportReview').addClass('active');
+        // $('#crowdSidebar-reportReview').addClass('menu-open');
+        // $('#crowdSidebar-reportReviewMenu').css("display","block");
+        $("#crowdSidebar-reportReview-allReport").addClass('active');
+    });
+
+
     //显示大图
     function showimage(source) {
         $("#imgModal").find("#imgInModalID").attr("src", source);

+ 6 - 62
src/main/resources/templates/final_report_list.html

@@ -14,68 +14,7 @@
 </head>
 <body>
 <th:block layout:fragment="sidebar">
-    <li>
-        <a th:href="'/task_detail?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="glyphicon glyphicon-book"></i>
-            <span>
-                任务详情
-            </span>
-        </a>
-    </li>
-    <li>
-        <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="fa fa-calendar-check-o"></i>
-            <span>预交付报告</span>
-        </a>
-    </li>
-    <li>
-        <a th:href="'/review_report?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="glyphicon glyphicon-edit"></i>
-            <span>
-                报告审核
-            </span>
-        </a>
-    </li>
-    <li class="treeview">
-        <a href="#">
-            <i class="fa fa-list"></i>
-            <span>Reports</span>
-            <span class="pull-right-container">
-			<i class="fa fa-angle-left pull-right"></i>
-		</span>
-        </a>
-        <ul class="treeview-menu" style="display: block;">
-            <li>
-                <a th:href="'/task_detail?examId='+${examId}+'&amp;caseId='+${caseId}">
-                    <i class="fa fa-sticky-note text-success"></i>
-                    <span>默认视图</span>
-                </a>
-            </li>
-            <li>
-                <a th:href="'/agg_report_list?examId='+${examId}+'&amp;caseId='+${caseId}">
-                    <i class="fa fa-sitemap text-warning"></i>
-                    <span>聚合视图</span>
-                </a>
-            </li>
-            <li>
-                <a th:href="'/history/tree_list?examId='+${examId}+'&amp;caseId='+${caseId}">
-                    <!--写死的参数,-->
-                    <!--<a th:href="'/history/getTrees2?examId='+${caseId}+'">-->
-                    <i class="glyphicon glyphicon-tree-conifer" style="    color: #07b309;
-    margin-right: 5px;"></i>
-                    <span>树状视图</span>
-                </a>
-            </li>
-            <li>
-                <!--<a th:href="'/history/getTrees?case_take_id='+${caseId}-${examId}+'&amp;start='+0+'&amp;count='+10+'&amp;page=null&amp;identity='+0+'&amp;report_id='+5cbc1a9f825a8960cdc7bd4f+'&amp;worker_id='+22383+'">-->
-                <a th:href="'/history/getTrees?case_take_id=1281-2724&amp;start=0&amp;count=10&amp;page=null&amp;identity=0&amp;report_id=5cbc1a9f825a8960cdc7bd4f&amp;worker_id=22383'">
-                    <!--<a th:href="'/history/getTrees2?examId='+${caseId}+'">-->
-                    <i class="fa fa-sitemap text-warning"></i>
-                    <span>原始树状试图</span>
-                </a>
-            </li>
-        </ul>
-    </li>
+    <li th:replace="/task_detail::crowdSidebar">
 </th:block>
 
 
@@ -209,6 +148,11 @@
 <script src="/static/AdminLTE/bower_components/select2/dist/js/select2.min.js"></script>
 <script src="/static/js/app_info.js"></script>
 <script type="text/javascript">
+    $(document).ready(function(){
+        $('#crowdSidebar').addClass('active');
+        $('#crowdSidebar-finalReport').addClass('active');
+    });
+
     function deleteReport(finalReportId) {
         $.ajax({
             url: '/final_report/' + finalReportId,

+ 104 - 42
src/main/resources/templates/task_detail.html

@@ -12,61 +12,117 @@
     <link rel="stylesheet" type="text/css" href="/static/AdminLTE/bower_components/select2/dist/css/select2.min.css"  />
 </head>
 <body>
+<!--<th:block >-->
 <th:block layout:fragment="sidebar">
-    <li>
-        <a th:href="'/task_detail?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="glyphicon glyphicon-book"></i>
-            <span>
-                任务详情
-            </span>
-        </a>
-    </li>
-    <li>
-        <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="fa fa-calendar-check-o"></i>
-            <span>预交付报告</span>
-        </a>
-    </li>
-    <li>
-        <a th:href="'/review_report?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-        <i class="glyphicon glyphicon-edit"></i>
+
+    <li class="treeview menu-open" id="crowdSidebar" th:fragment="crowdSidebar">
+        <a href="#">
+            <i class="fa fa-users"></i>
             <span>
-                报告审核
+                众包测试
             </span>
         </a>
-    </li>
-    <li class="treeview">
-        <a href="#">
-            <i class="fa fa-list"></i>
-            <span>Reports</span>
-            <span class="pull-right-container">
-			<i class="fa fa-angle-left pull-right"></i>
-		</span>
-        </a>
-        <ul class="treeview-menu" style="display: block;">
-            <li>
-                <a href="#">
-                    <i class="fa fa-circle-o"></i>
-                    <span>全部报告</span>
-                    <span class="badge pull-right all-number" th:text="${task.numOfTotalBug}">199</span>
+        <ul class="treeview-menu" id="crowdSidebarMenu"  style="display: block;">
+            <li id="crowdSidebarMenu-taskList">
+                <a href="/crowdTask">
+                    <i class="fa fa-align-justify"></i>任务列表
                 </a>
             </li>
-            <li>
-                <a href="#">
-                    <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>
+            <li id="crowdSidebar-taskDetail">
+                <a th:href="'/task_detail?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
+                    <i class="glyphicon glyphicon-book"></i>
+                    <span>
+                        任务详情
+                    </span>
                 </a>
             </li>
-            <li>
+            <li id="crowdSidebar-finalReport">
+                <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
+                    <i class="fa fa-calendar-check-o"></i>
+                    <span>预交付报告</span>
+                </a>
+            </li>
+            <li id="crowdSidebar-reportReview" class="treeview menu-open">
                 <a href="#">
-                    <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>
+                    <i class="glyphicon glyphicon-edit"></i>
+                    <span>
+                        报告审核
+                    </span>
+                </a>
+                <ul class="treeview-menu" id="crowdSidebar-reportReviewMenu" style="display: block" >
+                    <li id="crowdSidebar-reportReview-allReport">
+                        <a th:href="'/review_report?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
+                            <i class="fa fa-files-o" style="color: #51b2ea"></i>
+                            <span>全部视图</span>
+                        </a>
+                    </li>
+                    <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>
+                    </li>
+                    <li id="crowdSidebar-reportReview-treeReport">
+                        <a th:href="'/history/tree_list?examId='+${examId}+'&amp;caseId='+${caseId}">
+                            <!--写死的参数,-->
+                            <!--<a th:href="'/history/getTrees2?examId='+${caseId}+'">-->
+                            <i class="glyphicon glyphicon-tree-conifer" style="color: rgba(65,214,66,0.7)"></i>
+                            <span>树状视图</span>
+                        </a>
+                    </li>
+                    <li id="crowdSidebar-reportReview-singleReport">
+                        <a th:href="'/task_detail?examId='+${examId}+'&amp;caseId='+${caseId}">
+                            <i class="fa  fa-file-o " style="color: rgba(218,247,0,0.72)"></i>
+                            <span>单一视图</span>
+                        </a>
+                    </li>
+                </ul>
+            </li>
+            <li id="crowdSidebarMenu-addExcel">
+                <a href="/addExcel">
+                    <i class="fa fa-file-excel-o"></i>导入第三方项目
                 </a>
             </li>
         </ul>
     </li>
+
+
+
+
+
+
+<!--    <li class="treeview">-->
+<!--        <a href="#">-->
+<!--            <i class="fa fa-list"></i>-->
+<!--            <span>Reports</span>-->
+<!--            <span class="pull-right-container">-->
+<!--			<i class="fa fa-angle-left pull-right"></i>-->
+<!--		</span>-->
+<!--        </a>-->
+<!--        <ul class="treeview-menu" style="display: block;">-->
+<!--            <li>-->
+<!--                <a href="#">-->
+<!--                    <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>-->
+<!--                <a href="#">-->
+<!--                    <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>-->
+<!--                <a href="#">-->
+<!--                    <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>-->
 </th:block>
 
 <th:block layout:fragment="maincontent">
@@ -275,4 +331,10 @@
     /*<![CDATA[*/
     var reportHost = [[${reportHost}]]
     /*]]>*/
+
+
+    $(document).ready(function(){
+        $('#crowdSidebar').addClass('active');
+        $('#crowdSidebar-taskDetail').addClass('active');
+    });
 </script>

+ 2 - 1
src/main/resources/templates/task_list.html

@@ -135,7 +135,8 @@
 
 <script type="text/javascript">
     $(document).ready(function(){
-        $("#crowdSidebar").addClass("menu-open","active");
+        $("#crowdSidebar").addClass("menu-open");
+        $("#crowdSidebar").addClass("active");
         $('#crowdSidebarMenu').css("display","block");
         $('#crowdSidebarMenu-taskList').addClass("active");
 

+ 10 - 37
src/main/resources/templates/tree_report_list.html

@@ -12,43 +12,8 @@
 </head>
 <body>
 <th:block layout:fragment="sidebar">
-    <li>
-        <a th:href="'/final_reports?examId=' + ${examId} + '&amp;caseId=' + ${caseId}">
-            <i class="fa fa-calendar-check-o"></i>
-            <span>预交付报告</span>
-        </a>
-    </li>
-    <li class="treeview">
-        <a href="#">
-            <i class="fa fa-list"></i>
-            <span>Reports</span>
-            <span class="pull-right-container">
-			<i class="fa fa-angle-left pull-right"></i>
-		</span>
-        </a>
-        <ul class="treeview-menu" style="display: block;">
-            <li class="active">
-                <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>
-                <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>
-                <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 th:replace="task_detail::crowdSidebar">
+
     </li>
 </th:block>
 
@@ -159,6 +124,14 @@
     </div>
 </div>
 <script type="text/javascript">
+    $(document).ready(function(){
+        $('#crowdSidebar').addClass('active');
+        $('#crowdSidebar-reportReview').addClass('active');
+        // $('#crowdSidebar-reportReview').addClass('menu-open');
+        // $('#crowdSidebar-reportReviewMenu').css("display","block");
+        $("#crowdSidebar-reportReview-treeReport").addClass('active');
+    });
+
     //显示大图
     function showimage(source) {
         $("#imgModal").find("#imgInModalID").attr("src", source);