Merge branch 'dev' into bug-fix-2020-12-1

src/main/java/com/mooctest/util/ReportUtil.java

@@ -1,23 +1,24 @@
 package com.mooctest.util;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class ReportUtil {
-    public static Map<Short, String> severity2String = new HashMap<Short, String>() {{
-            put((short)5, "紧急");
-            put((short)4, "严重");
-            put((short)3, "一般");
-            put((short)2, "较轻");
-            put((short)1, "待定");
-            put((short)0, "空");
+    public static Map<Short, String> severity2String = new LinkedHashMap<Short, String>() {{
+        put((short)3, "一般");
+        put((short)5, "紧急");
+        put((short)4, "严重");
+        put((short)2, "较轻");
+        put((short)1, "待定");
+        put((short)0, "空");
     }};
 
-    public static Map<Integer, String> category2String = new HashMap<Integer, String>() {{
-        put(5, "用户体验");
-        put(4, "页面布局缺陷");
-        put(3, "性能");
+    public static Map<Integer, String> category2String = new LinkedHashMap<Integer, String>() {{
         put(2, "功能不完整");
+        put(3, "性能");
+        put(4, "页面布局缺陷");
+        put(5, "用户体验");
         put(1, "安全");
         put(6, "不正常退出");
         put(7, "其他");
@@ -25,25 +26,24 @@ public class ReportUtil {
 
     }};
 
-    public static Map<String, Integer> string2Category = new HashMap<String, Integer>() {{
-        put("用户体验", 5);
-        put("页面布局缺陷", 4);
+    public static Map<String, Integer> string2Category = new LinkedHashMap<String, Integer>(){{
+        put( "功能不完整", 2);
         put("性能", 3);
-        put("功能不完整", 2);
+        put("页面布局缺陷", 4);
+        put("用户体验", 5);
         put("安全", 1);
         put("不正常退出", 6);
         put("其他", 7);
         put("空", 0);
     }};
 
-    public static Map<Short, String> recurrent2String = new HashMap<Short, String>() {{
+    public static Map<Short, String> recurrent2String = new LinkedHashMap<Short, String>() {{
+        put((short)0, "空");
         put((short)5, "必现");
         put((short)4, "大概率复现");
         put((short)3, "小概率复现");
         put((short)2, "无规律复现");
         put((short)1, "其他");
-        put((short)0, "空");
-
     }};
 
     public static Map<Long, String> reviewerMap = new HashMap<Long, String>() {{

src/main/resources/templates/main.html

@@ -20,16 +20,16 @@
             </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>
+<!--            <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">

src/main/resources/templates/task_list.html

@@ -28,16 +28,16 @@
             </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>
+<!--            <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">