|
|
@@ -963,8 +963,8 @@ function showAirDetailInfo(result, marker) {
|
|
|
htmlStr += '<div class="item" style="padding:6px;"> <div class="header">飞行高度：' + marker.high + '英尺</div></div>';
|
|
|
htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "起飞机场", fromPort);
|
|
|
htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "目的机场", toPort);
|
|
|
- htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "起飞时间", longToDate(result.departure));
|
|
|
- htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "到达时间", longToDate(result.arrival));
|
|
|
+ htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "起飞时间", longToDate(result.departure*1000));
|
|
|
+ htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "到达时间", longToDate(result.arrival*1000));
|
|
|
htmlStr += $.formatString('<div class="item" style="padding:6px;"> <div class="header">{0}: {1}</div></div>', "装载能力", "");
|
|
|
htmlStr += $.formatString('<img src="{0}" style="width: 318px;height:215px;margin-left:5px;margin-right:5px;"> </img>',
|
|
|
basePath+"/airimg?hbh="+result.flight+"&xingh="+result.xingh+"&webPath="+result.image);
|
|
|
@@ -1333,9 +1333,9 @@ function showFjcwt(xingh) {
|
|
|
*初始化基础数据复选框监听
|
|
|
*
|
|
|
*/
|
|
|
-function initEventInfoEvent(basicType) {
|
|
|
+function initEventInfoEvent(type) {
|
|
|
var targetMarkerLayer;
|
|
|
- if (basicType == tc_tfsjchk) {
|
|
|
+ if (type == tc_tfsjchk) {
|
|
|
targetMarkerLayer = tfsjMarkerlayer;
|
|
|
} else {
|
|
|
targetMarkerLayer = glyhMarkerlayer;
|
|
|
@@ -1357,17 +1357,12 @@ function initEventInfoEvent(basicType) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $.post(basePath + "/eventInfo", {type: basicType, lonlatStr:lonlatStr}, function (result) {
|
|
|
+ $.post(basePath + "/gzcx/jtlk", {type: type, lonlatStr:lonlatStr}, function (result) {
|
|
|
var len = result.length;
|
|
|
targetMarkerLayer.clearMarkers();
|
|
|
for (var i = 0; i < len; i++) {
|
|
|
var icon = "";
|
|
|
-// if (basicType == "tfsjchk") {
|
|
|
-// icon = "assets/images/basic/tfsj.png";
|
|
|
-// } else {
|
|
|
-// icon = "assets/images/basic/yhsg.png";
|
|
|
-// }
|
|
|
- icon = "assets/images/event/"+result[i].shijlx+".png";
|
|
|
+ icon = "assets/images/event/"+result[i].fvcShijlx+".png";
|
|
|
addEventMarker(result[i], icon, targetMarkerLayer);
|
|
|
}
|
|
|
}, 'json');
|
|
|
@@ -1411,8 +1406,9 @@ function openEventInfoWin(objMarker) {
|
|
|
*/
|
|
|
function getEvnetWinInfo(result) {
|
|
|
var content = '<div class="ui middle aligned selection list " style="padding-left: 20px;padding-top: 20px">';
|
|
|
- content += $.formatString('<div class="item"> <div class="header">{0}: {1}</div></div>', "路段名称", result.ludmc);
|
|
|
- content += $.formatString('<div class="item"> {0}({1})</div>', result.shijnr, result.xiugsj);
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">{0}: {1}</div></div>', "路段名称", result.fvcLuxmc);
|
|
|
+ content += $.formatString('<div class="item">   {0}({1})</div>',
|
|
|
+ result.fvcShijnr, longToDate(result.fdtShifsj));
|
|
|
content += '</div>';
|
|
|
return content;
|
|
|
}
|
|
|
@@ -2078,4 +2074,116 @@ function showHbxx(hbh) {
|
|
|
layer.title(title, taskHbIndex);
|
|
|
layer.iframeSrc(taskHbIndex, url);
|
|
|
}
|
|
|
-}
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * 公众出行添加marker共通
|
|
|
+ * @param name
|
|
|
+ * @param basicType
|
|
|
+ */
|
|
|
+function addGzczMarker(name, basicType) {
|
|
|
+ var url = basePath;
|
|
|
+ if (name == tc_keyunzhan) {
|
|
|
+ url += "/gzcx/keyunzhan";
|
|
|
+ } else if (name == tc_kjdq) {
|
|
|
+ url += "/gzcx/kuajdq";
|
|
|
+ } else if (name == tc_cjqd) {
|
|
|
+ url += "/gzcx/changjqd";
|
|
|
+ } else if (name == tc_suidao) {
|
|
|
+ url += "/gzcx/suid";
|
|
|
+ } else if (name == tc_jiancezhan) {
|
|
|
+ url += "/gzcx/jiancz";
|
|
|
+ } else if (name == tc_ssfwq) {
|
|
|
+ url += "/gzcx/fuwq";
|
|
|
+ } else if (name == tc_shoufeizhan) {
|
|
|
+ url += "/gzcx/shoufz";
|
|
|
+ }
|
|
|
+ $.get(url, {type: name}, function (result) {
|
|
|
+ var len = result.length;
|
|
|
+ var targetLayer = $.getBasicLayer(name, basicType);
|
|
|
+ targetLayer.clearMarkers();
|
|
|
+ for (var i = 0; i < len; i++) {
|
|
|
+ addRoadMarkerBasic(result[i], name, targetLayer);
|
|
|
+ }
|
|
|
+ }, 'json');
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ * 添加坐标数据
|
|
|
+ * @param lat
|
|
|
+ * @param lon
|
|
|
+ *
|
|
|
+ */
|
|
|
+function addRoadMarkerBasic(obj, name, targetMarkerlayer) {
|
|
|
+ var icon_url = $.getBasicIcon(name);
|
|
|
+ var size = new SuperMap.Size(31, 31);
|
|
|
+ var icon = new SuperMap.Icon(icon_url, size, null);
|
|
|
+ var marker = new SuperMap.Marker(new SuperMap.LonLat(obj.lon, obj.lat), icon);
|
|
|
+ marker.events.on({
|
|
|
+ "click": function (params) {
|
|
|
+ /*if(name == tc_keyunzhan) {
|
|
|
+ // 设置地图中心点，并设置缩放比例值
|
|
|
+ setMapCenter(obj.lat, obj.lon, 11);
|
|
|
+ }*/
|
|
|
+ //设置点击图标大小变化
|
|
|
+ setClickIcon(params);
|
|
|
+ //设置当前弹出图层类型
|
|
|
+ setCurrentTcType(name);
|
|
|
+ openRoadBasicInfoWin(name, marker);
|
|
|
+ },
|
|
|
+ "scope": marker
|
|
|
+ });
|
|
|
+ marker.attr = obj;
|
|
|
+ targetMarkerlayer.addMarker(marker);
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+/**
|
|
|
+ *打开信息窗口
|
|
|
+ *
|
|
|
+ */
|
|
|
+function openRoadBasicInfoWin(name, objMarker) {
|
|
|
+ var height = 300;
|
|
|
+ var width = 320;
|
|
|
+ var content = "";
|
|
|
+ var marker = objMarker;
|
|
|
+ var obj = marker.attr;
|
|
|
+ if(name == tc_keyunzhan) {
|
|
|
+ content = '<div class="ui middle aligned selection list " style="padding-left: 0px;padding-top: 5px">';
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">名  称：{0}</div></div>', nullToEmpty(obj.fvcZhanm));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">地  址：{0}</div></div>', nullToEmpty(obj.fvcZhanz));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">隶属企业：{0}</div></div>', nullToEmpty(obj.fvcJingjlsdw));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">联系电话：{0}</div></div>', nullToEmpty(obj.fvcLianxdh));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">客运等级：{0}</div></div>', nullToEmpty(obj.fvcZhanj));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">跨省班线：{0}班</div></div>', nullToEmpty(obj.fnbKuasbxsl));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">跨市班线：{0}班</div></div>', nullToEmpty(obj.fnbKuashibxsl));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">县际班线：{0}班</div></div>', nullToEmpty(obj.fnbXianj));
|
|
|
+ content += $.formatString('<div class="item"> <div class="header">公交路线：{0}</div></div>', nullToEmpty(obj.fvcBusline));
|
|
|
+ openrbwin(marker.attr.fvcZhanm, content, height, width);
|
|
|
+ /* } else if (name == tc_kjdq) {
|
|
|
+ } else if (name == tc_cjqd) {
|
|
|
+ } else if (name == tc_suidao) {
|
|
|
+ } else if (name == tc_jiancezhan) {
|
|
|
+ } else if (name == tc_ssfwq) {
|
|
|
+ } else if (name == tc_shoufeizhan) {*/
|
|
|
+ } else {
|
|
|
+ $.get(basePath + "/detail/" + marker.attr.gid + "/" + marker.attr.tablename, function (result) {
|
|
|
+ content = getBasicInfo(marker.attr, result);
|
|
|
+ if (marker.attr && result) {
|
|
|
+ if(tc_cjqd == marker.attr.tablename ||
|
|
|
+ tc_jiancezhan == marker.attr.tablename) {
|
|
|
+ // 长江汽渡
|
|
|
+ height = 160;
|
|
|
+ width = 260;
|
|
|
+ } else if(tc_shoufeizhan == marker.attr.tablename ||
|
|
|
+ tc_fwq == marker.attr.tablename) {
|
|
|
+ // 长江汽渡
|
|
|
+ height = 180;
|
|
|
+ width = 260;
|
|
|
+ }
|
|
|
+ openrbwin(marker.attr.name, content, height, width);
|
|
|
+ }
|
|
|
+ }, 'json');
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
ld_zhoutl