diff --git a/04.系统编码/App/Content/scripts/beijing/lat-lng-switch.js b/04.系统编码/App/Content/scripts/beijing/lat-lng-switch.js index f51ec19..fff5b6d 100644 --- a/04.系统编码/App/Content/scripts/beijing/lat-lng-switch.js +++ b/04.系统编码/App/Content/scripts/beijing/lat-lng-switch.js @@ -129,7 +129,7 @@ var degree = text[0]; var temp = "0." + text[1]; - var temp = String(temp * 60); + temp = String(temp * 60); var str = temp.split("."); var minute = str[0]; diff --git a/04.系统编码/App/Content/scripts/beijing/map.js b/04.系统编码/App/Content/scripts/beijing/map.js index 8c9e9a1..ea2badf 100644 --- a/04.系统编码/App/Content/scripts/beijing/map.js +++ b/04.系统编码/App/Content/scripts/beijing/map.js @@ -195,11 +195,11 @@ var Map = function (parent) { if (this.showTimeTags) { //$('.point').show(); - $('.time-label').show(); + $('.time-label-content').show(); $(event.target).removeClass('default-text'); } else { //$('.point').hide(); - $('.time-label').hide(); + $('.time-label-content').hide(); $(event.target).addClass('default-text'); } }; @@ -451,6 +451,7 @@ var Map = function (parent) { this.AddLabels(features, result.backward.points, 'actual'); this.AddLabels(features, result.forward.points, 'actual'); + return features; }; @@ -712,12 +713,12 @@ var Map = function (parent) { this.GetCenterLabel = function (param) { var pattern = '

经度:{0}

纬度:{1}

高度:{2}米

释放时间:{3}

'; 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) { var attr = lng.toString().split(".").join(""); var value = moment(time, "YYYYMMDD_HHmmss"); - return '

经度:{1}

纬度: {2}

时间: {3}

'.format(attr, lat, lng, value.format("MM/DD HH:mm")); + return '

经度:{2}

纬度: {3}

时间: {4}

'.format(this.showTimeTags ? "block" : "none", attr, lat, lng, value.format("MM/DD HH:mm")); }; this.ShowWindLayer = function (data) { diff --git a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js index d7d09de..506e4fe 100644 --- a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js +++ b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js @@ -323,7 +323,7 @@ var degree = text[0]; var temp = "0." + text[1]; - var temp = String(temp * 60); + temp = String(temp * 60); var str = temp.split("."); var minute = str[0]; @@ -334,7 +334,7 @@ degree: degree, minute: minute, second: second - } + }; }; this.GetTaskParams = function (taskId) { diff --git a/04.系统编码/App/Content/scripts/menggu/map.js b/04.系统编码/App/Content/scripts/menggu/map.js index 7ef6343..4a4f106 100644 --- a/04.系统编码/App/Content/scripts/menggu/map.js +++ b/04.系统编码/App/Content/scripts/menggu/map.js @@ -148,11 +148,11 @@ var Map = function (parent) { if (this.showTimeTags) { //$('.point').show(); - $('.time-label').show(); + $('.time-label-content').show(); $(event.target).removeClass('default-text'); } else { //$('.point').hide(); - $('.time-label').hide(); + $('.time-label-content').hide(); $(event.target).addClass('default-text'); } }; @@ -429,7 +429,7 @@ var Map = function (parent) { this.NormalizeTime = function (lat, lng, time) { var attr = lng.toString().split(".").join(""); var value = moment(time, "YYYYMMDD_HHmmss"); - return '

经度:{1}

纬度: {2}

时间: {3}

'.format(attr, lat, lng, value.format("MM/DD HH:mm")); + return '

经度:{2}

纬度: {3}

时间: {4}

'.format(this.showTimeTags ? "block" : "none", attr, lat, lng, value.format("MM/DD HH:mm")); }; this.ShowWindLayer = function (data) { diff --git a/04.系统编码/App/Content/styles/index.css b/04.系统编码/App/Content/styles/index.css index d6622e0..a63c7a6 100644 --- a/04.系统编码/App/Content/styles/index.css +++ b/04.系统编码/App/Content/styles/index.css @@ -1202,14 +1202,10 @@ .time-label { height: 56px !important; width: 120px !important; - padding-left: 5px; margin-left: 5px !important; margin-top: -28px !important; - color: #777 !important; - background-color: #fff; - border: solid 1px #aaa; - border-radius: 3px; - cursor: default; + cursor: -webkit-grab; + cursor: grab; } .time-label a.close-button { @@ -1221,6 +1217,24 @@ 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 { border: 1px solid blue; background: blue;