diff --git a/04.系统编码/App/Content/images/add-label.png b/04.系统编码/App/Content/images/add-label.png deleted file mode 100644 index c534e0e..0000000 Binary files a/04.系统编码/App/Content/images/add-label.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/bnt66.png b/04.系统编码/App/Content/images/bnt66.png deleted file mode 100644 index 37bd4b8..0000000 Binary files a/04.系统编码/App/Content/images/bnt66.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/btn-bg.png b/04.系统编码/App/Content/images/btn-bg.png deleted file mode 100644 index 287ab0f..0000000 Binary files a/04.系统编码/App/Content/images/btn-bg.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/btn-group.png b/04.系统编码/App/Content/images/btn-group.png deleted file mode 100644 index b8a19a8..0000000 Binary files a/04.系统编码/App/Content/images/btn-group.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/calc-btn.png b/04.系统编码/App/Content/images/calc-btn.png deleted file mode 100644 index e179ac8..0000000 Binary files a/04.系统编码/App/Content/images/calc-btn.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/calc-btn110.png b/04.系统编码/App/Content/images/calc-btn110.png deleted file mode 100644 index 9da7e7c..0000000 Binary files a/04.系统编码/App/Content/images/calc-btn110.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/calc.png b/04.系统编码/App/Content/images/calc.png deleted file mode 100644 index 70f3a66..0000000 Binary files a/04.系统编码/App/Content/images/calc.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/clear-hover.png b/04.系统编码/App/Content/images/clear-hover.png deleted file mode 100644 index 8c20f9d..0000000 Binary files a/04.系统编码/App/Content/images/clear-hover.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/clear.png b/04.系统编码/App/Content/images/clear.png index 9638cbc..eedd238 100644 Binary files a/04.系统编码/App/Content/images/clear.png and b/04.系统编码/App/Content/images/clear.png differ diff --git a/04.系统编码/App/Content/images/close-dialog-hover.png b/04.系统编码/App/Content/images/close-dialog-hover.png deleted file mode 100644 index 26a70bb..0000000 Binary files a/04.系统编码/App/Content/images/close-dialog-hover.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/edit-hover.png b/04.系统编码/App/Content/images/edit-hover.png deleted file mode 100644 index 2d94481..0000000 Binary files a/04.系统编码/App/Content/images/edit-hover.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/icon-nexted.png b/04.系统编码/App/Content/images/icon-nexted.png deleted file mode 100644 index 0129aa0..0000000 Binary files a/04.系统编码/App/Content/images/icon-nexted.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/icon-paused.png b/04.系统编码/App/Content/images/icon-paused.png deleted file mode 100644 index e134dc0..0000000 Binary files a/04.系统编码/App/Content/images/icon-paused.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/icon-played.png b/04.系统编码/App/Content/images/icon-played.png deleted file mode 100644 index 7fb2955..0000000 Binary files a/04.系统编码/App/Content/images/icon-played.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/icon-preved.png b/04.系统编码/App/Content/images/icon-preved.png deleted file mode 100644 index b187429..0000000 Binary files a/04.系统编码/App/Content/images/icon-preved.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/login-btn.png b/04.系统编码/App/Content/images/login-btn.png deleted file mode 100644 index 10d25e5..0000000 Binary files a/04.系统编码/App/Content/images/login-btn.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/logo1.png b/04.系统编码/App/Content/images/logo1.png deleted file mode 100644 index 082e944..0000000 Binary files a/04.系统编码/App/Content/images/logo1.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/nav-bg-last.png b/04.系统编码/App/Content/images/nav-bg-last.png deleted file mode 100644 index 3634526..0000000 Binary files a/04.系统编码/App/Content/images/nav-bg-last.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/nav-bg.png b/04.系统编码/App/Content/images/nav-bg.png deleted file mode 100644 index d431b86..0000000 Binary files a/04.系统编码/App/Content/images/nav-bg.png and /dev/null differ diff --git a/04.系统编码/App/Content/images/password-open.png b/04.系统编码/App/Content/images/password-open.png index f3b366c..f43224c 100644 Binary files a/04.系统编码/App/Content/images/password-open.png and b/04.系统编码/App/Content/images/password-open.png differ diff --git a/04.系统编码/App/Content/images/refresh-btn.png b/04.系统编码/App/Content/images/refresh-btn.png deleted file mode 100644 index 4d15983..0000000 Binary files a/04.系统编码/App/Content/images/refresh-btn.png and /dev/null differ diff --git a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js index 33d3d68..3400ed0 100644 --- a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js +++ b/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(), diff --git a/04.系统编码/App/Content/scripts/beijing/result-list.js b/04.系统编码/App/Content/scripts/beijing/result-list.js index 6b0f59c..da89139 100644 --- a/04.系统编码/App/Content/scripts/beijing/result-list.js +++ b/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); diff --git a/04.系统编码/App/Content/scripts/menggu/realtime-panel.js b/04.系统编码/App/Content/scripts/menggu/realtime-panel.js index 6b15cc0..4aefc9d 100644 --- a/04.系统编码/App/Content/scripts/menggu/realtime-panel.js +++ b/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) { diff --git a/04.系统编码/App/Content/scripts/menggu/result-list.js b/04.系统编码/App/Content/scripts/menggu/result-list.js index 458df81..efd32d9 100644 --- a/04.系统编码/App/Content/scripts/menggu/result-list.js +++ b/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 () { diff --git a/04.系统编码/App/Content/scripts/system-management/user-management/index.js b/04.系统编码/App/Content/scripts/system-management/user-management/index.js index c430c75..d181061 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/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'); diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index d31f357..aaf16e1 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/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; } \ No newline at end of file diff --git a/04.系统编码/App/Content/styles/index.css b/04.系统编码/App/Content/styles/index.css index 6adc81d..c6514fc 100644 --- a/04.系统编码/App/Content/styles/index.css +++ b/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 { diff --git a/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml b/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml index 17ec340..725d95e 100644 --- a/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml +++ b/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml @@ -16,20 +16,20 @@
-
+