commit

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

@@ -129,6 +129,7 @@
     <Compile Include="Controllers\BaseController.cs" />
     <Compile Include="Controllers\ConfigManagementController.cs" />
     <Compile Include="Controllers\OrgManagementController.cs" />
+    <Compile Include="Controllers\PointController.cs" />
     <Compile Include="Controllers\RegisterController.cs" />
     <Compile Include="Controllers\StatisticAnalysisController.cs" />
     <Compile Include="Controllers\TiananmenController.cs" />

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

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort>44332</IISExpressSSLPort>

04.系统编码/App/Content/scripts/beijing/app.js

@@ -2,7 +2,7 @@
     this.Map = new Map(this);
     this.RealtimePanel = new RealtimePanel(this);
     this.HistoryPanel = new HistoryPanel(this);
-    this.InfoPoint = new InfoPoint(this);
+    
     this.IsShrink = false;
 
     this.Startup = function () {
@@ -12,13 +12,11 @@
         this.Map.Startup();
         this.RealtimePanel.Startup();
         this.HistoryPanel.Startup();
-        this.InfoPoint.Startup();
-
+        
         window.onresize = this.Relayout.bind(this);
         $('#real-time').on('click', this.OnRealtimeTabClick.bind(this));
         $('#history-time').on('click', this.OnHistoryTabClick.bind(this));
         $('#shrink').on('click', this.OnShrinkClick.bind(this));
-        $('#mark-button').on('click', this.onMarkClick.bind(this));
     };
 
     this.Relayout = function () {
@@ -74,10 +72,6 @@
             $('.shadow').removeClass('shadow-toggle');
         }
     }
-
-    this.onMarkClick = function () {
-        this.InfoPoint.ShowDialog();
-    }
 };
 
 $(document).ready(function () {

04.系统编码/App/Content/scripts/beijing/map.js

@@ -54,6 +54,7 @@ var Map = function (parent) {
     this.MultiLayers = false;
     this.CompareLayers = false;
     this.layers = false;
+    this.isMark = false;
 
     this.ForecastPoints = null;
     this.ForecastBackwardPoints = null;
@@ -64,10 +65,15 @@ var Map = function (parent) {
     this.forwardStopPoint = null;
     this.centerPointTime = null;
 
+    this.InfoPoint = new InfoPoint(this);
+
     this.Startup = function () {
         this.CreateMap();
         this.InitCapture();
         this.LoadWindTemplate();
+        this.InfoPoint.Startup();
+
+        $('#mark-button').on('click', this.onMarkClick.bind(this));
         $('#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));
@@ -616,4 +622,16 @@ var Map = function (parent) {
         if (value <= 1000)
             return 'rgb(192, 28, 36)';
     };
+
+    this.onMarkClick = function () {
+        $('#map').css('cursor', 'crosshair');
+        this.DrewInfoPoint();
+    };
+
+    this.DrewInfoPoint = function () {
+        this.map.on('click', function (e) {
+            console.log(e);
+            //this.InfoPoint.ShowDialog();
+        })
+    };
 };