1

04.系统编码/App/App.csproj

@@ -35,6 +35,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +45,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
@@ -60,9 +62,9 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
-    <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Abstractions" />

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,17 +165,16 @@ var Map = function (parent) {
         }.bind(this));
     };
 
-    this.OnRemoveMarkersButtonClick = function () {
+    this.OnRemoveMarkersButtonClick = function (event) {
-        var parent = $(event.target).parent();
+        this.showTimeTags = !this.showTimeTags;
-        parent.toggleClass('switch-on');
-        console.log(this.currentButton.tagSelected)
 
-        if (!parent.hasClass('switch-on')) {
+        if (this.showTimeTags) {
-            $('.point').hide();
-            $('.time-label').hide();
-        } else {
             $('.point').show();
             $('.time-label').show();
+            $(event.target).addClass('default-text');
+        } else {
+            $('.point').hide();
+            $('.time-label').hide();
         } 
     };
 
@@ -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");
             }
         });
     };

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();
+        this.showTimeTags = !this.showTimeTags;
-        parent.toggleClass('switch-on');
 
-        if (!parent.hasClass('switch-on')) {
+        if (this.showTimeTags) {
-            $('.point').hide();
-            $('.time-label').hide();
-        } else {
             $('.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,9 +869,8 @@
     margin-top: 8px;
 }
 
-.control-btn-groups .control-item .text {
+    line-height: 30px;
-    line-height: 34px;
+    margin: 2px 0 0 16px;
-    margin-left: 10px;
     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;

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

@@ -1,29 +1,28 @@
 @{
-    ViewBag.Title = "北京空飘物";
+    ViewBag.Title = "蒙古空飘物";
 }
 
 @section styles {
     <link href="~/Content/thirds/leaflet-velocity/leaflet-velocity.min.css" rel="stylesheet" />
-    <link href="~/Content/thirds/bootstrap-fileinput/css/fileinput.min.css" rel="stylesheet" />
     <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="switch particle-switch" id="particle-switch" style="display:none;">
             风场粒子<a href="javascript:;"></a>
-        </div>*@
+        </div>
-        @*<div class="control-btns">
+        <div class="switch switch-on label-switch" id="label-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 id="capture-button" class="export btn">导出图片...</a>
-            时间标签<a href="javascript:;"></a>
+        <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="export btn" style="display:none;" title="安装成功后，手动刷新本页面">安装插件...</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">
@@ -31,25 +30,25 @@
                 <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">
@@ -62,7 +61,7 @@
                     <img src="~/Content/images/control-export.png" />
                 </span>
                 <span class="text" id="capture-button">导出图片...</span>
-                <a href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" id="download-img-button" title="安装成功后，手动刷新本页面">安装插件...</a>
+                <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" title="安装成功后，手动刷新本页面">安装插件...</a>
             </div>
         </div>
     </div>
@@ -206,14 +205,12 @@
     <script src="~/Content/thirds/niuniu-capture/niuniucapture.js"></script>
     <script src="~/Content/thirds/niuniu-capture/capturewrapper.js"></script>
     <script src="~/Content/thirds/niuniu-capture/jquery.json-2.3.min.js"></script>
-    <script src="~/Content/thirds/bootstrap-fileinput/js/fileinput.min.js"></script>
-    <script src="~/Content/thirds/bootstrap-fileinput/js/locales/zh.js"></script>
 
-    <script src="~/Content/scripts/beijing/history-panel.js"></script>
+    <script src="~/Content/scripts/menggu/history-panel.js"></script>
-    <script src="~/Content/scripts/beijing/realtime-panel.js"></script>
+    <script src="~/Content/scripts/menggu/realtime-panel.js"></script>
-    <script src="~/Content/scripts/beijing/result-list.js"></script>
+    <script src="~/Content/scripts/menggu/result-list.js"></script>
-    <script src="~/Content/scripts/beijing/info-point.js"></script>
+    <script src="~/Content/scripts/menggu/select-point.js"></script>
-    <script src="~/Content/scripts/beijing/select-point.js"></script>
+    <script src="~/Content/scripts/menggu/info-point.js"></script>
-    <script src="~/Content/scripts/beijing/map.js"></script>
+    <script src="~/Content/scripts/menggu/map.js"></script>
-    <script src="~/Content/scripts/beijing/app.js"></script>
+    <script src="~/Content/scripts/menggu/app.js"></script>
 }

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

@@ -30,38 +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 href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" id="download-img-button" title="安装成功后，手动刷新本页面">安装插件...</a>
+                <a id="download-button" href="~/Content/thirds/niuniu-capture/CaptureInstall.exe" class="text" title="安装成功后，手动刷新本页面">安装插件...</a>
             </div>
         </div>
     </div>

04.系统编码/App/Web.config

@@ -1,70 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0"?>
 <!--
   For more information on how to configure your ASP.NET application, please visit
   https://go.microsoft.com/fwlink/?LinkId=301880
   -->
 <configuration>
   <connectionStrings>
-    <add name="db" connectionString="Database=beijing_safeguard;Data Source=112.124.40.88;User Id=root;Password=3cqscbr@only1;CharSet=utf8;port=33306" providerName="System.Data.SqlClient" />
+    <add name="db" connectionString="Database=beijing_safeguard;Data Source=112.124.40.88;User Id=root;Password=3cqscbr@only1;CharSet=utf8;port=33306" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <appSettings>
-    <add key="webpages:Version" value="3.0.0.0" />
+    <add key="webpages:Version" value="3.0.0.0"/>
-    <add key="webpages:Enabled" value="false" />
+    <add key="webpages:Enabled" value="false"/>
-    <add key="ClientValidationEnabled" value="true" />
+    <add key="ClientValidationEnabled" value="true"/>
-    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
-    <add key="CachePath" value="\Content\ResultJsons" />
+    <add key="CachePath" value="\Content\ResultJsons"/>
   </appSettings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
 
     可在 <httpRuntime> 标记上设置以下特性。
       <system.Web>
-        <httpRuntime targetFramework="4.6.1" />
+        <httpRuntime targetFramework="4.5" />
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.5" />
+    <compilation debug="true" targetFramework="4.5"/>
-    <httpRuntime targetFramework="4.5" />
+    <httpRuntime/>
+    <pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID"/>
   </system.web>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <system.codedom>
+  <system.data>
-    <compilers>
-    </compilers>
-  </system.codedom>
-<system.data>
     <DbProviderFactories>
-      <remove invariant="MySql.Data.MySqlClient" />
+      <remove invariant="MySql.Data.MySqlClient"/>
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
     </DbProviderFactories>
-  </system.data></configuration>
+  </system.data>
+</configuration>