diff --git a/sec-beidou/src/main/resources/templates/page/device_overview.html b/sec-beidou/src/main/resources/templates/page/device_overview.html
index f410f595..5f0c85e6 100644
--- a/sec-beidou/src/main/resources/templates/page/device_overview.html
+++ b/sec-beidou/src/main/resources/templates/page/device_overview.html
@@ -27,8 +27,43 @@
             line-height:30px;
             font-size: 12px
         }
+
+        ul li {
+            list-style: none;
+        }
+        .btn-wrap {
+            z-index: 999;
+            position: fixed;
+            bottom: 3.5rem;
+            margin-left: 3rem;
+            padding: 1rem 1rem;
+            border-radius: .25rem;
+            background-color: #fff;
+            box-shadow: 0 2px 6px 0 rgba(27, 142, 236, 0.5);
+        }
+        .btn {
+            width: 75px;
+            height: 30px;
+            float: left;
+            background-color: #fff;
+            color: rgba(27, 142, 236, 1);
+            font-size: 14px;
+            border: 1px solid rgba(27, 142, 236, 1);
+            border-radius: 5px;
+            margin: 0 5px;
+            text-align: center;
+            line-height: 30px;
+        }
+        .btn:hover {
+            background-color: rgba(27, 142, 236, 0.8);
+            color: #fff;
+        }
     </style>
+    
+	<script type="text/javascript" src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=4ef46ba62e8fba67b53a0becca4d05da">
+	</script>
 </head>
+
 <body>
 <div class="layuimini-main">
 
@@ -69,6 +104,11 @@
 
     <div class="layui-row layui-col-space15">
         <div class="layui-card top-panel">
+            <ul class="btn-wrap" style="z-index: 99;">
+                <li class="light btn" onclick="showAll()">全部</li>
+                <li class="night btn" onclick="showWarning1()">一般告警</li>
+                <li class="night btn" onclick="showWarning2()">严重告警</li>
+            </ul>
             <div id="map-container" class="layui-card-body" style="height: 85vh;weight :100vw"></div>
         </div>
     </div>
@@ -77,30 +117,37 @@
 
 
 <script th:inline="javascript">
+    var greenMarkers=[];
+    var orangeMarkers=[];
+    var redMarkers=[];
+    var batch_id = 0;
+    var deviceList=
+    [
+        [# th:each="device : ${deviceList}"]
+        {deviceid:[[${device.deviceid}]],
+            latitude:[[${device.latitude}]],
+            longitude:[[${device.longitude}]],
+            warning:[[${device.warning}]]},
+        [/]
+    ];
+	var marker_state = 0;//0: translating; 1:all; 2:orange; 3:red
+
+    var map = new BMapGL.Map("map-container");
+    var convertor = new BMapGL.Convertor();
+    var loc_green = new BMapGL.Icon("../images/loc1_green.png", new BMapGL.Size(18, 24));
+    var loc_red = new BMapGL.Icon("../images/loc1_red.png", new BMapGL.Size(18, 24));
+    var loc_orange = new BMapGL.Icon("../images/loc1_orange.png", new BMapGL.Size(18, 24));
+        
+    initialize();
+
     function initialize() {
-        var map = new BMapGL.Map("map-container");            // 创建Map实例
         var point = new BMapGL.Point(116.404, 39.915);
         map.centerAndZoom(point, 7);
         map.enableScrollWheelZoom(true);
         //map.setMapType(BMAP_SATELLITE_MAP);
+
         var centerLat = 0;
         var centerLon = 0;
-        var deviceList=
-            [
-                [# th:each="device : ${deviceList}"]
-                    {deviceid:[[${device.deviceid}]],
-                        latitude:[[${device.latitude}]],
-                        longitude:[[${device.longitude}]],
-                        warning:[[${device.warning}]]},
-                    [/]
-            ];
-        let batch_id = 0;
-        var convertor = new BMapGL.Convertor();
-
-        var loc_green = new BMapGL.Icon("../images/loc1_green.png", new BMapGL.Size(18, 24));
-        var loc_red = new BMapGL.Icon("../images/loc1_red.png", new BMapGL.Size(18, 24));
-        var loc_orange = new BMapGL.Icon("../images/loc1_orange.png", new BMapGL.Size(18, 24));
-
         //console.log(deviceList);
         for(var i=0; i<deviceList.length; i++) {
             centerLat += deviceList[i].latitude;
@@ -111,6 +158,7 @@
             centerLon = centerLon/deviceList.length;
             map.setCenter(new BMapGL.Point(centerLon,centerLat));
         }
+		marker_state = 0;
 
         translateCallback = function (data){
             if(data.status === 0) {
@@ -121,29 +169,31 @@
                         marker = new BMapGL.Marker(data.points[i], {
                             icon: loc_red
                         });
+                        redMarkers.push(marker);
                     }
                     else if(deviceList[batch_id+i].warning == 1) {
                         marker = new BMapGL.Marker(data.points[i], {
                             icon: loc_orange
                         });
+                        orangeMarkers.push(marker);
                     }
                     else {
                         marker = new BMapGL.Marker(data.points[i], {
                             icon: loc_green
                         });
+                        greenMarkers.push(marker);
                     }
 
                     // 点标记添加点击事件
                     map.addOverlay(marker);
 
-
                     //if(deviceList[batch_id+i].warning != 0){
-                        var label = new BMapGL.Label(deviceList[batch_id+i].deviceid,
-                            {
-                                position: data.points[i], // 指定文本标注所在的地理位置
-                                offset: new BMapGL.Size(10, 10) // 设置文本偏移量
-                            });             // 创建文本标注对象
-                        map.addOverlay(label);
+                    var label = new BMapGL.Label(deviceList[batch_id+i].deviceid,
+                        {
+                            position: data.points[i], // 指定文本标注所在的地理位置
+                            offset: new BMapGL.Size(10, 10) // 设置文本偏移量
+                        });             // 创建文本标注对象
+                    map.addOverlay(label);
                     //}
 
                 }
@@ -156,6 +206,7 @@
                     timer();
                 }, 500);
             }
+            else marker_state = 1;
         }
 
         //每秒转换10个坐标，否则会受百度并发限制
@@ -171,21 +222,89 @@
             }
 
             convertor.translate(pointArr, 1, 5, translateCallback);
-
         }
+
         // 启动函数
         timer();
     }
+	
 
-
-    function loadScript() {
-        var script = document.createElement("script");
-        script.src = "https://api.map.baidu.com/api?v=1.0&type=webgl&ak=4ef46ba62e8fba67b53a0becca4d05da&callback=initialize";
-        document.body.appendChild(script);
-    }
-
-    loadScript();
-
+   function showAll(){
+	   if(marker_state == 2){
+		   showGreen();
+		   showRed();
+		   marker_state = 1;
+	   }
+	   else if(marker_state == 3){
+		   showGreen();
+		   showOrange();
+		   marker_state = 1;
+	   }
+   }
+   
+   function showWarning1(){
+	   if(marker_state == 1){
+		   hideGreen();
+		   hideRed();
+		   marker_state = 2;
+	   }
+	   else if(marker_state == 3){
+		   hideRed();
+		   showOrange();
+		   marker_state = 2;
+	   }
+   }
+   
+   function showWarning2(){
+   	   if(marker_state == 1){
+   		   hideGreen();
+   		   hideOrange();
+   		   marker_state = 3;
+   	   }
+   	   else if(marker_state == 2){
+   		   hideOrange();
+   		   showRed();
+   		   marker_state = 3;
+   	   }
+   }
+   
+   function showGreen(){
+	   for(var i=0; i<greenMarkers.length; i++){
+		   map.addOverlay(greenMarkers[i]);
+	   }
+   }
+   
+   function showOrange(){
+	   for(var i=0; i<orangeMarkers.length; i++){
+	   		map.addOverlay(orangeMarkers[i]);
+	   }
+   }
+   
+   function showRed(){
+	   for(var i=0; i<redMarkers.length; i++){
+	   		map.addOverlay(redMarkers[i]);
+	   }
+   }
+   
+   function hideGreen(){
+	   for(var i=0; i<greenMarkers.length; i++){
+	   		map.removeOverlay(greenMarkers[i]);
+	   }
+   }
+   
+   function hideOrange(){
+   	   for(var i=0; i<orangeMarkers.length; i++){
+   	   		map.removeOverlay(orangeMarkers[i]);
+   	   }
+   }
+   
+   function hideRed(){
+   	   for(var i=0; i<redMarkers.length; i++){
+   	   		map.removeOverlay(redMarkers[i]);
+   	   }
+   }
+        
+        
 </script>
 
 </body>
