diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo deleted file mode 100644 index 8d1e6d8..0000000 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/.suo and /dev/null differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/db.lock b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/db.lock deleted file mode 100644 index e69de29..0000000 diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide deleted file mode 100644 index ce7d2eb..0000000 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide and /dev/null differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm deleted file mode 100644 index 3653c58..0000000 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-shm and /dev/null differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal deleted file mode 100644 index 44095df..0000000 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal and /dev/null differ diff --git a/04.系统编码/App/App.csproj b/04.系统编码/App/App.csproj index dd13eea..8bb883e 100644 --- a/04.系统编码/App/App.csproj +++ b/04.系统编码/App/App.csproj @@ -35,6 +35,7 @@ DEBUG;TRACE prompt 4 + false true @@ -44,6 +45,7 @@ TRACE prompt 4 + false @@ -60,9 +62,9 @@ + - diff --git a/04.系统编码/App/Content/images/map.png b/04.系统编码/App/Content/images/map.png index fadc4e4..bf6da7f 100644 Binary files a/04.系统编码/App/Content/images/map.png and b/04.系统编码/App/Content/images/map.png differ diff --git a/04.系统编码/App/Content/scripts/beijing/map.js b/04.系统编码/App/Content/scripts/beijing/map.js index 7d6b7cf..9668caf 100644 --- a/04.系统编码/App/Content/scripts/beijing/map.js +++ b/04.系统编码/App/Content/scripts/beijing/map.js @@ -56,6 +56,7 @@ var Map = function (parent) { this.layers = false; this.isMark = false; this.isSelected = false; + this.showTimeTags = true; this.currentButton = { cursorSelected: false, markSelected: false, @@ -164,18 +165,17 @@ var Map = function (parent) { }.bind(this)); }; - this.OnRemoveMarkersButtonClick = function () { - var parent = $(event.target).parent(); - parent.toggleClass('switch-on'); - console.log(this.currentButton.tagSelected) + this.OnRemoveMarkersButtonClick = function (event) { + this.showTimeTags = !this.showTimeTags; - if (!parent.hasClass('switch-on')) { - $('.point').hide(); - $('.time-label').hide(); - } else { + if (this.showTimeTags) { $('.point').show(); $('.time-label').show(); - } + $(event.target).addClass('default-text'); + } else { + $('.point').hide(); + $('.time-label').hide(); + } }; this.OnItemClick = function (event) { @@ -663,7 +663,7 @@ var Map = function (parent) { var returned = Capture(); if (returned === emCaptureFailed || returned === emCaptureUnknown) { $('#capture-button').hide(); - $('#download-button').show(); + $('#download-button').css("opacity", "1"); } }); }; diff --git a/04.系统编码/App/Content/scripts/menggu/map.js b/04.系统编码/App/Content/scripts/menggu/map.js index 14ca1da..3ba7736 100644 --- a/04.系统编码/App/Content/scripts/menggu/map.js +++ b/04.系统编码/App/Content/scripts/menggu/map.js @@ -24,6 +24,7 @@ var Map = function (parent) { this.MultiLayers = false; this.isMark = false; this.isSelected = false; + this.showTimeTags = true; this.currentButton = { cursorSelected: false, markSelected: false, @@ -49,7 +50,7 @@ var Map = function (parent) { $('#draw-button').on('click', this.OnDrawButtonClick.bind(this)); $('#clear-button').on('click', this.OnClearButtonClick.bind(this)); $('#particle-switch a').on('click', this.OnParticleButtonClick.bind(this)); - $('#label-switch a').on('click', this.OnRemoveMarkersButtonClick.bind(this)); + $('#label-switch').on('click', this.OnRemoveMarkersButtonClick.bind(this)); $('.control-btn-groups .control-item').find('.icon').on('click', this.OnItemClick.bind(this)); }; @@ -119,15 +120,16 @@ var Map = function (parent) { }; this.OnRemoveMarkersButtonClick = function () { - var parent = $(event.target).parent(); - parent.toggleClass('switch-on'); + this.showTimeTags = !this.showTimeTags; - if (!parent.hasClass('switch-on')) { - $('.point').hide(); - $('.time-label').hide(); - } else { + if (this.showTimeTags) { $('.point').show(); $('.time-label').show(); + $(event.target).removeClass('default-text'); + } else { + $('.point').hide(); + $('.time-label').hide(); + $(event.target).addClass('default-text'); } }; @@ -375,9 +377,9 @@ var Map = function (parent) { Init(); $('#capture-button').on('click', function () { var returned = Capture(); - if (returned === emCaptureFailed || returned == emCaptureUnknown) { + if (returned === emCaptureFailed || returned === emCaptureUnknown) { $('#capture-button').hide(); - $('#download-button').show(); + $('#download-button').css("opacity", "1"); } }); }; diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 88ecdcc..2a7ccac 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -869,9 +869,8 @@ margin-top: 8px; } -.control-btn-groups .control-item .text { - line-height: 34px; - margin-left: 10px; + line-height: 30px; + margin: 2px 0 0 16px; padding: 0 6px; border-radius: 5px; color: #ffffff; @@ -880,6 +879,10 @@ background: linear-gradient(#febc50, #faa71c); } +.control-btn-groups .control-item .default-text { + background: rgba(0, 0, 0, 0.5); +} + .control-btn-groups .control-clear-item span.icon img { width: 32px; margin-top: 1px; diff --git a/04.系统编码/App/Content/styles/index.css b/04.系统编码/App/Content/styles/index.css index 71d1414..873b27e 100644 --- a/04.系统编码/App/Content/styles/index.css +++ b/04.系统编码/App/Content/styles/index.css @@ -98,7 +98,7 @@ -webkit-box-shadow: 0 2px 5px rgba(0,0,0,0.23); box-shadow: 0 2px 5px rgba(0,0,0,0.23); transition: all 0.5s; - background: #f9f9f9; + background: #ffffff; } .right-title { diff --git a/04.系统编码/App/Views/Beijing/Index.cshtml b/04.系统编码/App/Views/Beijing/Index.cshtml index a9bd9ea..b501e99 100644 --- a/04.系统编码/App/Views/Beijing/Index.cshtml +++ b/04.系统编码/App/Views/Beijing/Index.cshtml @@ -1,29 +1,28 @@ @{ - ViewBag.Title = "北京空飘物"; + ViewBag.Title = "蒙古空飘物"; } @section styles { - }
- @*
+ @**@ - @*
+
+
+ 时间标签 +
+ -
- 时间标签 -
- 导出图片...*@ - + 导出图片... + *@
@@ -31,25 +30,25 @@ - 鼠标选点... + 鼠标选点...
- 信息点标绘... + 信息点标绘...
- 画线... + 画线...
- 清除... + 清除...
@@ -62,7 +61,7 @@ 导出图片... - 安装插件... + 安装插件...
@@ -76,7 +75,7 @@ @{ Html.RenderPartial("Controls/RealtimeTabPage"); Html.RenderPartial("Controls/HistoryTabPage"); - } + } @@ -206,14 +205,12 @@ - - - - - - - - - + + + + + + + } \ No newline at end of file diff --git a/04.系统编码/App/Views/Menggu/Index.cshtml b/04.系统编码/App/Views/Menggu/Index.cshtml index eb9a9ed..b501e99 100644 --- a/04.系统编码/App/Views/Menggu/Index.cshtml +++ b/04.系统编码/App/Views/Menggu/Index.cshtml @@ -30,38 +30,38 @@ - 鼠标选点... + 鼠标选点...
- 信息点标绘... + 信息点标绘...
- 画线... + 画线...
- 清除... + 清除...
- 时间标签... + 时间标签...
- 导出图片... - 安装插件... + 导出图片... + 安装插件...
diff --git a/04.系统编码/App/Web.config b/04.系统编码/App/Web.config index 9d62173..8cdbfa8 100644 --- a/04.系统编码/App/Web.config +++ b/04.系统编码/App/Web.config @@ -1,70 +1,68 @@ - + - + - - - - - + + + + + - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + - - + + - \ No newline at end of file + + \ No newline at end of file