Selaa lähdekoodia

git-svn-id: https://192.168.57.71/svn/qt@73 12fe181a-e57f-b044-8676-16dc139aa63e

ld_zhoutl 8 vuotta sitten
vanhempi
commit
25590b740e

+ 2 - 0
jdc/jdcweb/trunk/src/main/java/com/jsjty/jdc/web/basic/service/impl/BasicDataServiceImpl.java

@@ -64,6 +64,8 @@ public class BasicDataServiceImpl implements BasicDataService {
                 params.put("name", "%" + name + "%");
                 sql = "select * from T_BASIC_INFO t where t.tablename = :tableName "
                         + " and t.name like :name order by sortno asc";
+            } else {
+                sql = "select * from T_BASIC_INFO t where t.tablename = :tableName order by sortno asc";
             }
         }
         return basicDataDao.nativeQuery(sql, TbasicInfo.class, params);

+ 1 - 0
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/basic_info.js

@@ -104,6 +104,7 @@ var singlePlaneFlg = false;
 var singlePlaneHbh = "";
 var singleShipFlg = false;
 var singleShipMmsi = "";
+var roadId;
 
 /**
  * 设置地图中心点,并设置缩放比例值

+ 3 - 1
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_command.js

@@ -515,7 +515,9 @@ function initCommandBasicInfoEvent(name) {
 	            }
             }
         }, 'json');
-    } else if (name == tc_fwq) {
+    } else if (name == tc_keyunzhan) {
+        addGzczMarker(name, basicType);
+    }  else if (name == tc_fwq) {
         setRoadRel(name);
     } else if (name == tc_shoufeizhan) {
         setRoadRel(name)

+ 4 - 3
jdc/jdcweb/trunk/src/main/webapp/static/xt/js/sys/common_road.js

@@ -15,11 +15,11 @@ var map;
 var roadBaseLayer;
 
 var vectorLayer;
+var baseVectorLayer;
 var roadFeatures = [];
 var fwqFeatures = [];
 var canyinFeatures = [];
 var select;
-var roadId;
 var roadName;
 
 /** 页面初始化 */
@@ -95,10 +95,11 @@ function initRoad() {
     tfsjMarkerlayer = new SuperMap.Layer.Markers("突发事件图层"); // 突发事件信息
     glyhMarkerlayer = new SuperMap.Layer.Markers("道路养护图层"); // 道路养护信息
 
+    baseVectorLayer = new SuperMap.Layer.Vector("Vector Layer", {renderers: ["Canvas2"]});
     vectorLayer = new SuperMap.Layer.Vector("Vector Layer", {renderers: ["Canvas2"]});
 
 
-    map.addLayers([vectorLayer,
+    map.addLayers([baseVectorLayer,vectorLayer,
         cameraMarkerlayer, kyzMarkerlayer, cjdqMarkerlayer,
         cjqdMarkerlayer, sdMarkerlayer, jczMarkerlayer, fwqMarkerlayer,
         sfzMarkerlayer, tfsjMarkerlayer, glyhMarkerlayer
@@ -168,7 +169,7 @@ function getRoadList() {
                 // 添加到公路列表
                 roadFeatures.push(feature);
             }
-            vectorLayer.addFeatures(roadFeatures);
+        	baseVectorLayer.addFeatures(roadFeatures);
         }
         showRoadList();
     }, 'json');