commit

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();

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;

04.系统编码/App/Views/Beijing/Index.cshtml

@@ -13,7 +13,7 @@
         @*<div class="switch particle-switch" id="particle-switch">
             风场粒子<a href="javascript:;"></a>
         </div>*@
-    <div class="control-btns">
+        @*<div class="control-btns">
             <a id="select-point-button" class="select-point btn">鼠标选点...</a>
             <a id="mark-button" class="info-mark btn">信息点标绘...</a>
             <a id="draw-button" class="draw btn">画线...</a>
@@ -22,7 +22,7 @@
         <div class="switch switch-on label-switch" id="label-switch">
             时间标签<a href="javascript:;"></a>
         </div>
-    <a id="capture-button" class="export btn">导出图片...</a>
+        <a id="capture-button" class="export btn">导出图片...</a>*@
         <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>
         <span class="latlng"></span>
 
@@ -55,13 +55,14 @@
                 <span title="时间标签" class="icon" name="tag" index="4">
                     <img src="~/Content/images/control-tag.png" />
                 </span>
-            <span class="text">时间标签...</span>
+                <span class="text" id="label-switch">时间标签...</span>
             </div>
             <div class="control-item">
                 <span title="导出图片" class="icon" name="export" index="5">
                     <img src="~/Content/images/control-export.png" />
                 </span>
-            <span class="text">导出图片...</span>
+                <span class="text" id="capture-button">导出图片...</span>
+                <a href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" id="download-img-button" title="安装成功后，手动刷新本页面">安装插件...</a>
             </div>
         </div>
     </div>

04.系统编码/App/Views/Menggu/Index.cshtml

@@ -9,7 +9,7 @@
 
     <div class="main">
         <div class="map" id="map"></div>
-        <div class="switch particle-switch" id="particle-switch" style="display:none;">
+        @*<div class="switch particle-switch" id="particle-switch" style="display:none;">
             风场粒子<a href="javascript:;"></a>
         </div>
         <div class="switch switch-on label-switch" id="label-switch">
@@ -22,7 +22,7 @@
             <a id="clear-button" class="clear-btn btn">清除...</a>
         </div>
         <a id="capture-button" class="export btn">导出图片...</a>
-        <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>
+        <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>*@
         <span class="latlng"></span>
 
         <div class="control-btn-groups">
@@ -61,6 +61,7 @@
                     <img src="~/Content/images/control-export.png" />
                 </span>
                 <span class="text">导出图片...</span>
+                <a href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" id="download-img-button" title="安装成功后，手动刷新本页面">安装插件...</a>
             </div>
         </div>
     </div>