From 1bd0047db3bff760a4ab8e48a5b9216a7ca107bd Mon Sep 17 00:00:00 2001 From: hhx <1284857778@qq.com> Date: Thu, 10 Mar 2022 10:14:43 +0800 Subject: [PATCH] commit --- .../Content/scripts/beijing/realtime-panel.js | 2 +- .../Content/scripts/beijing/result-list.js | 3 +- .../Content/scripts/menggu/lat-lng-switch.js | 1 - .../statistic-analysis/index.js | 43 +++++++++++++++++-- .../user-management/index.js | 6 +-- 04.系统编码/App/Content/styles/common.css | 4 +- 04.系统编码/App/Content/styles/index.css | 2 +- .../Beijing/Controls/RealtimeTabPage.cshtml | 10 ++--- .../Menggu/Controls/RealtimeTabPage.cshtml | 10 ++--- 9 files changed, 59 insertions(+), 22 deletions(-) diff --git a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js index 0ae6d70..33d3d68 100644 --- a/04.系统编码/App/Content/scripts/beijing/realtime-panel.js +++ b/04.系统编码/App/Content/scripts/beijing/realtime-panel.js @@ -409,7 +409,7 @@ var labelHeight = $('#realtime-slider').find('.label-list:first').height(); var resultList = $('#realtime-result-list'); - resultList.find('.calc-list ul').height(windowHeight - labelHeight - 726); //684 + resultList.find('.calc-list ul').height(windowHeight - labelHeight - 745); }; this.OnTypeSelectClick = function (event) { diff --git a/04.系统编码/App/Content/scripts/beijing/result-list.js b/04.系统编码/App/Content/scripts/beijing/result-list.js index 4d0d6f1..6b0f59c 100644 --- a/04.系统编码/App/Content/scripts/beijing/result-list.js +++ b/04.系统编码/App/Content/scripts/beijing/result-list.js @@ -98,9 +98,10 @@ }; 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() + 90); + mask.height((this.DisableSwitch ? 36 : 0) + slider.height() + 100); }; this.ShowMask = function () { diff --git a/04.系统编码/App/Content/scripts/menggu/lat-lng-switch.js b/04.系统编码/App/Content/scripts/menggu/lat-lng-switch.js index cfa2127..4cc4005 100644 --- a/04.系统编码/App/Content/scripts/menggu/lat-lng-switch.js +++ b/04.系统编码/App/Content/scripts/menggu/lat-lng-switch.js @@ -37,7 +37,6 @@ element.next().show(); return; } else if (Number(element.val()) > max || Number(element.val()) < 0) { - console.log(Number(element.val())) $(element).addClass('error'); element.next().show(); return; diff --git a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js index 428bb1c..14d1192 100644 --- a/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js +++ b/04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js @@ -77,17 +77,20 @@ this.InitChart = function (series, xAxises, values) { Highcharts.chart('chart', { + chart: { + backgroundColor: '#002145' + }, title: { text: this.GetParams().fromTime + ' 至 ' + this.GetParams().toTime, style: { - color: '#3a3a3a', + color: '#ffffff', fontFamily: '微软雅黑' } }, subtitle: { text: '计算次数', style: { - color: '#3a3a3a', + color: '#ffffff', fontFamily: '微软雅黑' }, verticalAlign: 'top', @@ -97,21 +100,53 @@ credits: { enabled: false }, + colors: ['#00d5f6'], xAxis: { - categories: xAxises + categories: xAxises, + labels: { + style: { + color: '#ffffff', + fontFamily: '微软雅黑' + }, + }, + lineColor: '#234979' }, yAxis: { title: { text: null - } + }, + labels: { + style: { + color: '#ffffff', + fontFamily: '微软雅黑' + }, + }, + gridLineColor: '#234979' }, tooltip: { + backgroundColor: '#002145', + shadow: true, + style: { + color: '#ffffff', + fontFamily: '微软雅黑' + }, formatter: function () { return '' + this.x + '' + '
' + '计算次数：' + '' + this.y + '' + '次' + '
' + '计算用户：' + app.GetNames(values, this.x); } }, + legend: { + itemStyle: { + color: '#ffffff', + fontFamily: '微软雅黑' + }, + }, + plotOptions: { + column: { + borderColor: '' + } + }, series: [series] }); }; 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 2f10bcd..c430c75 100644 --- a/04.系统编码/App/Content/scripts/system-management/user-management/index.js +++ b/04.系统编码/App/Content/scripts/system-management/user-management/index.js @@ -67,7 +67,7 @@ { field: 'RealName', title: '姓名', align: 'center', width: 120 }, { field: 'OrgName', title: '所属机构', align: 'left', width: 180 }, { field: 'LoginName', title: '登录账户', align: 'left', width: 150 }, - { field: 'LoginPassWord', title: '登录密码', align: 'left', width: 120, formatter: this.formatPassword.bind(this) }, + //{ field: 'LoginPassWord', title: '登录密码', align: 'left', width: 120, formatter: this.formatPassword.bind(this) }, { field: 'ComputeCount', title: '计算次数', align: 'center', width: 80 }, { field: 'LastComputeTime', title: '最后计算时间', align: 'center', width: 160, formatter: this.formatLastComputeTime.bind(this) }, { field: 'LoginCount', title: '登录次数', align: 'center', width: 80 }, @@ -102,8 +102,8 @@ var headerTable = $('.datagrid-header'); var bodyTable = $('.datagrid-body'); var headerTd = headerTable.find('td:last'); - headerTd.css('width', (width - 1213) + 'px'); - bodyTable.find('tr').find('td:last').css('width', (width - 1213) + 'px'); + headerTd.css('width', (width - 1093) + 'px'); + bodyTable.find('tr').find('td:last').css('width', (width - 1093) + 'px'); }; this.onQueryButtonClick = function () { diff --git a/04.系统编码/App/Content/styles/common.css b/04.系统编码/App/Content/styles/common.css index 76d903b..d31f357 100644 --- a/04.系统编码/App/Content/styles/common.css +++ b/04.系统编码/App/Content/styles/common.css @@ -60,6 +60,7 @@ position: relative; z-index: 10; overflow: hidden; + border-radius: 5px; } .nav ul li a { @@ -324,7 +325,8 @@ } .system-management { - height: calc(100vh - 58px) + height: calc(100vh - 58px); + background: #002145; } .aside { diff --git a/04.系统编码/App/Content/styles/index.css b/04.系统编码/App/Content/styles/index.css index 53c4973..6adc81d 100644 --- a/04.系统编码/App/Content/styles/index.css +++ b/04.系统编码/App/Content/styles/index.css @@ -718,7 +718,7 @@ .btn-group { width: 152px; position: fixed; - bottom: 10px; + bottom: 5px; right: 67px; } diff --git a/04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml b/04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml index d9a5d8a..d922790 100644 --- a/04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml +++ b/04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml @@ -18,8 +18,8 @@
@@ -29,9 +29,9 @@
diff --git a/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml b/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml index cccba34..17ec340 100644 --- a/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml +++ b/04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml @@ -17,8 +17,8 @@
@@ -27,9 +27,9 @@