Browse Source

commit

master
hehongxing 3 years ago
parent
commit
74eb77b09c
  1. 6
      04.系统编码/App/Content/scripts/beijing/map.js
  2. 6
      04.系统编码/App/Content/scripts/menggu/map.js
  3. 6
      04.系统编码/App/Content/styles/index.css

6
04.系统编码/App/Content/scripts/beijing/map.js

@ -648,7 +648,7 @@ var Map = function (parent) {
L.marker([point[1], point[0]], {
icon: L.divIcon({
className: 'time-label {0}-time-label'.format(className),
html: this.NormalizeTime(point[1], point[3])
html: this.NormalizeTime(point[0], point[1], point[3])
})
}).addTo(features);
}.bind(this));
@ -659,10 +659,10 @@ var Map = function (parent) {
return pattern.format(param.Longitude, param.Latitude, param.Height, moment(param.ReleaseTime).format("MM/DD HH:mm"));
};
this.NormalizeTime = function (lng, time) {
this.NormalizeTime = function (lat, lng, time) {
var attr = lng.toString().split(".").join("");
var value = moment(time, "YYYYMMDD_HHmmss");
return '<a href="javascript:;" class="close-button" title="关闭"></a><span lng="point{0}">{1}</span>'.format(attr, value.format("MM/DD HH:mm"));
return '<a href="javascript:;" class="close-button" title="关闭"></a><div lng="point{0}"><p>经度:{1}</p><p>纬度: {2} </p><p>时间: {3}</p></div>'.format(attr, lat, lng, value.format("MM/DD HH:mm"));
};
this.ShowWindLayer = function (data) {

6
04.系统编码/App/Content/scripts/menggu/map.js

@ -361,7 +361,7 @@ var Map = function (parent) {
L.marker([point[1], point[0]], {
icon: L.divIcon({
className: 'time-label',
html: this.NormalizeTime(point[1], point[2])
html: this.NormalizeTime(point[0], point[1], point[2])
})
}).addTo(features);
}.bind(this));
@ -372,10 +372,10 @@ var Map = function (parent) {
return pattern.format(param.Longitude, param.Latitude, param.Height, moment(param.ReleaseTime).format("MM/DD HH:mm"));
};
this.NormalizeTime = function (lng, time) {
this.NormalizeTime = function (lat, lng, time) {
var attr = lng.toString().split(".").join("");
var value = moment(time, "YYYYMMDD_HHmmss");
return '<a href="javascript:;" class="close-button" title="关闭"></a><span lng="point{0}">{1}</span>'.format(attr, value.format("MM/DD HH:mm"));
return '<a href="javascript:;" class="close-button" title="关闭"></a><div lng="point{0}"><p>经度:{1}</p><p>纬度: {2} </p><p>时间: {3}</p></div>'.format(attr, lat, lng, value.format("MM/DD HH:mm"));
};
this.ShowWindLayer = function (data) {

6
04.系统编码/App/Content/styles/index.css

@ -1200,11 +1200,11 @@
}
.time-label {
height: 19px !important;
width: 90px !important;
height: 56px !important;
width: 120px !important;
padding-left: 5px;
margin-left: 5px !important;
margin-top: -23px !important;
margin-top: -28px !important;
color: #777 !important;
background-color: #fff;
border: solid 1px #aaa;

Loading…
Cancel
Save