Browse Source

修改系统主页

insomniaLee 4 years ago
parent
commit
3cea134e5b

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

@@ -50,7 +50,7 @@ public class TaskController {
     @Value("${report.host}")
     String reportHost;
 
-    @GetMapping("/home2")
+    @GetMapping("/crowdTask")
     public String home(Model model) {
         // 获得所有taskDTO,包括本地和慕测端
         List<TaskDTO> tasks = taskService.getAllTasks();

+ 57 - 36
src/main/resources/templates/home.html

@@ -27,53 +27,74 @@
                 </div>
             </div>
 
-            <!-- Search form -->
-            <!--            <form action="#" method="get" class="sidebar-form">-->
-            <!--                <div class="input-group">-->
-            <!--                    <input type="text" name="q" class="form-control" placeholder="Search..." />-->
-            <!--                    <span class="input-group-btn">-->
-            <!--						<button type="submit" name="search" id="search-btn" class="btn btn-flat">-->
-            <!--							<i class="fa fa-search"></i>-->
-            <!--						</button>-->
-            <!--					</span>-->
-            <!--                </div>-->
-            <!--            </form>-->
 
             <!-- 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="/papers">
-                        <i class="glyphicon glyphicon-pencil"></i>
-                        <span>
-                            众审试卷列表
-                        </span>
-                    </a>
-                </li>
 
-                <li>
-                    <a href="/review/jobs">
-                        <i class="glyphicon glyphicon-tasks"></i>
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-users"></i>
                         <span>
-                            众审任务列表
+                            众包测试
                         </span>
                     </a>
+                    <ul class="treeview-menu">
+                        <li>
+                            <a href="/crowdTask">
+                                <i class="fa fa-align-justify"></i>任务列表
+                            </a>
+                        </li>
+                        <li>
+                            <a href="/addExcel">
+                                <i class="fa fa-file-excel-o"></i>导入第三方项目
+                            </a>
+                        </li>
+                    </ul>
                 </li>
-                <li>
-                    <a href="/addExcel">
-                        <i class="glyphicon glyphicon-tasks"></i>
+
+                <li class="treeview">
+                    <a href="#">
+                        <i class="fa fa-file-text-o"></i>
                         <span>
-                            导入Excel项目文件
+                            众包审核
                         </span>
                     </a>
+
+                    <ul class="treeview-menu">
+                        <li>
+                            <a href="/addPaper">
+                                <i class="glyphicon glyphicon-pencil"></i>
+                                <span>
+                                    新建表单
+                                </span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="/papers">
+                                <i class="fa fa-reorder "></i>
+                                <span>
+                                    表单列表
+                                </span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="fa  fa-plus"></i>
+                                <span>
+                                    新建任务
+                                </span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="/review/jobs">
+                                <i class="glyphicon glyphicon-tasks"></i>
+                                <span>
+                                    任务列表
+                                </span>
+                            </a>
+                        </li>
+
+                    </ul>
                 </li>
             </ul>
         </section>

+ 41 - 23
src/main/resources/templates/jobList.html

@@ -42,30 +42,48 @@
             <!-- Sidebar Menu -->
             <ul class="sidebar-menu tree" data-widget="tree">
 
-                <li>
-                    <a href="/addPaper">
-                        <i class="glyphicon glyphicon-pencil"></i>
+                <li class="treeview menu-open active" >
+                    <a href="#">
+                        <i class="fa fa-file-text-o"></i>
                         <span>
-                            新建试卷
+                            众包审核
                         </span>
                     </a>
-                </li>
 
-                <li>
-                    <a href="/papers">
-                        <i class="glyphicon glyphicon-tasks"></i>
-                        <span>
-                            试卷列表
-                        </span>
-                    </a>
-                </li>
-                <li>
-                    <a href="/review/jobs">
-                        <i class="glyphicon glyphicon-tasks"></i>
-                        <span>
-                            JOB列表
-                        </span>
-                    </a>
+                    <ul class="treeview-menu" style="display: block;">
+                        <li>
+                            <a href="/addPaper">
+                                <i class="glyphicon glyphicon-pencil"></i>
+                                <span>
+                                    新建表单
+                                </span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="/papers">
+                                <i class="fa fa-reorder "></i>
+                                <span>
+                                    表单列表
+                                </span>
+                            </a>
+                        </li>
+                        <li>
+                            <a href="#">
+                                <i class="fa  fa-plus"></i>
+                                <span>
+                                    新建任务
+                                </span>
+                            </a>
+                        </li>
+                        <li class="active">
+                            <a href="/review/jobs">
+                                <i class="glyphicon glyphicon-tasks"></i>
+                                <span>
+                                    任务列表
+                                </span>
+                            </a>
+                        </li>
+                    </ul>
                 </li>
             </ul>
         </section>
@@ -74,13 +92,13 @@
     <!-- Main Content -->
     <div class="content-wrapper" style="min-height: 691px;">
         <section class="content-header">
-            <h1>全部应用</h1>
+            <h1>全部任务</h1>
 
             <ol class="breadcrumb">
                 <li class="active">
-                    <a href="/home">
+                    <a href="/review/jobs">
                         <i class="fa fa-dashboard"></i>
-                        全部应用
+                        全部任务
                     </a>
                 </li>
             </ol>