commit

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

@@ -59,13 +59,13 @@ var Map = function (parent) {
     this.isSelected = false;
     this.showTimeTags = true;
     this.currentButton = {
-        cursorSelected: false,
-        markSelected: false,
-        drawLineSelected: false,
-        clearSelected: false,
-        tagSelected: false,
-        switchSelected: false,
-        exportSelected: false
+        cursorSelected: true,
+        markSelected: true,
+        drawLineSelected: true,
+        clearSelected: true,
+        tagSelected: true,
+        switchSelected: true,
+        exportSelected: true
     };
 
     this.ForecastPoints = null;
@@ -176,10 +176,11 @@ var Map = function (parent) {
         if (this.showTimeTags) {
             $('.point').show();
             $('.time-label').show();
-            $(event.target).addClass('default-text');
+            $(event.target).removeClass('default-text');
         } else {
             $('.point').hide();
             $('.time-label').hide();
+            $(event.target).addClass('default-text');
         } 
     };
 

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

@@ -27,12 +27,12 @@ var Map = function (parent) {
     this.isSelected = false;
     this.showTimeTags = true;
     this.currentButton = {
-        cursorSelected: false,
-        markSelected: false,
-        drawLineSelected: false,
-        clearSelected: false,
-        tagSelected: false,
-        exportSelected: false
+        cursorSelected: true,
+        markSelected: true,
+        drawLineSelected: true,
+        clearSelected: true,
+        tagSelected: true,
+        exportSelected: true
     };
 
     this.InfoPoint = new InfoPoint(this);
@@ -123,7 +123,7 @@ var Map = function (parent) {
         }.bind(this));
     };
 
-    this.OnRemoveMarkersButtonClick = function () {
+    this.OnRemoveMarkersButtonClick = function (event) {
         this.showTimeTags = !this.showTimeTags;
 
         if (this.showTimeTags) {

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

@@ -60,7 +60,6 @@
     position: relative;
     z-index: 10;
     overflow: hidden;
-    border-radius: 6px;
 }
 
 .nav ul li a {
@@ -377,7 +376,7 @@
     padding-right: 7px;
     margin-right: 3px;
     border: 1px solid #3871af;
-    border-radius: 5px;
+    border-radius: 3px;
     background: linear-gradient(#266cb9, #002c5d);
 }
 
@@ -386,10 +385,6 @@
     opacity: 0.5;
 }
 
-.toolbar .btn-groups .btn:first-of-type {
-    border-left: 0;
-}
-
 .toolbar .btn-groups .btn:first-of-type:before {
     display: none;
 }
@@ -442,13 +437,15 @@
     line-height: 28px;
     text-align: center;
     border: 1px solid #3871af;
-    border-radius: 5px 0 0 5px;
+    border-left: 0;
+    border-radius: 3px 0 0 3px;
     background: #03244c;
     color: #ffffff;
 }
 
 .statistic-toolbar .statistic-type span:first-of-type {
-    border-radius: 5px 0 0 5px;
+    border-radius: 3px 0 0 3px;
+    border-left: 1px solid #3871af;
 }
 
 .statistic-toolbar .statistic-type span:last-of-type {
@@ -487,7 +484,7 @@
     line-height: 28px;
     color: #ffffff;
     border: 1px solid #3871af;
-    border-radius: 5px;
+    border-radius: 3px;
     background: linear-gradient(#266cb9, #002c5d);
 }
 
@@ -557,6 +554,7 @@
 
 .manage-dialog .modal-content {
     background: #002145;
+    border: 1px solid #234979;
 }
 
 .manage-dialog .modal-header {
@@ -564,7 +562,7 @@
 }
 
 .manage-dialog .modal-header h4 {
-    padding-left: 14px;
+    padding-left: 10px;
     line-height: 36px;
     color: #ffffff;
     background: linear-gradient(#1463a5, #06386f);
@@ -613,28 +611,22 @@
     line-height: 28px;
     text-align: center;
     border-style: solid;
-    border-color: #d2d2d2;
-    border-width: 1px 0 1px 0;
-    background: linear-gradient(to bottom, #fefefe, #dcdcdc);
+    border-color: #3871af;
+    border-width: 1px 0 1px 1px;
+    color: #ffffff;
+    background: #03244c;
 }
 
 .manage-dialog .modal-body .row .col .sex-select span:first-of-type {
-    border-left: 1px solid #d2d2d2;
+    border-left: 1px solid #3871af;
 }
 
 .manage-dialog .modal-body .row .col .sex-select span:last-of-type {
-    border-right: 1px solid #d2d2d2;
+    border-right: 1px solid #3871af;
 }
 
 .manage-dialog .modal-body .row .col .sex-select span.active {
-    background: #fdb846;
-    border-color: #fdb846;
-    color: #ffffff;
-}
-
-.manage-dialog .modal-body .row .col .sex-select span:first-of-type.active,
-.manage-dialog .modal-body .row .col .sex-select span:last-of-type.active {
-    border-color: #fdb846;
+    background: linear-gradient(#266cb9, #002c5d);
 }
 
 .manage-dialog .modal-body .row .col .passwordbox-open {
@@ -748,8 +740,12 @@
 }
 
 .manage-dialog .modal-footer .sure-btn {
-    margin-right: 8px;
-    color: #ffffff;
+    margin-right: 7px;
+}
+
+.manage-dialog .modal-footer .cancel-btn {
+    border: 1px solid #163658;
+    background: #163658;
 }
 
 .calendar-prevmonth {
@@ -833,7 +829,7 @@
     line-height: 30px;
     margin: 2px 0 0 6px;
     padding: 0 10px;
-    border-radius: 5px;
+    border-radius: 3px;
     color: #ffffff;
     opacity: 0;
     transition: all 0.5s;

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

@@ -25,8 +25,6 @@
     display: inline-block;
     margin: 3px auto 0 6px;
     position: relative;
-    -webkit-border-radius: 80px;
-    -moz-border-radius: 80px;
     border-radius: 80px;
     -webkit-transition: all 0.5s;
     -moz-transition: all 0.5s;
@@ -53,8 +51,6 @@
     -moz-transition: all 0.5s;
     -o-transition: all 0.5s;
     transition: all 0.5s;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
     border-radius: 50%;
 }
 
@@ -204,8 +200,6 @@
 }
 
 .param-content .type-select {
-    margin-left: 112px;
-    margin-bottom: 10px;
     display: flex;
 }
 
@@ -231,8 +225,6 @@
 
 .param-type {
     display: inline-block;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     border-radius: 3px;
     border-left: 1px solid #d5d5d5;
     border-right: 1px solid #d5d5d5;
@@ -304,8 +296,6 @@
     position: absolute;
     top: 1px;
     left: 0;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
     border-radius: 5px;
     overflow: hidden;
     background: #dddddd;
@@ -412,8 +402,6 @@
     float: left;
     position: relative;
     border: 1px solid #dddddd;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     border-radius: 3px;
     background: #ffffff;
     text-overflow: ellipsis;
@@ -464,7 +452,7 @@
 
 .import-control {
     position: relative;
-    border-radius: 5px;
+    border-radius: 3px;
     cursor: pointer;
 }
 
@@ -507,8 +495,6 @@
 
 .clac-title a:last-child {
     border-left: 0;
-    -webkit-border-radius: 0 3px 3px 0;
-    -moz-border-radius: 0 3px 3px 0;
     border-radius: 0 3px 3px 0;
 }
 
@@ -558,7 +544,7 @@
     color: #ffffff;
     font-size: 14px;
     border: 1px solid #3871af;
-    border-radius: 5px;
+    border-radius: 3px;
     background: linear-gradient(#266cb9, #002c5d);
 }
 
@@ -571,18 +557,16 @@
     color: #ffffff;
 }
 
-    .control-btns .btn {
-        padding: 0 10px;
-        margin-left: 10px;
-        color: #ffffff;
-        -webkit-border-radius: 3px;
-        -moz-border-radius: 3px;
-        border-radius: 3px;
-        background: -webkit-linear-gradient(#febc50, #faa71c);
-        background: -o-linear-gradient(#febc50, #faa71c);
-        background: -moz-linear-gradient(#febc50, #faa71c);
-        background: linear-gradient(#febc50, #faa71c);
-    }
+.control-btns .btn {
+    padding: 0 10px;
+    margin-left: 10px;
+    color: #ffffff;
+    border-radius: 3px;
+    background: -webkit-linear-gradient(#febc50, #faa71c);
+    background: -o-linear-gradient(#febc50, #faa71c);
+    background: -moz-linear-gradient(#febc50, #faa71c);
+    background: linear-gradient(#febc50, #faa71c);
+}
 
 .export {
     /*width: 50px;*/
@@ -594,8 +578,6 @@
     bottom: 17px;
     z-index: 2000;
     color: #ffffff;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     border-radius: 3px;
     background: -webkit-linear-gradient(#febc50, #faa71c);
     background: -o-linear-gradient(#febc50, #faa71c);
@@ -637,7 +619,7 @@
     height: 28px;
     line-height: 28px;
     border: 1px solid #3871af;
-    border-radius: 5px;
+    border-radius: 3px;
     background: linear-gradient(#266cb9, #002c5d);
 }
 
@@ -645,7 +627,7 @@
     width: 136px;
     margin-left: 71px;
     margin-bottom: 10px;
-    border-radius: 5px;
+    border-radius: 3px;
     border: 1px solid #3871af;
     background: linear-gradient(#266cb9, #002c5d);
 }
@@ -711,7 +693,7 @@
     height: 32px;
     line-height: 30px;
     margin-left: 104px;
-    border-radius: 5px;
+    border-radius: 3px;
     border: 1px solid #3871af;
     background: linear-gradient(#266cb9, #002c5d);
 }
@@ -744,8 +726,6 @@
     width: 40px;
     height: 40px;
     float: left;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
     border-radius: 50%;
     background: linear-gradient(#266cb9, #002c5d);
 }
@@ -866,8 +846,6 @@
     top: 50%;
     left: 50%;
     z-index: 1000;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
     border-radius: 3px;
     background: #002145;
     transform: translate(-50%, -50%);
@@ -886,21 +864,12 @@
     height: 137px;
 }
 
-.dialog-delete .dialog-title h2 {
-    background: url(../images/delete.png) no-repeat 0 11px;
-}
-
 .dialog-title {
     padding-left: 10px;
     line-height: 36px;
     background: linear-gradient(#1463a5, #06386f);
 }
 
-.dialog-title h2 {
-    padding-left: 20px;
-    background: url(../images/label-manager.png) no-repeat left center;
-}
-
 .close-dialog {
     width: 14px;
     height: 14px;
@@ -939,14 +908,15 @@
 .dialog-btn-group .dialog-btn {
     height: 28px;
     line-height: 25px;
-    border-radius: 5px;
-    border: 1px solid #3871af;
-    border-radius: 5px;
-    background: linear-gradient(#266cb9, #002c5d);
+    border: 1px solid #163658;
+    border-radius: 3px;
+    background: #163658;
 }
 
 .dialog-btn-group .dialog-btn.dialog-sure-btn {
     margin-right: 7px;
+    border-color: #3871af;
+    background: linear-gradient(#266cb9, #002c5d);
 }
 
 .dialog-clear h2 {
@@ -989,7 +959,7 @@
 .dialog-info-point .icon-view {
     padding-top: 10px;
     margin: 0 10px;
-    border-radius: 5px;
+    border-radius: 3px;
     border: 1px solid #234979;
 }
 
@@ -1057,7 +1027,6 @@
     background-size: 20px 20px;
     background-position: 4px 4px;
     border: 1px solid #3871af;
-    border-radius: 5px;
 }
 
 .dialog-lat-lng-switch .item .col .switch-btn {
@@ -1320,14 +1289,14 @@
     z-index: 1000 !important
 }
 
-    .distance span {
-        padding: 5px;
-        color: #ffffff;
-        font-size: 14px;
-        font-weight: bold;
-        border-radius: 3px;
-        background: #ee5067;
-    }
+.distance span {
+    padding: 5px;
+    color: #ffffff;
+    font-size: 14px;
+    font-weight: bold;
+    border-radius: 3px;
+    background: #ee5067;
+}
 
 .info-point-content {
     width: auto !important;

04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml

@@ -3,9 +3,12 @@
         <h2>参数设置</h2>
     </div>
     <div class="param-content">
-        <div class="type-select">
-            <span class="active" type="decimal">小数</span>
-            <span type="degree">度分秒</span>
+        <div class="param-text clearfix">
+            <label>经纬度类型：</label>
+            <div class="type-select fl">
+                <span class="active" type="decimal">小数</span>
+                <span type="degree">度分秒</span>
+            </div>
         </div>
         <div class="param-text clearfix">
             <label>经度：</label>

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

@@ -27,43 +27,43 @@
     <span class="latlng"></span>
 
     <div class="control-btn-groups">
-        <div class="control-item">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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 control-tag-item">
+        <div class="control-item control-active-item">
             <span title="经纬度转换" class="icon" name="switch" index="5">
                 <img src="~/Content/images/icon-switch.png" />
             </span>
             <span class="text" id="switch-button">经纬度转换...</span>
         </div>
-        <div class="control-item">
+        <div class="control-item control-active-item">
             <span title="导出图片" class="icon" name="export" index="6">
                 <img src="~/Content/images/control-export.png" />
             </span>

04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml

@@ -3,9 +3,12 @@
         <h2>参数设置</h2>
     </div>
     <div class="param-content">
-        <div class="type-select">
-            <span class="active" type="decimal">小数</span>
-            <span type="degree">度分秒</span>
+        <div class="param-text clearfix">
+            <label>经纬度类型：</label>
+            <div class="type-select fl">
+                <span class="active" type="decimal">小数</span>
+                <span type="degree">度分秒</span>
+            </div>
         </div>
         <div class="param-text clearfix">
             <label>经度：</label>

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

@@ -26,43 +26,43 @@
     <span class="latlng"></span>
 
     <div class="control-btn-groups">
-        <div class="control-item">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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">
+        <div class="control-item control-active-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 control-tag-item">
+        <div class="control-item control-active-item">
             <span title="经纬度转换" class="icon" name="switch" index="5">
                 <img src="~/Content/images/icon-switch.png" />
             </span>
             <span class="text" id="switch-button">经纬度转换...</span>
         </div>
-        <div class="control-item">
+        <div class="control-item control-active-item">
             <span title="导出图片" class="icon" name="export" index="5">
                 <img src="~/Content/images/control-export.png" />
             </span>