diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/.suo b/04.系统编码/.vs/BeijingSafeguard/v15/.suo index 471a29e..8d1e6d8 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/.suo and b/04.系统编码/.vs/BeijingSafeguard/v15/.suo differ diff --git a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal index 08bd7c8..44095df 100644 Binary files a/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal and b/04.系统编码/.vs/BeijingSafeguard/v15/Server/sqlite3/storage.ide-wal differ diff --git a/04.系统编码/App/Content/scripts/beijing/map.js b/04.系统编码/App/Content/scripts/beijing/map.js index b874666..7d6b7cf 100644 --- a/04.系统编码/App/Content/scripts/beijing/map.js +++ b/04.系统编码/App/Content/scripts/beijing/map.js @@ -90,7 +90,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)); }; @@ -167,6 +167,7 @@ var Map = function (parent) { this.OnRemoveMarkersButtonClick = function () { var parent = $(event.target).parent(); parent.toggleClass('switch-on'); + console.log(this.currentButton.tagSelected) if (!parent.hasClass('switch-on')) { $('.point').hide(); @@ -656,6 +657,7 @@ var Map = function (parent) { }; this.InitCapture = function () { + console.log(this.currentButton.exportSelected) Init(); $('#capture-button').on('click', function () { var returned = Capture(); diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 882f15a..88ecdcc 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -845,7 +845,7 @@ } .control-btn-groups .control-item { - margin-bottom: 10px; + margin-bottom: 6px; display: flex; align-items: center; } @@ -869,10 +869,10 @@ margin-top: 8px; } -.control-btn-groups .control-item span.text { +.control-btn-groups .control-item .text { line-height: 34px; margin-left: 10px; - padding: 0 10px; + padding: 0 6px; border-radius: 5px; color: #ffffff; opacity: 0; diff --git a/04.系统编码/App/Views/Beijing/Index.cshtml b/04.系统编码/App/Views/Beijing/Index.cshtml index bc40e6d..a9bd9ea 100644 --- a/04.系统编码/App/Views/Beijing/Index.cshtml +++ b/04.系统编码/App/Views/Beijing/Index.cshtml @@ -8,63 +8,64 @@ } -
-
- @*
+
+
+ @*
风场粒子
*@ - -
- 时间标签 -
- 导出图片... - - + @* +
+ 时间标签 +
+ 导出图片...*@ + + -
-
- - - - 鼠标选点... -
-
- - - - 信息点标绘... -
-
- - - - 画线... -
-
- - - - 清除... -
-
- - - - 时间标签... -
-
- - - - 导出图片... +
+
+ + + + 鼠标选点... +
+
+ + + + 信息点标绘... +
+
+ + + + 画线... +
+
+ + + + 清除... +
+
+ + + + 时间标签... +
+
+ + + + 导出图片... + 安装插件... +
-
diff --git a/04.系统编码/App/Views/Menggu/Index.cshtml b/04.系统编码/App/Views/Menggu/Index.cshtml index 9e4491a..eb9a9ed 100644 --- a/04.系统编码/App/Views/Menggu/Index.cshtml +++ b/04.系统编码/App/Views/Menggu/Index.cshtml @@ -9,7 +9,7 @@
-