Merge branch 'master' into switch_conf

@@ -12,4 +12,6 @@ public class ProjectBuildReq extends PageRequest {
 
     private String environment;
 
+    private int currentStatus;
+
 }

@@ -101,6 +101,17 @@
                                     </c:forEach>
                                 </select>
                             </div>
+                            <div class="input-group" style="float: left;">
+                                <span class="input-group-addon">状态：</span>
+                                <select id="currentStatus" name="currentStatus" class="form-control">
+                                    <option value="0"></option>
+                                    <option value="1">正在进行</option>
+                                    <option value="2">成功</option>
+                                    <option value="3">强制退出</option>
+                                    <option value="4">出错退出</option>
+
+                                </select>
+                            </div>
                             <button id="searchBtn" class="btn btn-primary" style="margin-left: 18px;">搜索</button>
                         </div>
                     </div>
@@ -153,10 +164,10 @@
                 width: "8%"
             }, {
                 title: "状态",
-                field: "status",
+                field: "currentStatus",
                 formatter : function(value, rowData, rowIndex) {
                     if(value == 1){
-                        return '成功';
+                        return '正在进行';
                     } else if(value == 2){
                         return '成功';
                     }else if(value == 3){
@@ -189,9 +200,12 @@
     $("#searchBtn").click(function () {
         var currentProject = $("#currentProject").val();
         var environment = $("#environment").val();
+        var currentStatus = $("#currentStatus").val();
+
         $("#historyTable").table("load", {
             'currentProject': currentProject,
-            'environment': environment
+            'environment': environment,
+            'currentStatus': currentStatus
         });
     });
 

@@ -210,4 +210,15 @@
     }
 
 </script>
-             
\ No newline at end of file
+
+<script>
+    document.onkeydown = function()
+    {
+        if(event.keyCode==116 || event.keyCode==8 ||  (event.ctrlKey && event.keyCode==82) || event.keyCode == 13) {
+            event.keyCode=0;
+            event.returnValue = false;
+        }
+    }
+    document.oncontextmenu = function() {event.returnValue = false;}
+
+</script>
\ No newline at end of file

@@ -67,6 +67,7 @@
 
 </body>
 <script>
+
     var myArray = new Array();
     var removeArray = new Array();
 
@@ -177,8 +178,17 @@
                 }
             });
         });
+    }
+</script>
 
+<script>
+    document.onkeydown = function()
+    {
+        if(event.keyCode==116 || event.keyCode==8 ||  (event.ctrlKey && event.keyCode==82) || event.keyCode == 13) {
+            event.keyCode=0;
+            event.returnValue = false;
+        }
     }
+    document.oncontextmenu = function() {event.returnValue = false;}
 
-</script>
-             
\ No newline at end of file
+</script>
\ No newline at end of file