commit

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

@@ -130,19 +130,19 @@ var Map = function (parent) {
     };
 
     this.OnMapMove = function (e) {
-        $('.latlng').text('当前经纬度：{0}, {1}'.format(this.getLatLng(e.latlng.lng), this.getLatLng(e.latlng.lat)))
+        $('.latlng').text('当前经纬度：{0}, {1}'.format(this.getLatLng(e.latlng.lng), this.getLatLng(e.latlng.lat)));
     };
 
     this.getLatLng = function (value) {
-        value = value.toString()
+        value = value.toString();
-        let index = value.indexOf('.')
+        let index = value.indexOf('.');
         if (index !== -1) {
-            value = value.substring(0, 6 + index + 1)
+            value = value.substring(0, 6 + index + 1);
         } else {
-            value = value.substring(0)
+            value = value.substring(0);
         }
-        return parseFloat(value).toFixed(6)
+        return parseFloat(value).toFixed(6);
-    }
+    };
 
     this.GetLineConfig = function () {
         $.ajax({
@@ -150,7 +150,6 @@ var Map = function (parent) {
             dataType: 'json',
             url: '/Config/All',
             success: function (result) {
-                console.log()
                 this.lineColor = result.find(function (item) {
                     return item.Id === 'line-color';
                 }).Value;
@@ -731,8 +730,8 @@ var Map = function (parent) {
                         lat: item.Latitude,
                         lng: item.Longitude
                     };
-                    this.AddInfoPoint(point, item.Title, item.Icon, item.Id)
+                    this.AddInfoPoint(point, item.Title, item.Icon, item.Id);
-                }.bind(this))
+                }.bind(this));
             }.bind(this)
         });
     };
@@ -766,7 +765,7 @@ var Map = function (parent) {
                 this.InfoPoint.ShowDialog(e.latlng);
             else
                 return;
-        }.bind(this))
+        }.bind(this));
     };
 
     this.AddInfoPoint = function (point, title, icon, id) {
@@ -788,13 +787,13 @@ var Map = function (parent) {
             dataType: 'text',
             url: '/Point/Delete',
             data: {
-                id: id,
+                id: id
             },
             success: function () {
                 $('.info-point{0}'.format(id)).hide();
             }.bind(this)
         });
-    }
+    };
 
     this.onSwitchClick = function () {
         this.isSwitch = true;

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

@@ -57,24 +57,28 @@
     height: 48px;
     line-height: 48px;
     float: left;
-    position: relative;
     z-index: 10;
     overflow: hidden;
     border-radius: 5px;
 }
 
 .nav ul li a {
+    height: 19px;
     padding-left: 38px;
     padding-right: 16px;
+    line-height: 19px;
+    margin-top: 14px;
+    position: relative;
+    z-index: 1;
     color: #ffffff;
 }
 
-.nav ul li:before {
+.nav ul li a:before {
     content: '';
     width: 16px;
     height: 16px;
     position: absolute;
-    top: 17px;
+    top: 2px;
     left: 13px;
     z-index: 0;
     background: url("../images/icon-dangerous.png") no-repeat;
@@ -84,21 +88,23 @@
     color: #00d5f6;
 }
 
-.nav ul li:first-child:hover:before,
+.nav ul li:first-child a:hover:before,
-.nav ul li:nth-child(2):hover:before{
+.nav ul li:nth-child(2) a:hover:before{
     background-position: -36px 0;
 }
 
-.nav ul li:last-child:hover:before {
+.nav ul li:last-child a:hover:before {
     background-position: -90px 0;
 }
 
-.nav ul li:first-child:before,
+.nav ul li:first-child a:before,
-.nav ul li:nth-child(2):before {
+.nav ul li:nth-child(2) a:before,
+.nav ul li:first-child.action a:before,
+.nav ul li:nth-child(2).action a:before{
     background-position: -18px 0;
 }
 
-.nav ul li:last-child:before {
+.nav ul li:last-child a:before {
     width: 16px;
     background-position: -72px 0;
 }
@@ -109,12 +115,17 @@
 
 .nav ul li.action a {
     color: #ffffff;
-    background: url("../images/nav-bg.jpg") repeat-x;
 }
 
-.nav ul li:last-child.action:after {
+.nav ul li.action a:after {
-    width: 192px;
+    content: '';
-    background: url("../images/nav-bg-last.png") no-repeat center;
+    width: 100%;
+    height: 48px;
+    position: absolute;
+    top: -15px;
+    left: 0;
+    z-index: -1;
+    background: url("../images/nav-bg.jpg") repeat-x;
 }
 
 .table .panel-body {
@@ -797,7 +808,7 @@
     padding: 0 10px;
     border-radius: 3px;
     color: #ffffff;
-    opacity: 0;
+    opacity: 0 !important;
     transition: all 0.5s;
     background: linear-gradient(#087cd6, #003c7e);
 }
@@ -822,7 +833,7 @@
 }
 
 .control-btn-groups .control-active-item span.text {
-    opacity: 1;
+    opacity: 1 !important;
     transition: all 0.5s;
 }
 

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

@@ -653,10 +653,10 @@
 }
 
 .history-time .sure-btn {
-    width: 154px;
+    width: 156px;
     height: 32px;
     line-height: 30px;
-    margin-left: 104px;
+    margin-left: 102px;
     border-radius: 3px;
     border: 1px solid #3871af;
     background: linear-gradient(#266cb9, #002c5d);