commit

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,
@@ -78,7 +79,7 @@ var Map = function (parent) {
     this.SelectPoint = new SelectPoint(this);
 
     this.Startup = function () {
-        this.CreateMap();
+        //this.CreateMap();
         this.InitCapture();
         this.LoadWindTemplate();
         this.LoadInfoPoint();
@@ -90,7 +91,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));
     };
@@ -164,16 +165,17 @@ var Map = function (parent) {
         }.bind(this));
     };
 
-    this.OnRemoveMarkersButtonClick = function () {
-        var parent = $(event.target).parent();
-        parent.toggleClass('switch-on');
+    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).removeClass('default-text');
+        } else {
+            $('.point').hide();
+            $('.time-label').hide();
+            $(event.target).addClass('default-text');
         }
     };
 
@@ -661,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");
             }
         });
     };

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");
             }
         });
     };

04.系统编码/App/Content/styles/common.css

@@ -869,7 +869,7 @@
     margin-top: 8px;
 }
 
-.control-btn-groups .control-item span.text {
+.control-btn-groups .control-item .text {
     line-height: 30px;
     margin: 2px 0 0 6px;
     padding: 0 10px;
@@ -880,6 +880,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;

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 {

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

@@ -8,63 +8,64 @@
     <link href="~/Content/thirds/leaflet.draw-0.4.14/leaflet.draw.css" rel="stylesheet" />
 }
 
-<div class="main">
-    <div class="map" id="map"></div>
-    @*<div class="switch particle-switch" id="particle-switch">
+    <div class="main">
+        <div class="map" id="map"></div>
+        @*<div class="switch particle-switch" id="particle-switch">
             风场粒子<a href="javascript:;"></a>
         </div>*@
-    <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>
-        <a id="clear-button" class="clear-btn btn">清除...</a>
-    </div>
-    <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="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</a>
-    <span class="latlng"></span>
+        @*<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>
+            <a id="clear-button" class="clear-btn btn">清除...</a>
+        </div>
+        <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="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">
-        <div class="control-item">
-            <span title="鼠标选点" class="icon" name="cursor-select" index="0">
-                <img src="~/Content/images/control-select.png" />
-            </span>
-            <span class="text" id="select-point-button">鼠标选点...</span>
-        </div>
-        <div class="control-item">
-            <span title="信息点标绘" class="icon" name="point-mark" index="1">
-                <img src="~/Content/images/control-mark.png" />
-            </span>
-            <span class="text">信息点标绘...</span>
-        </div>
-        <div class="control-item">
-            <span title="画线" class="icon" name="draw-line" index="2">
-                <img src="~/Content/images/control-draw-line.png" />
-            </span>
-            <span class="text">画线...</span>
-        </div>
-        <div class="control-item control-clear-item">
-            <span title="清除" class="icon" name="clear" index="3">
-                <img src="~/Content/images/control-clear.png" />
-            </span>
-            <span class="text">清除...</span>
-        </div>
-        <div class="control-item control-tag-item">
-            <span title="时间标签" class="icon" name="tag" index="4">
-                <img src="~/Content/images/control-tag.png" />
-            </span>
-            <span class="text">时间标签...</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>
+        <div class="control-btn-groups">
+            <div class="control-item">
+                <span title="鼠标选点" class="icon" name="cursor-select" index="0">
+                    <img src="~/Content/images/control-select.png" />
+                </span>
+                <span class="text" id="select-point-button">鼠标选点...</span>
+            </div>
+            <div class="control-item">
+                <span title="信息点标绘" class="icon" name="point-mark" index="1">
+                    <img src="~/Content/images/control-mark.png" />
+                </span>
+                <span class="text" id="mark-button">信息点标绘...</span>
+            </div>
+            <div class="control-item">
+                <span title="画线" class="icon" name="draw-line" index="2">
+                    <img src="~/Content/images/control-draw-line.png" />
+                </span>
+                <span class="text" id="draw-button">画线...</span>
+            </div>
+            <div class="control-item control-clear-item">
+                <span title="清除" class="icon" name="clear" index="3">
+                    <img src="~/Content/images/control-clear.png" />
+                </span>
+                <span class="text" id="clear-button">清除...</span>
+            </div>
+            <div class="control-item control-tag-item">
+                <span title="时间标签" class="icon" name="tag" index="4">
+                    <img src="~/Content/images/control-tag.png" />
+                </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" id="capture-button">导出图片...</span>
+                <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" title="安装成功后，手动刷新本页面">安装插件...</a>
+            </div>
         </div>
     </div>
-</div>
 
 <div class="right">
     <div class="right-title clearfix">

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">
@@ -30,37 +30,38 @@
                 <span title="鼠标选点" class="icon" name="cursor-select" index="0">
                     <img src="~/Content/images/control-select.png" />
                 </span>
-                <span class="text">鼠标选点...</span>
+                <span class="text" id="select-point-button">鼠标选点...</span>
             </div>
             <div class="control-item">
                 <span title="信息点标绘" class="icon" name="point-mark" index="1">
                     <img src="~/Content/images/control-mark.png" />
                 </span>
-                <span class="text">信息点标绘...</span>
+                <span class="text" id="mark-button">信息点标绘...</span>
             </div>
             <div class="control-item">
                 <span title="画线" class="icon" name="draw-line" index="2">
                     <img src="~/Content/images/control-draw-line.png" />
                 </span>
-                <span class="text">画线...</span>
+                <span class="text" id="draw-button">画线...</span>
             </div>
             <div class="control-item control-clear-item">
                 <span title="清除" class="icon" name="clear" index="3">
                     <img src="~/Content/images/control-clear.png" />
                 </span>
-                <span class="text">清除...</span>
+                <span class="text" id="clear-button">清除...</span>
             </div>
             <div class="control-item control-tag-item">
                 <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 id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" title="安装成功后，手动刷新本页面">安装插件...</a>
             </div>
         </div>
     </div>