commit

04.系统编码/App/Content/scripts/beijing/history-panel.js

@@ -341,7 +341,7 @@
         var tableHeight = $('#history-slider').find('.calc-table:first').height();
 
         var resultList = $('#history-result-list');
-        resultList.find('.calc-list ul').height(windowHeight - labelHeight - tableHeight - 500);
+        resultList.find('.calc-list ul').height(windowHeight - labelHeight - tableHeight - 490);
         this.ResultList.ResizeMask();
     };
 };

04.系统编码/App/Content/scripts/beijing/realtime-panel.js

@@ -5,6 +5,8 @@
     this.TaskInfo = null;
     this.TaskStateCheckTimer = null;
 
+    this.isDecimal = true;
+
     this.PullGroundData = null;
     this.PreValues = {
         Longitude: 0,
@@ -441,7 +443,7 @@
         var labelHeight = $('#realtime-slider').find('.label-list:first').height();
 
         var resultList = $('#realtime-result-list');
-        resultList.find('.calc-list ul').height(windowHeight - labelHeight - 745);
+        resultList.find('.calc-list ul').height(windowHeight - labelHeight - (this.isDecimal ? 742 : 790));
     };
 
     this.OnTypeSelectClick = function (event) {
@@ -449,12 +451,18 @@
         $(event.target).addClass("active");
 
         if ($(event.target).attr('type') === 'decimal') {
+            this.isDecimal = true;
+            this.Relayout();
+
             $('#lng-decimal').show();
             $('#lat-decimal').show();
             $('#lng-degrees').hide();
             $('#lat-degrees').hide();
             $('.degree-text').hide();
         } else {
+            this.isDecimal = false;
+            this.Relayout();
+
             $('#lng-decimal').hide();
             $('#lat-decimal').hide();
             $('#lng-degrees').show();

04.系统编码/App/Content/scripts/beijing/result-list.js

@@ -88,7 +88,7 @@
 
     this.EnableTimeList = function () {
         if (this.Self.find('.switch:first').hasClass('switch-on')) {
-            this.Self.find('.shadow:first').hide();
+            this.Self.find('.calc-list').removeClass('calc-list-shadow');
             this.LoadDetailData();
         } else {
             this.ShowMask();
@@ -105,7 +105,7 @@
 
     this.ShowMask = function () {
         this.ResizeMask();
-        this.Self.find('.shadow:first').show();
+        this.Self.find('.calc-list').addClass('calc-list-shadow');
     };
 
     this.LoadDetailData = function () {

04.系统编码/App/Content/scripts/menggu/history-panel.js

@@ -344,7 +344,7 @@
         var tableHeight = $('#history-slider').find('.calc-table:first').height();
 
         var resultList = $('#history-result-list');
-        resultList.find('.calc-list ul').height(windowHeight - labelHeight - tableHeight - 500);
+        resultList.find('.calc-list ul').height(windowHeight - labelHeight - tableHeight - 490);
         this.ResultList.ResizeMask();
     };
 };

04.系统编码/App/Content/scripts/menggu/realtime-panel.js

@@ -5,6 +5,8 @@
     this.TaskInfo = null;
     this.TaskStateCheckTimer = null;
 
+    this.isDecimal = true;
+
     this.Startup = function () {
         this.ResultList.Startup();
         this.InitReleaseTime();
@@ -286,7 +288,7 @@
         var labelHeight = $('#realtime-slider').find('.label-list:first').height();
 
         var resultList = $('#realtime-result-list');
-        resultList.find('.calc-list ul').height(windowHeight - labelHeight - 635);
+        resultList.find('.calc-list ul').height(windowHeight - labelHeight - (this.isDecimal ? 633 : 681));
     };
 
     this.getLngLat = function (degree, minute, second) {
@@ -298,14 +300,20 @@
     this.OnTypeSelectClick = function (event) {
         $('.type-select span').removeClass("active");
         $(event.target).addClass("active");
-
+        
         if ($(event.target).attr('type') === 'decimal') {
+            this.isDecimal = true;
+            this.Relayout();
+
             $('#lng-decimal').show();
             $('#lat-decimal').show();
             $('#lng-degrees').hide();
             $('#lat-degrees').hide();
             $('.degree-text').hide();
         } else {
+            this.isDecimal = false;
+            this.Relayout();
+
             $('#lng-decimal').hide();
             $('#lat-decimal').hide();
             $('#lng-degrees').show();
@@ -332,7 +340,7 @@
             $('#lng-degree-text').addClass('degree-text-error');
             return;
         }
-        
+
         if ($(event.target).attr('id') === 'lng-degree')
             $('#lng-degree-text').text(this.getLngLat($(event.target).val(), value1.val(), value2.val()));
         else if ($(event.target).attr('id') === 'lng-minute')
@@ -345,5 +353,5 @@
             $('#lng-degree-text').text(this.getLngLat(value1.val(), $(event.target).val(), value2.val()));
         else if ($(event.target).attr('id') === 'lat-second')
             $('#lng-degree-text').text(this.getLngLat(value1.val(), value2.val(), $(event.target).val()));
-    }
+    };
 };

04.系统编码/App/Content/scripts/menggu/result-list.js

@@ -72,7 +72,6 @@
         list.empty();
 
         points.forEach(function (point) {
-            console.log(point)
             var time = moment(point[2], "YYYYMMDD_HHmmss");
             var label = "<li time='{0}'>{1}</li>".format(point[2], time.format("YYYY-MM-DD HH:mm"));
             list.append(label);
@@ -89,7 +88,7 @@
 
     this.EnableTimeList = function () {
         if (this.Self.find('.switch:first').hasClass('switch-on')) {
-            this.Self.find('.shadow:first').hide();
+            this.Self.find('.calc-list').removeClass('calc-list-shadow');
             this.LoadDetailData();
         } else {
             this.ShowMask();
@@ -105,8 +104,7 @@
     };
 
     this.ShowMask = function () {
-        this.ResizeMask();
+        this.Self.find('.calc-list').addClass('calc-list-shadow');
-        this.Self.find('.shadow:first').show();
     };
 
     this.LoadDetailData = function () {

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

@@ -348,24 +348,25 @@
             },
             series: [series]
         },function (chart) {
-            SetGradientColor(chart);
+            this.SetGradientColor(chart);
-        });
+        }.bind(this));
-        function SetGradientColor(chart) {
-            var pointsList = chart.series[0].points;
-            for (var i = 0; i < pointsList.length; i++) {
-                chart.series[0].points[i].update({
-                    color: {
-                        linearGradient: { x1: 0, y1: 1, x2: 0, y2: 0 },
-                        stops: [
-                            [0, Highcharts.Color(i === 0 ? '#00d5f6' : '#fafafa').setOpacity(1).get('rgba')],
-                            [1, i === 0 ? '#266cb9' : app.GetRandomColor()]
-                        ]
-                    }
-                });
-            }
-        }
     };
 
+    this.SetGradientColor = function (chart) {
+        var pointsList = chart.series[0].points;
+        for (var i = 0; i < pointsList.length; i++) {
+            chart.series[0].points[i].update({
+                color: {
+                    linearGradient: { x1: 0, y1: 1, x2: 0, y2: 0 },
+                    stops: [
+                        [0, Highcharts.Color(i === 0 ? '#00d5f6' : '#fafafa').setOpacity(1).get('rgba')],
+                        [1, i === 0 ? '#266cb9' : app.GetRandomColor()]
+                    ]
+                }
+            });
+        }
+    }
+
     this.GetRandomColor = function () {
         var r = Math.floor(Math.random() * 255);
         var g = Math.floor(Math.random() * 255);

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

@@ -902,7 +902,7 @@
     width: 76px;
     display: block;
     text-align: center;
-    line-height: 28px;
+    line-height: 26px;
     border: 1px solid #3871af;
     border-radius: 3px 0 0 3px;
     background: #03244c;

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

@@ -280,8 +280,8 @@
 .param-input input,
 .param-input .textbox{
     width: 100%;
-    height: 30px;
+    height: 28px;
-    line-height: 30px;
+    line-height: 28px;
     text-align: center;
     border: 1px solid #234979;
     border-radius: 3px;
@@ -371,7 +371,7 @@
 .label-shade:before {
     content: '';
     width: 266px;
-    height: 30px;
+    height: 28px;
     display: block;
     position: absolute;
     top: 0;
@@ -628,6 +628,17 @@
     margin-bottom: 10px;
 }
 
+.calc-list-shadow::after {
+    content: '';
+    width: 100%;
+    height: calc(100% + 52px);
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1000;
+    background: rgba(0, 33, 69, 0.8);
+}
+
 .result-list {
     height: calc(100vh - 491px);
 }
@@ -654,8 +665,8 @@
 
 .history-time .sure-btn {
     width: 156px;
-    height: 32px;
+    height: 28px;
-    line-height: 30px;
+    line-height: 28px;
     margin-left: 102px;
     border-radius: 3px;
     border: 1px solid #3871af;