root
/
BeijingSafeguard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

commit

master
hhx 3 years ago
parent
769da9a59a
commit
1bd0047db3
9 changed files with 59 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      04.系统编码/App/Content/scripts/beijing/realtime-panel.js
  2. 3
      04.系统编码/App/Content/scripts/beijing/result-list.js
  3. 1
      04.系统编码/App/Content/scripts/menggu/lat-lng-switch.js
  4. 43
      04.系统编码/App/Content/scripts/system-management/statistic-analysis/index.js
  5. 6
      04.系统编码/App/Content/scripts/system-management/user-management/index.js
  6. 4
      04.系统编码/App/Content/styles/common.css
  7. 2
      04.系统编码/App/Content/styles/index.css
  8. 10
      04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml
  9. 10
      04.系统编码/App/Views/Menggu/Controls/RealtimeTabPage.cshtml

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

@ -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) {

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

@ -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 () {

1
04.系统编码/App/Content/scripts/menggu/lat-lng-switch.js
View File

@ -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;

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

@ -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 '<b>' + this.x + '</b>' + '<br/>' +
'计算次数：' + '<b>' + this.y + '</b>' + '次' + '<br/>' +
'计算用户：' + app.GetNames(values, this.x);
}
},
legend: {
itemStyle: {
color: '#ffffff',
fontFamily: '微软雅黑'
},
},
plotOptions: {
column: {
borderColor: ''
}
},
series: [series]
});
};

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

@ -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 () {

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

@ -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 {

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

@ -718,7 +718,7 @@
.btn-group {
width: 152px;
position: fixed;
bottom: 10px;
bottom: 5px;
right: 67px;
}

10
04.系统编码/App/Views/Beijing/Controls/RealtimeTabPage.cshtml
View File

@ -18,8 +18,8 @@
</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="12">
<input type="text" id="lng-second" value="39.6">
<input type="text" id="lng-minute" value="54">
<input type="text" id="lng-second" value="36">
</div>
</div>
<div class="param-text clearfix">
@ -29,9 +29,9 @@
<input type="text" id="latitude" value="36.94">
</div>
<div class="param-input degree-param-input fl" id="lat-degrees" style="display: none">
<input type="text" id="lat-degree" value="39">
<input type="text" id="lat-minute" value="12">
<input type="text" id="lat-second" value="39.6">
<input type="text" id="lat-degree" value="36">
<input type="text" id="lat-minute" value="56">
<input type="text" id="lat-second" value="24">
</div>
</div>
<div class="param-text clearfix">

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

@ -17,8 +17,8 @@
</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="12">
<input type="text" id="lng-second" value="39.6">
<input type="text" id="lng-minute" value="54">
<input type="text" id="lng-second" value="36">
</div>
</div>
<div class="param-text clearfix">
@ -27,9 +27,9 @@
<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="39">
<input type="text" id="lat-minute" value="12">
<input type="text" id="lat-second" value="39.6">
<input type="text" id="lat-degree" value="36">
<input type="text" id="lat-minute" value="54">
<input type="text" id="lat-second" value="24">
</div>
</div>
<div class="param-text clearfix">

Write Preview
Loading…
Cancel
Save