Browse Source

commit

master
hehongxing 3 years ago
parent
commit
4ec42086f0
  1. 2
      04.系统编码/App/Content/scripts/beijing/lat-lng-switch.js
  2. 9
      04.系统编码/App/Content/scripts/beijing/map.js
  3. 4
      04.系统编码/App/Content/scripts/beijing/realtime-panel.js
  4. 6
      04.系统编码/App/Content/scripts/menggu/map.js
  5. 26
      04.系统编码/App/Content/styles/index.css

2
04.系统编码/App/Content/scripts/beijing/lat-lng-switch.js

@ -129,7 +129,7 @@
var degree = text[0]; var degree = text[0];
var temp = "0." + text[1]; var temp = "0." + text[1];
var temp = String(temp * 60); temp = String(temp * 60);
var str = temp.split("."); var str = temp.split(".");
var minute = str[0]; var minute = str[0];

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

@ -195,11 +195,11 @@ var Map = function (parent) {
if (this.showTimeTags) { if (this.showTimeTags) {
//$('.point').show(); //$('.point').show();
$('.time-label').show(); $('.time-label-content').show();
$(event.target).removeClass('default-text'); $(event.target).removeClass('default-text');
} else { } else {
//$('.point').hide(); //$('.point').hide();
$('.time-label').hide(); $('.time-label-content').hide();
$(event.target).addClass('default-text'); $(event.target).addClass('default-text');
} }
}; };
@ -451,6 +451,7 @@ var Map = function (parent) {
this.AddLabels(features, result.backward.points, 'actual'); this.AddLabels(features, result.backward.points, 'actual');
this.AddLabels(features, result.forward.points, 'actual'); this.AddLabels(features, result.forward.points, 'actual');
return features; return features;
}; };
@ -712,12 +713,12 @@ var Map = function (parent) {
this.GetCenterLabel = function (param) { this.GetCenterLabel = function (param) {
var pattern = '<p>经度:{0}</p><p>纬度:{1}</p><p>高度:{2}米</p><p>释放时间:{3}</p>'; var pattern = '<p>经度:{0}</p><p>纬度:{1}</p><p>高度:{2}米</p><p>释放时间:{3}</p>';
return pattern.format(param.Longitude, param.Latitude, param.Height, moment(param.ReleaseTime, 'YYYY/MM/DD HH:mm').format("MM/DD HH:mm")); return pattern.format(param.Longitude, param.Latitude, param.Height, moment(param.ReleaseTime, 'YYYY/MM/DD HH:mm').format("MM/DD HH:mm"));
}; };
this.NormalizeTime = function (lat, lng, time) { this.NormalizeTime = function (lat, lng, time) {
var attr = lng.toString().split(".").join(""); var attr = lng.toString().split(".").join("");
var value = moment(time, "YYYYMMDD_HHmmss"); var value = moment(time, "YYYYMMDD_HHmmss");
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")); return '<div class="time-label-content" style="display: {0};"><a href="javascript:;" class="close-button" title="关闭"></a><div lng="point{1}"><p>经度:{2}</p><p>纬度: {3} </p><p>时间: {4}</p></div></div>'.format(this.showTimeTags ? "block" : "none", attr, lat, lng, value.format("MM/DD HH:mm"));
}; };
this.ShowWindLayer = function (data) { this.ShowWindLayer = function (data) {

4
04.系统编码/App/Content/scripts/beijing/realtime-panel.js

@ -323,7 +323,7 @@
var degree = text[0]; var degree = text[0];
var temp = "0." + text[1]; var temp = "0." + text[1];
var temp = String(temp * 60); temp = String(temp * 60);
var str = temp.split("."); var str = temp.split(".");
var minute = str[0]; var minute = str[0];
@ -334,7 +334,7 @@
degree: degree, degree: degree,
minute: minute, minute: minute,
second: second second: second
} };
}; };
this.GetTaskParams = function (taskId) { this.GetTaskParams = function (taskId) {

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

@ -148,11 +148,11 @@ var Map = function (parent) {
if (this.showTimeTags) { if (this.showTimeTags) {
//$('.point').show(); //$('.point').show();
$('.time-label').show(); $('.time-label-content').show();
$(event.target).removeClass('default-text'); $(event.target).removeClass('default-text');
} else { } else {
//$('.point').hide(); //$('.point').hide();
$('.time-label').hide(); $('.time-label-content').hide();
$(event.target).addClass('default-text'); $(event.target).addClass('default-text');
} }
}; };
@ -429,7 +429,7 @@ var Map = function (parent) {
this.NormalizeTime = function (lat, lng, time) { this.NormalizeTime = function (lat, lng, time) {
var attr = lng.toString().split(".").join(""); var attr = lng.toString().split(".").join("");
var value = moment(time, "YYYYMMDD_HHmmss"); var value = moment(time, "YYYYMMDD_HHmmss");
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")); return '<div class="time-label-content" style="display: {0};"><a href="javascript:;" class="close-button" title="关闭"></a><div lng="point{1}"><p>经度:{2}</p><p>纬度: {3} </p><p>时间: {4}</p></div></div>'.format(this.showTimeTags ? "block" : "none", attr, lat, lng, value.format("MM/DD HH:mm"));
}; };
this.ShowWindLayer = function (data) { this.ShowWindLayer = function (data) {

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

@ -1202,14 +1202,10 @@
.time-label { .time-label {
height: 56px !important; height: 56px !important;
width: 120px !important; width: 120px !important;
padding-left: 5px;
margin-left: 5px !important; margin-left: 5px !important;
margin-top: -28px !important; margin-top: -28px !important;
color: #777 !important; cursor: -webkit-grab;
background-color: #fff; cursor: grab;
border: solid 1px #aaa;
border-radius: 3px;
cursor: default;
} }
.time-label a.close-button { .time-label a.close-button {
@ -1221,6 +1217,24 @@
background: url(../images/clear-gray.png) no-repeat center/cover; background: url(../images/clear-gray.png) no-repeat center/cover;
} }
.time-label-content {
padding: 2px 5px;
color: #777;
background-color: #fff;
border: solid 1px #aaa;
border-radius: 3px;
cursor: default;
}
.time-label-show {
cursor: default;
}
.time-label-hide {
cursor: -webkit-grab;
cursor: grab;
}
.compare-time-label { .compare-time-label {
border: 1px solid blue; border: 1px solid blue;
background: blue; background: blue;

Loading…
Cancel
Save