commit

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

@@ -98,8 +98,19 @@
                 this.PullGroundData = pullGroundData;
                 var value = this.PullGroundData[this.PullGroundData.length - 1];
                 var time = moment(value[3], "YYYYMMDD_HHmmss");
-                $('#longitude').val(value[0]);
-                $('#latitude').val(value[1]);
+                var type = $('.type-select span.active').attr('type');
+                if (type === 'decimal') {
+                    $('#longitude').val(value[0]);
+                    $('#latitude').val(value[1]);
+                } else {
+                    $('#lng-degree').val(this.getLngLatDecimal(value[0]).degree);
+                    $('#lng-minute').val(this.getLngLatDecimal(value[0]).minute);
+                    $('#lng-second').val(this.getLngLatDecimal(value[0]).second.toFixed(2));
+                    $('#lat-degree').val(this.getLngLatDecimal(value[1]).degree);
+                    $('#lat-minute').val(this.getLngLatDecimal(value[1]).minute);
+                    $('#lat-second').val(this.getLngLatDecimal(value[1]).second.toFixed(2));
+                }
+                
                 $('#height').val(value[2]);
                 $("#release-date").datetimebox('setValue', moment(time).format('YYYY/MM/DD HH:mm'));
             }.bind(this));
@@ -273,7 +284,7 @@
     };
 
     this.GetCalcPramas = function (taskId) {
-        var attr = $('.type-select span.active').attr('type');
+        var type = $('.type-select span.active').attr('type');
         var lngDegree = $('#lng-degree').val();
         var lngMinute = $('#lng-minute').val();
         var lngSecond = $('#lng-second').val();
@@ -282,8 +293,8 @@
         var latSecond = $('#lat-second').val();
 
         return {
-            lon: attr === 'decimal' ? $('#longitude').val() : this.getLngLat(lngDegree, lngMinute, lngSecond),
-            lat: attr === 'decimal' ? $('#latitude').val() : this.getLngLat(latDegree, latMinute, latSecond),
+            lon: type === 'decimal' ? $('#longitude').val() : this.getLngLatDegree(lngDegree, lngMinute, lngSecond),
+            lat: type === 'decimal' ? $('#latitude').val() : this.getLngLatDegree(latDegree, latMinute, latSecond),
             num: taskId,
             hgt: $('#height').val(),
             rlen: $('#time-length-input').val(),
@@ -295,14 +306,33 @@
         };
     };
 
-    this.getLngLat = function (degree, minute, second) {
+    this.getLngLatDegree = function (degree, minute, second) {
         var str = parseFloat(minute) + parseFloat(second / 60);
         var value = parseFloat(str / 60) + parseFloat(degree);
         return value;
     };
 
+    this.getLngLatDecimal = function (value) {
+        var text = value.split(".");
+        var degree = text[0];
+
+        var temp = "0." + text[1];
+        var temp = String(temp * 60);
+        var str = temp.split(".");
+        var minute = str[0];
+
+        temp = "0." + str[1];
+        temp = temp * 60;
+        var second = temp;
+        return {
+            degree: degree,
+            minute: minute,
+            second: second
+        }
+    };
+
     this.GetTaskParams = function (taskId) {
-        var attr = $('.type-select span.active').attr('type');
+        var type = $('.type-select span.active').attr('type');
         var lngDegree = $('#lng-degree').val();
         var lngMinute = $('#lng-minute').val();
         var lngSecond = $('#lng-second').val();
@@ -313,8 +343,8 @@
         return {
             taskId: taskId,
             region: 'bj',
-            longitude: attr === 'decimal' ? $('#longitude').val() : this.getLngLat(lngDegree, lngMinute, lngSecond),
-            latitude: attr === 'decimal' ? $('#latitude').val() : this.getLngLat(latDegree, latMinute, latSecond),
+            longitude: type === 'decimal' ? $('#longitude').val() : this.getLngLatDegree(lngDegree, lngMinute, lngSecond),
+            latitude: type === 'decimal' ? $('#latitude').val() : this.getLngLatDegree(latDegree, latMinute, latSecond),
             height: $('#height').val(),
             simulatedDuration: $('#time-length-input').val(),
             simulatedInterval: $('#interval-length-input').val(),

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

@@ -98,7 +98,6 @@
     };
 
     this.ResizeMask = function () {
-        console.log(this.DisableSwitch)
         var mask = this.Self.find('.shadow:first');
         var slider = this.Self.find('.slider-list:first');
         mask.height((this.DisableSwitch ? 36 : 0) + slider.height() + 100);

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

@@ -158,7 +158,7 @@
     };
 
     this.GetCalcPramas = function (taskId) {
-        var attr = $('.type-select span.active').attr('type');
+        var type = $('.type-select span.active').attr('type');
         var lngDegree = $('#lng-degree').val();
         var lngMinute = $('#lng-minute').val();
         var lngSecond = $('#lng-second').val();
@@ -167,8 +167,8 @@
         var latSecond = $('#lat-second').val();
 
         return {
-            lon: attr === 'decimal' ? $('#longitude').val() : this.getLngLat(lngDegree, lngMinute, lngSecond),
-            lat: attr === 'decimal' ? $('#latitude').val() : this.getLngLat(latDegree, latMinute, latSecond),
+            lon: type === 'decimal' ? $('#longitude').val() : this.getLngLat(lngDegree, lngMinute, lngSecond),
+            lat: type === 'decimal' ? $('#latitude').val() : this.getLngLat(latDegree, latMinute, latSecond),
             num: taskId,
             hgt: $('#height').val(),
             rlen: $('#time-length-input').val(),
@@ -178,7 +178,7 @@
     };
 
     this.GetTaskParams = function (taskId) {
-        var attr = $('.type-select span.active').attr('type');
+        var type = $('.type-select span.active').attr('type');
         var lngDegree = $('#lng-degree').val();
         var lngMinute = $('#lng-minute').val();
         var lngSecond = $('#lng-second').val();
@@ -189,8 +189,8 @@
         return {
             taskId: taskId,
             region: 'mg',
-            longitude: attr === 'decimal' ? $('#longitude').val() : this.getLngLat(lngDegree, lngMinute, lngSecond),
-            latitude: attr === 'decimal' ? $('#latitude').val() : this.getLngLat(latDegree, latMinute, latSecond),
+            longitude: type === 'decimal' ? $('#longitude').val() : this.getLngLat(lngDegree, lngMinute, lngSecond),
+            latitude: type === 'decimal' ? $('#latitude').val() : this.getLngLat(latDegree, latMinute, latSecond),
             height: $('#height').val(),
             simulatedDuration: $('#time-length-input').val(),
             simulatedInterval: $('#interval-length-input').val(),
@@ -284,7 +284,7 @@
         var labelHeight = $('#realtime-slider').find('.label-list:first').height();
 
         var resultList = $('#realtime-result-list');
-        resultList.find('.calc-list ul').height(windowHeight - labelHeight - 614);
+        resultList.find('.calc-list ul').height(windowHeight - labelHeight - 635);
     };
 
     this.getLngLat = function (degree, minute, second) {

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

@@ -100,7 +100,7 @@
     this.ResizeMask = function () {
         var mask = this.Self.find('.shadow:first');
         var slider = this.Self.find('.slider-list:first');
-        mask.height((this.DisableSwitch ? 36 : 0) + slider.height() + 79);
+        mask.height((this.DisableSwitch ? 36 : 0) + slider.height() + 100);
     };
 
     this.ShowMask = function () {

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

@@ -145,7 +145,6 @@
     }
 
     this.OnTaskSelected = function (index, row) {
-        console.log(row)
         this.selectedRow = row;
         $('.datagrid-btable tr').removeClass('datagrid-row-selected');
         $('.datagrid-btable tr').eq(index).addClass('datagrid-row-selected');

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

@@ -889,4 +889,8 @@
     color: #ffffff;
     white-space: nowrap;
     transform: translateX(-50%)
+}
+
+.btn-file input[type=file] {
+    font-size: 0;
 }

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

@@ -401,17 +401,18 @@
     margin: 10px 10px 0 0;
     float: left;
     position: relative;
-    border: 1px solid #dddddd;
+    border: 1px solid #234979;
     border-radius: 3px;
-    background: #ffffff;
+    background: #03244c;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
+    box-shadow: 0 0 10px rgba(48, 112, 194, 0.25) inset;
 }
 
-    .label-list a:nth-child(3n) {
-        margin-right: 0;
-    }
+.label-list a:nth-child(3n) {
+    margin-right: 0;
+}
 
 .label-list span {
     width: 15px;
@@ -432,18 +433,10 @@
     background: url(../images/clear.png) no-repeat center/cover;
 }
 
-.label-list a:hover i {
-    background: url(../images/clear-hover.png) no-repeat center/cover;
-}
-
 .label-list a.active {
     line-height: 30px;
     border: 0;
-    color: #ffffff;
-    background: -webkit-linear-gradient(#febd51, #fcb43b, #faa71b);
-    background: -o-linear-gradient(#febd51, #fcb43b, #faa71b);
-    background: -moz-linear-gradient(#febd51, #fcb43b, #faa71b);
-    background: linear-gradient(#febd51, #fcb43b, #faa71b);
+    background: linear-gradient(#087cd6, #003c7e);
 }
 
     .label-list a.active:hover i {
@@ -902,7 +895,6 @@
 
 .dialog-btn {
     width: 66px;
-    background: url('../images/bnt66.png') no-repeat;
 }
 
 .dialog-btn-group .dialog-btn {

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

@@ -16,20 +16,20 @@
                 <input type="text" id="longitude" value="111.746303">
             </div>
             <div class="param-input degree-param-input fl" id="lng-degrees" style="display: none">
-                <input type="text" id="lng-degree" value="100">
-                <input type="text" id="lng-minute" value="54">
-                <input type="text" id="lng-second" value="36">
+                <input type="text" id="lng-degree" value="111">
+                <input type="text" id="lng-minute" value="44">
+                <input type="text" id="lng-second" value="46.69">
             </div>
         </div>
         <div class="param-text clearfix">
             <label>纬度：</label>
-            <div class="param-input degree-param-input fl" id="lng-decimal">
+            <div class="param-input decimal-param-input fl" id="lat-decimal">
                 <input type="text" id="latitude" value="40.854662">
             </div>
             <div class="param-input degree-param-input fl" id="lat-degrees" style="display: none">
-                <input type="text" id="lat-degree" value="36">
-                <input type="text" id="lat-minute" value="54">
-                <input type="text" id="lat-second" value="24">
+                <input type="text" id="lat-degree" value="40">
+                <input type="text" id="lat-minute" value="51">
+                <input type="text" id="lat-second" value="16.78">
             </div>
         </div>
         <div class="param-text clearfix">