1.线调页面安全驾驶数据只显示选择线路的

王通
1 parent 60f8673d
Showing 2 changed files with 23 additions and 2 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
@@ -13,6 +13,7 @@ import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Comparator;
@@ -1173,7 +1174,7 @@ public class GpsServiceImpl implements GpsService {
             }
             //过滤数据
             for (SafeDriv sd : list) {
-                if (fieldEquals(fs, sd, map))
+                if (isSpecialLines(sd, map) && fieldEquals(fs, sd, map))
                     rs.add(sd);
             }
@@ -1294,6 +1295,20 @@ public class GpsServiceImpl implements GpsService {
             }
         });
     }
+    
+    /**
+     * 
+     * @param sd
+     * @param map
+     * @return
+     */
+    public boolean isSpecialLines(SafeDriv sd, Map<String, Object> map) {
+    	String lines = (String)map.get("lines");
+    	if (lines == null) lines = "";
+    	
+    	if (Arrays.asList(lines.split(",")).contains(sd.getXlbm())) return true;
+    	return false;
+    }
     public boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
         try {
@@ -117,10 +117,16 @@
             var query = function() {
                 scanFlag = false;
                 var data = form.serializeJSON();
+                debugger;
+                var lines = new Array();
+                for (var i = 0;i < gb_data_basic.activeLines.length;i++) {
+                	lines.push(gb_data_basic.activeLines[i].lineCode);
+                }
+                data.lines = lines.join(',');
                 data.page = page;
                 data.size = pageSize;
-                gb_common.$get('/gps/safeDriv', data, function (rs) {
+                gb_common.$post('/gps/safeDriv', data, function (rs) {
                     //数据转换
                     var code2Name=gb_data_basic.lineCode2NameAll(), url,stm, p;
                     $.each(rs.list, function(){