update

潘钊
1 parent 7fe23b16
Showing 8 changed files with 157 additions and 92 deletions
src/main/resources/static/real_control_v2/assets/imgs/bus1-R.png
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_config.html
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/iMap.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/baidu.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/gaode.js
src/main/resources/static/real_control_v2/mapmonitor/js/real.js
+input[type=checkbox].disabled{
+    background: #d6d3d3;
+    border-color: #d6d3d3 !important;
+}
+
 .z-depth-2 {
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
@@ -100,7 +105,7 @@
     border: 1px solid #bfbcbc;*/
  
     position: absolute !important;
-    height: 180px;
+    height: 124px;
     bottom: 2px !important;
     background: #fff;
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
@@ -147,7 +152,7 @@
 */
 .real_bottom_panel #handle{
     width: 100%;
-    height: 3px;
+    height: 4px;
     top: -3px;
     background-color: rgba(136, 137, 138, 0.49);
     cursor: row-resize;
@@ -20,19 +20,10 @@
             </div>
  
             <div class="uk-form-row">
-                <span class="uk-form-label">异常警报输出</span>
-                <div class="uk-form-controls">
-                    <label><input type="checkbox" {{if abnormalPrint.speeding}}checked{{/if}}> 超速</label>
-                    <label><input type="checkbox" {{if abnormalPrint.outBounds}}checked{{/if}}> 越界</label>
-                    <label><input type="checkbox" {{if abnormalPrint.largeMargin}}checked{{/if}}> 大间隔</label>
-                </div>
-            </div>
-
-            <div class="uk-form-row">
                 <span class="uk-form-label">车辆图标</span>
                 <div class="uk-form-controls">
-                    <label><input type="checkbox" {{if carIcon.angle}}checked{{/if}}> 标示角度</label>
-                    <label><input type="checkbox" {{if carIcon.converge}}checked{{/if}}> 聚合</label>
+                    <label><input name="carIcon_angle" type="checkbox" {{if carIcon.angle}}checked{{/if}}> 标示角度</label>
+                    <label><input class="disabled" disabled type="checkbox" {{if carIcon.converge}}checked{{/if}}> 聚合</label>
                 </div>
             </div>
  
@@ -81,7 +72,14 @@
                 </div>
             </div>
  
-            <br>
+            <div class="uk-form-row">
+                <span class="uk-form-label">异常警报输出</span>
+                <div class="uk-form-controls">
+                    <label><input class="disabled" disabled type="checkbox" {{if abnormalPrint.speeding}}checked{{/if}}> 超速</label>
+                    <label><input class="disabled" disabled type="checkbox" {{if abnormalPrint.outBounds}}checked{{/if}}> 越界</label>
+                    <label><input class="disabled" disabled type="checkbox" {{if abnormalPrint.largeMargin}}checked{{/if}}> 大间隔</label>
+                </div>
+            </div>
         </form>
     </script>
 </div>
@@ -86,7 +86,8 @@ var gb_map_config = (function () {
         traffic: trafficSwitch,
         spatial_data_station: spatial_data_station,
         spatial_data_carPark: spatial_data_carPark,
-        spatial_electronicFence: spatial_electronicFence
+        spatial_electronicFence: spatial_electronicFence,
+        carIcon_angle: carIcon_angle
     };
  
     //切换地图类型
@@ -137,6 +138,12 @@ var gb_map_config = (function () {
         else
             gb_map_imap.call('hideAllCircles');
     }
+    
+    //标识角度
+    function carIcon_angle(val) {
+        defaultConfig.carIcon.angle=this.checked;
+        gb_map_overlay_mge.reDraw();
+    }
  
     function recursion_get_attr(data, attr) {
         var ats = attr.split('.'),
@@ -6,14 +6,11 @@ var gb_map_imap = (function () {
     var mapContainer = $('#mapContainer');
     var maps = {};
     //尝试从 localStorage 里获取默认的地图类型
-    var currentMap = storage.getItem('real_map');
+    var currentMap;// = storage.getItem('real_map');
     var mapProxy = {
         //添加一个地图实例
         addMap: function (name, text, instance) {
             maps[name] = {name: name, text: text, instance: instance};
-
-            if (!currentMap)
-                currentMap = name;
             return mapProxy;
         },
         changeMap: function (mapName, cb) {
@@ -21,11 +18,11 @@ var gb_map_imap = (function () {
                 return;
             if (maps[mapName]) {
                 //原地图 destroy
-                var oldMap = maps[currentMap].instance;
-                oldMap.destroy && oldMap.destroy();
+                if(currentMap){
+                    var oldMap = maps[currentMap].instance;
+                    oldMap.destroy && oldMap.destroy();
+                }
                 //新地图 INIT
-                //var text = maps[mapName].text;
-                //layer.msg('正在切换到' + text + '...', {icon : 16,shade : [ 0.6, '#393D49' ],time : 0});
                 var newMap = maps[mapName].instance;
  
                 currentMap = mapName;
@@ -34,6 +31,9 @@ var gb_map_imap = (function () {
                 alertErr('不存在的地图实例' + mapName);
         },
         createCarIcon: createCarIcon,
+        busIcon: '/real_control_v2/assets/imgs/bus1-R.png',
+        _color: color,
+        //createCarIcon_angle: createCarIcon_angle,
         createStationIcon: createStationIcon,
         call: function (f, opts) {
             var instance = maps[currentMap].instance;
@@ -43,7 +43,7 @@ var gb_map_imap = (function () {
                 alertErr('当前地图实例不支持操作：' + f);
             return mapProxy;
         }
-    }
+    };
  
     //绘制车辆icon
     function createCarIcon(gps, w) {
@@ -72,6 +72,49 @@ var gb_map_imap = (function () {
         return canvas.toDataURL();
     }
  
+    //绘制车辆icon 带角度
+/*    var busIcon='data:image/png;base64,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';
+    function createCarIcon_angle(gps, w) {
+        var canvas = $('<canvas></canvas>')[0];
+        var ctx = canvas.getContext('2d');
+
+        //旋转画布
+
+        //console.log('gps', gps);direction
+        //车辆角度图片
+        var img = new Image();
+        img.src = busIcon;
+
+        ctx.save();
+        ctx.translate(w/2, 25);
+        ctx.rotate(-((gps.direction+300) * Math.PI / 180));
+
+        ctx.drawImage(img,-12, 0);
+
+        ctx.restore();
+
+        var colours = color(gps);
+
+        ctx.shadowOffsetX = 5; // 阴影Y轴偏移
+        ctx.shadowOffsetY = 5; // 阴影X轴偏移
+        ctx.shadowBlur = 1; // 模糊尺寸
+        ctx.shadowColor = colours.shadow; // 颜色
+
+        //绘制背景
+        if (!w)
+            w = 70;
+
+        ctx.roundRect(0, 0, w, 25, 5).stroke();
+        ctx.fillStyle = colours.bgColor;
+        ctx.fill();
+        //文字
+        ctx.font = "14px arial";
+        ctx.fillStyle = "#fff";
+        ctx.fillText(gps.nbbm, 4, 18);
+
+        return canvas.toDataURL();
+    }*/
+
     //绘制站点icon
     function createStationIcon(station, w) {
         var canvas = $('<canvas></canvas>')[0];
@@ -64,7 +64,8 @@ var gb_map_baidu = (function(){
 			});*/
 		},
 		destroy: function(){
-			realMarkers = {};
+			this.clearAll();
+			//realMarkers = {};
 			//linePolyline = [];
 		},
 		//画线路图层
@@ -205,8 +206,10 @@ var gb_map_baidu = (function(){
 			//清除所有覆盖物
 			realMarkers = {};
 			polylines={};
+			stationMarkers={};
+			electronicFences={};
+			carparks={};
 			map.clearOverlays();
-
 		},
 		showGpsMarker:function (opt) {
 			var chs = opt.chs;
@@ -316,53 +319,6 @@ var gb_map_baidu = (function(){
  
 		obj.bdPoints=bdPoints;
 	}
-	
-/*	function transCoordCarpark(carpark) {
-		var pStr = carpark.gParkPoint.substring(9, carpark.gParkPoint.length - 2);
-		var pArr = filterPolygonCoords(pStr.split(',')), coord, points=[];
-
-		$.each(pArr, function (i, str) {
-			var c = str.split(' ');
-			coord = TransGPS.wgsToBD(parseFloat(c[1]), parseFloat(c[0]));
-			points.push(new BMap.Point(coord.lng, coord.lat));
-		});
-		carpark.bdPoints=points;
-	}
-	
-	function transPolygonStation(opt) {
-		var pStr = opt.polygon.substring(9, opt.polygon.length - 2);
-		var pArr = filterPolygonCoords(pStr.split(',')), coord, points=[];
-
-		$.each(pArr, function (i, str) {
-			var c = str.split(' ');
-			coord = TransGPS.wgsToBD(parseFloat(c[1]), parseFloat(c[0]));
-			points.push(new BMap.Point(coord.lng, coord.lat));
-		});
-		opt.bdPoints=points;
-	}*/
-
-/*	//处理多边形点数组
-	function filterPolygonCoords(pArr) {
-		var newArr=[];
-		//去掉已闭合的尾
-		var end=pArr.length - 1;
-		if(pArr.length > 1 && pArr[0] == pArr[end])
-			pArr = pArr.slice(0, end);
-
-		//去掉连续的重复点
-		var last;
-		$.each(pArr, function (i, str) {
-			if(last){
-				if(last != str)
-					newArr.push(str);
-			}
-			else
-				newArr.push(str);
-			last = str;
-		});
-
-		return newArr;
-	}*/
  
 	function transCoord(gps) {
 		var coord = TransGPS.wgsToBD(gps.lat, gps.lon);
@@ -377,12 +333,15 @@ var gb_map_baidu = (function(){
 	};
 	function createBDMarkerByGps(gpsData){
  
+
+		//carIcon
 		var point = new BMap.Point(gpsData.bd_lon, gpsData.bd_lat);
 		var marker = new BMap.Marker(point);
  
 		//根据编码长度 计算marker 宽度
 		var w = calcGpsMarkerWidth(gpsData.nbbm);//gpsData.nbbm.length * 10;
-		marker.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gpsData, w), new BMap.Size(w,25)));
+		//渲染icon
+		renderIcon(marker, gpsData, w);
  
 		marker._icon_width=w;
 		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
@@ -399,6 +358,27 @@ var gb_map_baidu = (function(){
 		return marker;
 	}
  
+	function renderIcon(marker, gpsData, w){
+		var config = gb_map_config.getConfig();
+
+		//如果需要标识角度
+		if(config.carIcon.angle){
+
+			var icon = new BMap.Icon(gb_map_imap.busIcon, new BMap.Size(24,24));
+			var label = new BMap.Label(gpsData.nbbm,{offset:new BMap.Size(-(w/2-10),-24)});
+			var color=gb_map_imap._color(gpsData).bgColor;
+
+			label.setStyle({borderColor: color,borderRadius: '5px', padding: '1px 2px', color: '#fff', backgroundColor: color, font: 14});
+			marker.setIcon(icon);
+			marker.setLabel(label);
+			//旋转角度
+			marker.setRotation(gpsData.direction-90);
+
+		}
+		else
+			marker.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gpsData, w), new BMap.Size(w,25)));
+	}
+
  
 	function calcGpsMarkerWidth(nbbm) {
 		var width=0;
@@ -440,12 +420,20 @@ var gb_map_baidu = (function(){
 	}
  
 	function moveMarker(m, gps){
+		var config = gb_map_config.getConfig();
 		m.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
 		m.gpsData = gps;
 		//重新设置icon
 		//根据编码长度 计算marker 宽度
 		var w = m._icon_width;//calcGpsMarkerWidth(gps.nbbm);//gps.nbbm.length * 10;
-		m.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gps, w), new BMap.Size(w,25)));
+
+		renderIcon(m, gps, w);
+		/*//如果需要标识角度
+		if(config.carIcon.angle)
+			m.setIcon(new BMap.Icon(gb_map_imap.createCarIcon_angle(gps, w), new BMap.Size(w,50)));
+		else
+			m.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gps, w), new BMap.Size(w,25)));*/
+		//m.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gps, w), new BMap.Size(w,25)));
  
 		//更新 infoWindow
 		if(m.infoWindow.isOpen()){
@@ -66,10 +66,7 @@ var gb_map_gaode = (function() {
 			$('.leftUtils').addClass('gaode');
 		},
 		destroy:function(){
-			realMarkers = {};
-			$('.mapRightWrap').removeClass('gaode');
-			$('.mapTools').removeClass('gaode');
-			$('.leftUtils').removeClass('gaode');
+			this.clearAll();
 		},
 		traffic: function (enable) {
 			if(enable)
@@ -80,6 +77,9 @@ var gb_map_gaode = (function() {
 		clearAll: function () {
 			realMarkers = {};
 			polylines={};
+			stationMarkers={};
+			electronicFences={};
+			carparks={};
 			map.clearMap();
 		},
 		drawLine: function(opt){
@@ -299,14 +299,12 @@ var gb_map_gaode = (function() {
  
 		var marker = new AMap.Marker({
 	        map: map,
-			position: [gps.gcj_lon, gps.gcj_lat],
-	        icon: new AMap.Icon({
-	            size: new AMap.Size(w, 25),  //图标大小
-	            image: gb_map_imap.createCarIcon(gps, w)
-	        }),
-	        offset: new AMap.Pixel(-(w/2), -12)
+			position: [gps.gcj_lon, gps.gcj_lat]
 	    });
  
+		//渲染icon
+		renderIcon(marker, gps, w);
+
 		marker._icon_width=w;
 		//绑定数据
 		marker.gpsData = gps;
@@ -326,6 +324,28 @@ var gb_map_gaode = (function() {
  
 		return marker;
 	}
+	
+	function renderIcon(marker, gps, w) {
+		var config = gb_map_config.getConfig();
+
+		//如果需要标识角度
+		if(config.carIcon.angle) {
+			marker.setIcon(gb_map_imap.busIcon);
+			marker.setAngle(gps.direction - 90);
+			marker.setOffset(new AMap.Pixel(-(w / 2), -12));
+
+			marker.setLabel({
+				content: gps.nbbm,
+				offset: new AMap.Pixel(-20, -20),
+			});
+		}
+		else{
+			marker.setIcon(new AMap.Icon({
+				size: new AMap.Size(w, 25),  //图标大小
+				image: gb_map_imap.createCarIcon(gps, w)
+			}));
+		}
+	}
  
 	//创建站点marker
 	function createStationMark(statio) {
@@ -370,10 +390,13 @@ var gb_map_gaode = (function() {
  
 		//重新设置icon
 		var w = m._icon_width;
-		m.setIcon(new AMap.Icon({
+		//渲染icon
+		renderIcon(marker, gps, w);
+
+		/*m.setIcon(new AMap.Icon({
             size: new AMap.Size(w, 25),
             image: gb_map_imap.createCarIcon(gps, w)
-        }));
+        }));*/
  
 		if(m.infoWindow.getIsOpen())
 			openWindow(m);
 var mapmonitor_load_ep = EventProxy.create('load_iMap', 'load_baidu', 'load_gaode', function () {
     moment.locale('zh-cn');
-    //地图
-    gb_map_imap.addMap('baidu', '百度地图', gb_map_baidu)
-        .addMap('gaode', '高德地图', gb_map_gaode)
-        .call('init');
  
     //init config form
     gb_map_config.init();
  
+    //地图
+    gb_map_imap.addMap('baidu', '百度地图', gb_map_baidu)
+        .addMap('gaode', '高德地图', gb_map_gaode)
+        .changeMap(gb_map_config.getConfig().map_type);
+
     //init tree
     gb_map_gps_tree.init(function () {
         gb_map_overlay_mge.init();
@@ -18,7 +19,7 @@ var mapmonitor_load_ep = EventProxy.create(&#39;load_iMap&#39;, &#39;load_baidu&#39;, &#39;load_gaod
         handles: {
             'n': '.real_bottom_panel #handle'
         },
-        maxHeight: 650,
+        maxHeight: 384,
         minHeight: 18
     });
 });