commit

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

@@ -201,6 +201,7 @@
     <Content Include="Content\images\toggle-left.png" />
     <Content Include="Content\images\toggle-right.png" />
     <Content Include="Content\images\user-icon.png" />
+    <Content Include="Content\scripts\beijing\info-point.js" />
     <Content Include="Content\scripts\config.js" />
     <Content Include="Content\scripts\menggu\app.js" />
     <Content Include="Content\scripts\menggu\history-panel.js" />

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

@@ -2,6 +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 () {
@@ -11,11 +12,13 @@
         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 () {
@@ -71,6 +74,10 @@
             $('.shadow').removeClass('shadow-toggle');
         }
     }
+
+    this.onMarkClick = function () {
+        this.InfoPoint.ShowDialog();
+    }
 };
 
 $(document).ready(function () {

04.系统编码/App/Content/scripts/beijing/info-point.js

@@ -0,0 +1,25 @@
+var InfoPoint = function (parent) {
+    this.Parent = parent;
+    
+    this.Startup = function () {
+        $('.icon-view .icon-col').on('click', this.OnColClick.bind(this));
+        $('#close-info-dialog').on('click', this.HideDialog.bind(this));
+        $('#dialog-info-point-sure').on('click', this.HideDialog.bind(this));
+        $('#dialog-info-point-cancel').on('click', this.HideDialog.bind(this));
+    }
+
+    this.OnColClick = function (event) {
+        $('.icon-view .icon-col').removeClass("active");
+
+        var label = $(event.target).is('img') ? $(event.target).parent('div') : $(event.target);
+        label.addClass("active");
+    } 
+
+    this.HideDialog = function () {
+        $('#dialog-info-point').hide();
+    }
+
+    this.ShowDialog = function () {
+        $('#dialog-info-point').show();
+    }
+}

04.系统编码/App/Content/scripts/system-management/config-management/index.js

@@ -33,7 +33,7 @@
     this.InitDataGrid = function () {
         $('#task-grid').datagrid({
             columns: [[
-                { field: 'Id', title: '名称', align: 'left', width: 120 },
+                { field: 'Name', title: '名称', align: 'left', width: 120 },
                 { field: 'Value', title: '值', align: 'left', width: 150 },
                 { field: 'Unit', title: '单位', align: 'center', width: 100, formatter: this.formatUnit.bind(this) },
                 { field: 'Description', title: '描述', align: 'left', width: 200, formatter: this.formatDescription.bind(this) },

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

@@ -753,7 +753,7 @@
 .manage-dialog .modal-footer .btn {
     height: 28px;
     padding: 0 16px;
-    line-height: 28px;
+    line-height: 26px;
     border-radius: 3px;
 }
 

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

@@ -567,7 +567,8 @@
 
 .export,
 .draw,
-.clear-btn{
+.clear-btn,
+.info-mark {
     /*width: 50px;*/
     height: 25px;
     line-height: 25px;
@@ -588,7 +589,8 @@
 
 .export:hover,
 .draw:hover,
-.clear-btn:hover{
+.clear-btn:hover,
+.info-mark:hover {
     color: #ffffff;
 }
 
@@ -598,6 +600,12 @@
     bottom: auto;
 }
 
+.info-mark {
+    top: 20px;
+    right: 156px;
+    bottom: auto;
+}
+
 .clear-btn {
     top: 20px;
     bottom: auto;
@@ -924,8 +932,7 @@
 }
 
 .dialog-btn-group {
-    width: 138px;
+    margin: 10px 10px 10px 0;
-    margin: 10px 7px 7px 0;
 }
 
 .dialog-btn {
@@ -933,12 +940,97 @@
     background: url('../images/bnt66.png') no-repeat;
 }
 
+.dialog-btn-group .dialog-btn {
+    width: 60px;
+    height: 28px;
+    line-height: 28px;
+    border-radius: 3px;
+    border: 1px solid #d2d2d2;
+    background: linear-gradient(to bottom, #fefefe, #dcdcdc);
+}
+
+.dialog-btn-group .dialog-btn:hover {
+    color: #3a3a3a
+}
+
+.dialog-btn-group .dialog-btn.dialog-sure-btn {
+    margin-right: 7px;
+    color: #ffffff;
+    border: 0;
+    background: linear-gradient(to bottom, #febd52, #faa71c);
+}
+
 .dialog-clear h2 {
     margin: 10px 0;
     line-height: 30px;
     text-align: center;
 }
 
+.dialog-info-point .dialog-content {
+    width: 370px;
+    margin-top: 0;
+    margin-left: -185px;
+    transform: translateY(-50%);
+}
+
+.dialog-info-point .dialog-title h2 {
+    padding: 0;
+    background: none;
+}
+
+.dialog-info-point .item {
+    margin: 10px;
+}
+
+.dialog-info-point .item label {
+    margin-bottom: 6px;
+    display: block;
+}
+
+.dialog-info-point .item .textbox {
+    width: 100%;
+    border-radius: 3px;
+}
+
+.dialog-info-point .icon-view {
+    padding-top: 10px;
+    margin: 0 10px;
+    border-radius: 3px;
+    border: 1px solid #dddddd;
+}
+
+.dialog-info-point .icon-col img {
+    width: 30px;
+}
+
+.dialog-info-point .icon-view .icon-col {
+    width: calc((100% - 50px) / 4);
+    padding: 12px 0;
+    margin-left: 10px;
+    margin-bottom: 10px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 3px;
+    border: 1px solid #dddddd;
+}
+
+.dialog-info-point .icon-view .icon-col.active {
+    border-color: #faa920;
+}
+
+.dialog-info-point .line {
+    height: 1px;
+    margin-top: 10px;
+    background-color: #dddddd;
+    border: 0;
+}
+
+.textbox .textbox-text {
+    width: 100% !important;
+    padding: 0 10px;
+    cursor: auto;
+}
+
 .load {
     width: 365px;
     height: 60px;

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

@@ -11,11 +11,12 @@
 <div class="main">
     <div class="map" id="map"></div>
     @*<div class="switch particle-switch" id="particle-switch">
-        风场粒子<a href="javascript:;"></a>
+            风场粒子<a href="javascript:;"></a>
-    </div>*@
+        </div>*@
     <div class="switch switch-on label-switch" id="label-switch">
         时间标签<a href="javascript:;"></a>
     </div>
+    <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>
     <a id="capture-button" class="export btn">导出图片...</a>
@@ -39,6 +40,50 @@
 
 <div class="bg"></div>
 
+<div class="dialog dialog-info-point" id="dialog-info-point">
+    <div class="dialog-content">
+        <div class="dialog-title">
+            <h2>添加信息点</h2>
+        </div>
+        <a href="javascript:;" class="close-dialog" id="close-info-dialog"></a>
+        <div class="item">
+            <label>标题:</label>
+            <input type="text" id="title" class="easyui-textbox" prompt="请输入标题" />
+        </div>
+        <div class="icon-view clearfix">
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/1.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/2.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/3.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/4.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/5.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/6.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/7.png" />
+            </div>
+            <div class="icon-col fl">
+                <img src="~/Content/images/markers/8.png" />
+            </div>
+        </div>
+        <div class="line"></div>
+        <div class="dialog-btn-group fr">
+            <button class="btn dialog-btn dialog-sure-btn" id="dialog-info-point-sure">确定</button>
+            <button class="btn dialog-btn" id="dialog-info-point-cancel">取消</button>
+        </div>
+    </div>
+</div>
+
 <div class="dialog dialog-manage">
     <div class="dialog-content">
         <div class="dialog-title">
@@ -68,7 +113,7 @@
             <h2>确定删除释放时间为的任务吗？</h2>
             <div class="line"></div>
             <div class="dialog-btn-group fr">
-                <button class="btn dialog-btn" id="dialog-sure">确定</button>
+                <button class="btn dialog-btn dialog-sure-btn" id="dialog-sure">确定</button>
                 <button class="btn dialog-btn" id="dialog-cancel">取消</button>
             </div>
         </div>
@@ -98,6 +143,7 @@
     <script src="~/Content/scripts/beijing/history-panel.js"></script>
     <script src="~/Content/scripts/beijing/realtime-panel.js"></script>
     <script src="~/Content/scripts/beijing/result-list.js"></script>
+    <script src="~/Content/scripts/beijing/info-point.js"></script>
     <script src="~/Content/scripts/beijing/map.js"></script>
     <script src="~/Content/scripts/beijing/app.js"></script>
 }