windy/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop-3'

Browse Source
This commit is contained in:
zhouyuejun
2018-12-20 15:46:35 +08:00
parent 9a8ac23fcd 71751de565
commit b1d84ac2bc
30 changed files with 91 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/basic-data/aircraft-type/aircraft-type.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/aircraft/aircraft.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/airline/airline.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/airport/airport.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/carousel/carousel.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/checkin-desk/checkin-desk.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/checkin-group/checkin-group.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/chut/chut.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/city/city.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/gate/gate.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/stand/stand.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/terminal-area/terminal-area.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/basic-data/terminal/terminal.component.scss
+2 -2
View File
@@ -2,7 +2,7 @@
width: 100%;
height: 100%;
overflow-y: scroll;
padding: 16px 20px 20px;
padding: 10px 20px 20px;
background-color: #f0f0f0;
.page-content {
border: 1px solid #ccc;
@@ -47,7 +47,7 @@
}
}
.navigation{
padding-bottom: 16px;
padding-bottom: 10px;
}
.breadcrumb-main-container {
padding: 20px 20px;
src/app/pages/main.scss
+1 -1
View File
@@ -39,11 +39,11 @@
}
}
.card{
height: 100%;
background: #fff;
padding: 20px;
box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
border-radius: 0;
margin-bottom: 20px;
}
.tree-box{
src/app/pages/seasonal-plan/detail-tab/detail-tab.component.html
+1 -1
View File
@@ -15,6 +15,6 @@
<p><label>到达/出发：</label>{{flight.arriOrDept}}</p>
<p><label>到达时间：</label>{{flight.arrivalTime}}</p>
<p><label>出发时间：</label>{{flight.departureTime}}</p>
<p><label>机型：</label>{{flight.aircraftTypeCode}}</p>
<p><label>机型：</label>{{flight.aircraftTypeName}}</p>
</div>
</div>
src/app/pages/system-management/department-management/department-management.component.ts
+4 -4
View File
@@ -61,11 +61,11 @@ export class DepartmentManagementComponent implements OnInit {
}
ngOnInit() {
$('.tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
$('.main-content').css('height',(document.documentElement.clientHeight-126+'px'));
$('.tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
$('.main-content').css('height',(document.documentElement.clientHeight-106+'px'));
$(window).resize(function(){
$('.tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
$('.main-content').css('height',(document.documentElement.clientHeight-126+'px'));
$('.tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
$('.main-content').css('height',(document.documentElement.clientHeight-106+'px'));
})
//表单实例化
this.validateForm = this.fb.group({
src/app/pages/system-management/operation-logs/operation-logs.component.html
+2 -7
View File
@@ -1,12 +1,7 @@
<div class="system-main-container">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>系统管理</nz-breadcrumb-item>
<nz-breadcrumb-item>操作日志</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="user-manage">
<div class="system-main-content card">
<div class="system-main-content card" id="main-box">
<div class="search-box">
<div nz-row>
<div nz-col nzSpan="8">
src/app/pages/system-management/operation-logs/operation-logs.component.scss
+1 -4
View File
@@ -1,11 +1,8 @@
@import "../../main.scss";
.system-main-container{
padding-top: 10px;
padding-bottom: 0;
overflow-y:auto;
.user-manage{
.system-main-content{
overflow-y:scroll;
}
.card{
src/app/pages/system-management/operation-logs/operation-logs.component.ts
+10 -8
View File
@@ -42,6 +42,11 @@ export class OperationLogsComponent implements OnInit {
) { }
ngOnInit() {
// 页面监听 动态改变表单高度
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
$(window).resize(function(){
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
})
this.queryTable();
}
onChange(result: Date): void {
@@ -50,21 +55,17 @@ export class OperationLogsComponent implements OnInit {
}
//重置，重置搜索条件
reset(){
this.search.page_index=1;
this.search.page_size=10;
this.search.keyword='';
this.search.date_start='';
this.search.date_end='';
this.queryTable();
}
//获取列表
queryTable(params?):void{
queryTable():void{
this.statusParamsTable.status=1;
this.tableData=[];
this.collectionSize='';
if(params){
this.search.page_index=params;
}else{
this.search.page_index='1';
}
this.http.get('/sysapi/oplog/list',this.search).subscribe((json)=>{
if(json.is_success){
this.tableData=json.body.recordList;
@@ -81,7 +82,8 @@ export class OperationLogsComponent implements OnInit {
}
//翻页
pageChange(event){
this.queryTable(event);
this.search.page_index=event;
this.queryTable();
}
}
src/app/pages/system-management/personal-settings/personal-settings.component.html
+1 -7
View File
@@ -1,11 +1,5 @@
<div class="system-main-container">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>系统管理</nz-breadcrumb-item>
<nz-breadcrumb-item>个人设置</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="card ">
<div class="card " id="main-box">
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'" class="self-main-content">
<nz-tab nzTitle="自定义显示列">
<div class="self-row-box">
src/app/pages/system-management/personal-settings/personal-settings.component.scss
+1 -5
View File
@@ -1,10 +1,6 @@
@import "../../main.scss";
.system-main-container{
padding-top: 10px;
padding-bottom: 0;
overflow-y:auto;
.self-main-content{
// overflow-y: auto;
overflow-y: auto;
height: 100%;
}
.ant-tabs{
src/app/pages/system-management/personal-settings/personal-settings.component.ts
+6 -1
View File
@@ -8,7 +8,7 @@ declare var jQuery: any;
@Component({
selector: 'app-personal-settings',
templateUrl: './personal-settings.component.html',
styleUrls: ['./personal-settings.component.scss'],
styleUrls: ['./personal-settings.component.scss','../../main.scss'],
providers:[HttpClientService]
})
export class PersonalSettingsComponent implements OnInit {
@@ -40,6 +40,11 @@ export class PersonalSettingsComponent implements OnInit {
) { }
ngOnInit() {
// 页面监听 动态改变表单高度
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
$(window).resize(function(){
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
})
//this.list=[{"COL_CODE":"FLNO", "COL_CN":"航班号", "COL_ORDER":"10"}, {"COL_CODE":"ALCD", "COL_CN":"航空公司", "COL_ORDER":"8"}, {"COL_CODE":"FLIN", "COL_CN":"航线类别", "COL_ORDER":"4"}, {"COL_CODE":"FLTY", "COL_CN":"航班类别", "COL_ORDER":"5"}, {"COL_CODE":"MVIN", "COL_CN":"航向指示", "COL_ORDER":"9"}, {"COL_CODE":"TRML", "COL_CN":"候机楼", "COL_ORDER":"7"}, {"COL_CODE":"RENO", "COL_CN":"飞机号", "COL_ORDER":"3"}, {"COL_CODE":"SODT", "COL_CN":"计划到达/出发", "COL_ORDER":"13"}, {"COL_CODE":"ESTT", "COL_CN":"预计到达/出发", "COL_ORDER":"14"}, {"COL_CODE":"ACTT", "COL_CN":"实际到达/出发", "COL_ORDER":"15"}, {"COL_CODE":"STND", "COL_CN":"停机位", "COL_ORDER":"16"}, {"COL_CODE":"ORDER", "COL_CN":"排序", "COL_ORDER":"17"} ]
this.defaultCols=[
{"COL_CODE":"ACFT", "COL_CN":"机型", "COL_ORDER":"1"},
src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss
+1 -2
View File
@@ -1,11 +1,10 @@
@import "../../../main.scss";
.system-main-container{
padding-top: 10px;
padding-bottom: 0;
overflow-y:auto;
}
.user-modify-box{
position: relative;
overflow-y:auto;
.user-footer{
text-align: center;
margin-top: -20px;
src/app/pages/system-management/role-management/role-management.component.html
+6 -2
View File
@@ -1,8 +1,12 @@
<div class="system-main-container">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>角色管理</nz-breadcrumb-item>
<nz-breadcrumb-item>列表</nz-breadcrumb-item>
<nz-breadcrumb-item>
角色管理
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="user-manage">
src/app/pages/system-management/role-management/role-management.component.scss
+1 -3
View File
@@ -1,11 +1,9 @@
@import "../../main.scss";
.system-main-container{
padding-top: 10px;
padding-bottom: 0;
overflow-y:auto;
.user-manage{
.system-main-content{
overflow-y:scroll;
}
.card{
src/app/pages/system-management/role-management/role-management.component.ts
+10 -7
View File
@@ -35,6 +35,11 @@ export class RoleManagementComponent implements OnInit {
) { }
ngOnInit() {
// 页面监听 动态改变表单高度
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
$(window).resize(function(){
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
})
this.queryTable();
}
//新增、修改 1新增 2修改
@@ -58,17 +63,14 @@ export class RoleManagementComponent implements OnInit {
}
//重置，重置搜索条件
reset(){
this.search.page_index=1;
this.search.page_size=10;
this.search.role_name='';
this.queryTable();
}
//获取列表
queryTable(params?):void{
queryTable():void{
this.statusParamsTable.status=1;
if(params){
this.search.page_index=params;
}else{
this.search.page_index='1';
}
this.tableData=[];
this.http.get('/sysapi/setting/role/list',this.search).subscribe((json)=>{
if(json.is_success){
@@ -86,7 +88,8 @@ export class RoleManagementComponent implements OnInit {
}
//翻页
pageChange(event){
this.queryTable(event);
this.search.page_index=event;
this.queryTable();
}
}
src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss
+1 -3
View File
@@ -1,8 +1,6 @@
.system-main-container{
overflow-y:scroll;
}
.user-modify-box{
position: relative;
overflow-y:scroll;
.user-footer{
text-align: center;
margin-top: -20px;
src/app/pages/system-management/user-management/user-management.component.html
+7 -3
View File
@@ -1,8 +1,12 @@
<div class="system-main-container">
<div class="navigation">
<nz-breadcrumb>
<nz-breadcrumb-item>用户管理</nz-breadcrumb-item>
<nz-breadcrumb-item>列表</nz-breadcrumb-item>
<nz-breadcrumb-item>
用户管理
</nz-breadcrumb-item>
<nz-breadcrumb-item>
列表
</nz-breadcrumb-item>
</nz-breadcrumb>
</div>
<div class="user-manage">
@@ -44,7 +48,7 @@
</div>
<app-request-status *ngIf='statusParamsTable.status!=4' [statusParams]='statusParamsTable'></app-request-status>
<div class="table-box" *ngIf='statusParamsTable.status==3||statusParamsTable.status==4||statusParamsTable.status==0'>
<nz-table [nzShowPagination]='false' #dataSet [nzData]="tableData" [nzScroll]="{ y: (tableHeight+'px') }">
<nz-table [nzShowPagination]='false' #dataSet [nzData]="tableData">
<thead>
<tr>
<th>姓名</th>
src/app/pages/system-management/user-management/user-management.component.scss
+1 -4
View File
@@ -3,7 +3,7 @@
padding-top: 10px;
.user-manage{
.system-main-content{
overflow-y:scroll;
}
.card{
@@ -19,6 +19,3 @@
color: #1890ff;
}
}
.ant-table-tbody{
}
src/app/pages/system-management/user-management/user-management.component.ts
+10 -22
View File
@@ -34,7 +34,7 @@ export class UserManagementComponent implements OnInit {
}
visible = false;
userDetail:any={}; //用户详情
tableHeight:any='100';
constructor(
private http:HttpClientService,
@@ -44,19 +44,11 @@ export class UserManagementComponent implements OnInit {
ngOnInit() {
// 页面监听 动态改变表单高度
$('#tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
$('#main-box').css('height',(document.documentElement.clientHeight-126+'px'));
let winHeight=document.documentElement.clientHeight;
if(winHeight-396>100){
this.tableHeight=winHeight-396;
}
$('#tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
$(window).resize(function(){
$('#tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
$('#main-box').css('height',(document.documentElement.clientHeight-126+'px'));
let winHeight2=document.documentElement.clientHeight;
if(winHeight2-396>100){
this.tableHeight=winHeight2-396;
}
$('#tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
})
this.initTree();
this.queryTable();
@@ -108,20 +100,15 @@ export class UserManagementComponent implements OnInit {
}
//重置，重置搜索条件
reset(){
this.search.page_index=1;
this.search.page_size=10;
this.search.real_name='';
this.search.login_name='';
this.queryTable();
}
//获取列表
queryTable(params?):void{
queryTable():void{
this.statusParamsTable.status=1;
this.tableData=[];
this.collectionSize='';
if(params){
this.search.page_index=params;
}else{
this.search.page_index='1';
}
this.http.get('/sysapi/setting/user/list',this.search).subscribe((json)=>{
if(json.is_success){
this.tableData=json.body.list;
@@ -138,7 +125,8 @@ export class UserManagementComponent implements OnInit {
}
//翻页
pageChange(event){
this.queryTable(event);
this.search.page_index=event;
this.queryTable();
}
//树模型参数设置
public zNodes: any[];