diff --git a/src/app/pages/system-management/data-synchronize/data-synchronize.component.html b/src/app/pages/system-management/data-synchronize/data-synchronize.component.html index f1d7628..1253257 100644 --- a/src/app/pages/system-management/data-synchronize/data-synchronize.component.html +++ b/src/app/pages/system-management/data-synchronize/data-synchronize.component.html @@ -1,28 +1,35 @@ -
-
-
-
- - 请求的消息类型 - - - - - - -
-
- - 时间 - - - - -
-
-
- - -
-
+
+
+
+
+ + 请求的消息类型 + + + + + + +
+
+ + 时间 + + + + + + + +
+
+
+ + +
+
\ No newline at end of file diff --git a/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts b/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts index 8fbde75..500a9bb 100644 --- a/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts +++ b/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts @@ -1,54 +1,88 @@ import { Component, OnInit } from '@angular/core'; import { HttpClientService } from '../../../services/http-client.service'; import { Router } from '@angular/router'; -import { NzMessageService,NzModalRef, NzModalService } from 'ng-zorro-antd'; +import { NzMessageService, NzModalRef, NzModalService } from 'ng-zorro-antd'; @Component({ - selector: 'app-data-synchronize', - templateUrl: './data-synchronize.component.html', - styleUrls: ['./data-synchronize.component.scss'] + selector: 'app-data-synchronize', + templateUrl: './data-synchronize.component.html', + styleUrls: ['./data-synchronize.component.scss'] }) export class DataSynchronizeComponent implements OnInit { - selectedValue:any='1'; - dateRange:any=''; - search:any={ - startDate:'', - endDate:'' - } - constructor( - private http:HttpClientService, - private message: NzMessageService, - private modal: NzModalService, - ) { } + selectedValue: any = '1'; + dateRange: any = ''; + search: any = { + startDate: '', + endDate: '' + } + constructor( + private http: HttpClientService, + private message: NzMessageService, + ) { } - ngOnInit() { - } - onChange(result: Date): void { - this.search.startDate=this.changeDate(result[0]); - this.search.endDate=this.changeDate(result[1]); - - } - //日期时间处理 - changeDate(time){ - var date = new Date(time); - var Y = date.getFullYear()+''; - var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1)+''; - var D = (date.getDate()<10?'0'+date.getDate():date.getDate())+''; - var h = (date.getHours()<10?'0'+date.getHours():date.getHours())+'' ; - var m = (date.getMinutes()<10?'0'+date.getMinutes():date.getMinutes())+''; - var s = date.getSeconds()<10?'0'+date.getSeconds():date.getSeconds()+''; - return Y+'-'+M+'-'+D+' '+h+':'+m+':'+s; - } + endOpen: boolean = false; + startValue: Date = null; + endValue: Date = null; - //保存 - save(){ - this.http.post('/msgexchangeapi/schd/sync',this.search).subscribe((json)=>{ - if(json.is_success){ - this.message.success(`提交成功!`); - }else{ - this.message.error(`提交失败!`); - } - }) - } + ngOnInit() { + } + + disabledStartDate = (startValue: Date): boolean => { + if (!startValue || !this.endValue) { + return false; + } + return startValue.getTime() >= this.endValue.getTime(); + }; + + disabledEndDate = (endValue: Date): boolean => { + if (!endValue || !this.startValue) { + return false; + } + return endValue.getTime() <= this.startValue.getTime(); + }; + + onStartChange(date: Date): void { + this.startValue = date; + this.search.startDate = this.changeDate(date) + } + + onEndChange(date: Date): void { + this.endValue = date; + this.search.endDate = this.changeDate(date) + console.log(this.search.endDate) + } + + handleStartOpenChange(open: boolean): void { + if (!open && this.startValue) { + this.endOpen = true; + } + } + + handleEndOpenChange(open: boolean): void { + this.endOpen = open; + } + + //日期时间处理 + changeDate(time) { + var date = new Date(time); + var Y = date.getFullYear() + ''; + var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + ''; + var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ''; + var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ''; + var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ''; + var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + ''; + return Y + '-' + M + '-' + D + ' ' + h + ':' + m ; + } + + //保存 + save() { + this.http.post('/msgexchangeapi/schd/sync', this.search).subscribe((json) => { + if (json.is_success) { + this.message.success(`提交成功!`); + } else { + this.message.error(`提交失败!`); + } + }) + } } diff --git a/src/app/pages/system-management/operation-logs/operation-logs.component.html b/src/app/pages/system-management/operation-logs/operation-logs.component.html index 7f0ae1a..b9a12fa 100644 --- a/src/app/pages/system-management/operation-logs/operation-logs.component.html +++ b/src/app/pages/system-management/operation-logs/operation-logs.component.html @@ -1,63 +1,67 @@ -
-
-
- -
-
-
- - 关键词 - - - - -
-
- - 时间 - - - - -
-
- - - - - - -
- -
-
- -
- - - - 序号 - 用户名 - 模块 - 操作内容 - 操作时间 - - - - - {{i+1}} - {{item.user_name}} - {{item.model_name}} - {{item.summary}} - {{item.log_datetime| date:'yyyy-MM-dd HH:mm:ss'}} - - - -
- -
-
- -
-
-
+
+
+
+
+
+ + 关键词 + + + + +
+
+ + 时间 + + + + + + + +
+
+ + + + + + +
+
+ +
+ + + + 序号 + 用户名 + 模块 + 操作内容 + 操作时间 + + + + + {{i+1}} + {{item.user_name}} + {{item.model_name}} + {{item.summary}} + {{item.log_datetime| date:'yyyy-MM-dd HH:mm:ss'}} + + + +
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/src/app/pages/system-management/operation-logs/operation-logs.component.ts b/src/app/pages/system-management/operation-logs/operation-logs.component.ts index cd64bf2..5a2951f 100644 --- a/src/app/pages/system-management/operation-logs/operation-logs.component.ts +++ b/src/app/pages/system-management/operation-logs/operation-logs.component.ts @@ -3,94 +3,126 @@ import { HttpClientService } from '../../../services/http-client.service'; import { Router } from '@angular/router'; import { NzMessageService } from 'ng-zorro-antd'; - @Component({ - selector: 'app-operation-logs', - templateUrl: './operation-logs.component.html', - styleUrls: ['./operation-logs.component.scss'] + selector: 'app-operation-logs', + templateUrl: './operation-logs.component.html', + styleUrls: ['./operation-logs.component.scss'] }) export class OperationLogsComponent implements OnInit { - collectionSize:any ; - public tableData:any=[]; - statusParamsTable:any={ //获取用户列表接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 - status:1, - } - public search:any={ - page_index:'1', - page_size:'10', - date_start:'', - date_end:'', - keyword:'', - orgId:'', - } - logType:any={ - 'LOGIN':'登录', - 'LOGOUT':'退出', - 'USER_UI_SET':'修改用户设置', - 'USER_INFO_OPT':'增删改用户信息', - }; - optType:any={ - 'ADD':'新增', - 'UPDATE':'修改', - 'DELETE':'删除', - }; - dateRange = []; - constructor( - private http:HttpClientService, - private router:Router, - private message: NzMessageService, - ) { } + collectionSize: any; + public tableData: any = []; + statusParamsTable: any = { //获取用户列表接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 + status: 1, + } + public search: any = { + page_index: '1', + page_size: '10', + date_start: '', + date_end: '', + keyword: '', + orgId: '', + } + logType: any = { + 'LOGIN': '登录', + 'LOGOUT': '退出', + 'USER_UI_SET': '修改用户设置', + 'USER_INFO_OPT': '增删改用户信息', + }; + optType: any = { + 'ADD': '新增', + 'UPDATE': '修改', + 'DELETE': '删除', + }; - ngOnInit() { - this.queryTable(); - } - onChange(result: Date): void { - this.search.date_start=this.changeDate(result[0]); - this.search.date_end=this.changeDate(result[1]); - - } - //日期时间处理 - changeDate(time){ - var date = new Date(time); - var Y = date.getFullYear()+''; - var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1)+''; - var D = (date.getDate()<10?'0'+date.getDate():date.getDate())+''; - var h = (date.getHours()<10?'0'+date.getHours():date.getHours())+'' ; - var m = (date.getMinutes()<10?'0'+date.getMinutes():date.getMinutes())+''; - var s = date.getSeconds()<10?'0'+date.getSeconds():date.getSeconds()+''; - return Y+'-'+M+'-'+D+' '+h+':'+m+':'+s; - } - //重置，重置搜索条件 - 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():void{ - this.statusParamsTable.status=1; - this.tableData=[]; - this.http.get('/sysapi/oplog/list',this.search).subscribe((json)=>{ - if(json.is_success){ - this.tableData=json.body.recordList; - this.collectionSize=json.body.recordCount; - if(json.body.recordList&&json.body.recordList.length>0){ - this.statusParamsTable.status=3; - }else{ - this.statusParamsTable.status=4; - } - }else{ - this.statusParamsTable.status=0; - } - }) - } - //翻页 - pageChange(event){ - this.search.page_index=event; - this.queryTable(); - } + endOpen: boolean = false; + startValue: Date = null; + endValue: Date = null; + + constructor( + private http: HttpClientService, + ) { } + + ngOnInit() { + this.queryTable(); + } + + disabledStartDate = (startValue: Date): boolean => { + if (!startValue || !this.endValue) { + return false; + } + return startValue.getTime() >= this.endValue.getTime(); + }; + + disabledEndDate = (endValue: Date): boolean => { + if (!endValue || !this.startValue) { + return false; + } + return endValue.getTime() <= this.startValue.getTime(); + }; + + onStartChange(date: Date): void { + this.startValue = date; + this.search.date_start = this.changeDate(date) + } + + onEndChange(date: Date): void { + this.endValue = date; + this.search.date_end = this.changeDate(date) + } + + handleStartOpenChange(open: boolean): void { + if (!open && this.startValue) { + this.endOpen = true; + } + } + + handleEndOpenChange(open: boolean): void { + this.endOpen = open; + } + + //日期时间处理 + changeDate(time) { + var date = new Date(time); + var Y = date.getFullYear() + ''; + var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + ''; + var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ''; + var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ''; + var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ''; + var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + ''; + return Y + '-' + M + '-' + D + ' ' + h + ':' + m + ':' + s; + } + //重置，重置搜索条件 + reset() { + this.search.page_index = 1; + this.search.page_size = 10; + this.search.keyword = ''; + this.search.date_start = ''; + this.startValue = null; + this.search.date_end = ''; + this.endValue = null; + } + //获取列表 + queryTable(): void { + this.statusParamsTable.status = 1; + this.tableData = []; + this.http.get('/sysapi/oplog/list', this.search).subscribe((json) => { + if (json.is_success) { + this.tableData = json.body.recordList; + this.collectionSize = json.body.recordCount; + if (json.body.recordList && json.body.recordList.length > 0) { + this.statusParamsTable.status = 3; + } else { + this.statusParamsTable.status = 4; + } + } else { + this.statusParamsTable.status = 0; + } + }) + } + //翻页 + pageChange(event) { + this.search.page_index = event; + this.queryTable(); + } } diff --git a/src/app/pages/system-management/personal-settings/personal-settings.component.html b/src/app/pages/system-management/personal-settings/personal-settings.component.html index f3409a4..6941b8e 100644 --- a/src/app/pages/system-management/personal-settings/personal-settings.component.html +++ b/src/app/pages/system-management/personal-settings/personal-settings.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/app/pages/system-management/personal-settings/personal-settings.component.ts b/src/app/pages/system-management/personal-settings/personal-settings.component.ts index fd888b1..e6dacd9 100644 --- a/src/app/pages/system-management/personal-settings/personal-settings.component.ts +++ b/src/app/pages/system-management/personal-settings/personal-settings.component.ts @@ -41,9 +41,9 @@ export class PersonalSettingsComponent implements OnInit { ngOnInit() { // 页面监听 动态改变表单高度 - $('#main-box').css('height', (document.documentElement.clientHeight - 106 + 'px')); + $('#main-box-setting').css('height', (document.documentElement.clientHeight - 106 + 'px')); $(window).resize(function () { - $('#main-box').css('height', (document.documentElement.clientHeight - 106 + 'px')); + $('#main-box-setting').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 = [ diff --git a/src/app/pages/system-management/role-management/role-management.component.ts b/src/app/pages/system-management/role-management/role-management.component.ts index 87ee944..172c3a5 100644 --- a/src/app/pages/system-management/role-management/role-management.component.ts +++ b/src/app/pages/system-management/role-management/role-management.component.ts @@ -57,14 +57,15 @@ export class RoleManagementComponent implements OnInit { }) } //重置，重置搜索条件 - reset(){ - this.search.page_index=1; - this.search.page_size=10; - this.search.role_name=''; - this.queryTable(); - } + // reset(){ + // this.search.page_index=1; + // this.search.page_size=10; + // this.search.role_name=''; + // this.queryTable(); + // } //获取列表 queryTable():void{ + this.search.page_index=1; this.statusParamsTable.status=1; this.tableData=[]; this.http.get('/sysapi/setting/role/list',this.search).subscribe((json)=>{ diff --git a/src/app/pages/system-management/user-management/user-management.component.html b/src/app/pages/system-management/user-management/user-management.component.html index 167b320..3161ee9 100644 --- a/src/app/pages/system-management/user-management/user-management.component.html +++ b/src/app/pages/system-management/user-management/user-management.component.html @@ -5,7 +5,7 @@
    -
    +
    diff --git a/src/app/pages/system-management/user-management/user-management.component.ts b/src/app/pages/system-management/user-management/user-management.component.ts index c307aab..6b194a7 100644 --- a/src/app/pages/system-management/user-management/user-management.component.ts +++ b/src/app/pages/system-management/user-management/user-management.component.ts @@ -45,10 +45,10 @@ export class UserManagementComponent implements OnInit { ngOnInit() { // 页面监听 动态改变表单高度 $('#tree-box').css('height',(document.documentElement.clientHeight-106+'px')); - $('#main-box').css('height',(document.documentElement.clientHeight-106+'px')); + $('#main-box-user').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')); + $('#main-box-user').css('height',(document.documentElement.clientHeight-126+'px')); }) this.initTree(); this.queryTable(); @@ -96,15 +96,16 @@ export class UserManagementComponent implements OnInit { this.visible = false; } //重置，重置搜索条件 - reset(){ - this.search.page_index=1; - this.search.page_size=10; - this.search.real_name=''; - this.search.login_name=''; - this.queryTable(); - } + // reset(){ + // this.search.page_index=1; + // this.search.page_size=10; + // this.search.real_name=''; + // this.search.login_name=''; + // this.queryTable(); + // } //获取列表 queryTable():void{ + this.search.page_index=1; this.statusParamsTable.status=1; this.http.get('/sysapi/setting/user/list',this.search).subscribe((json)=>{ if(json.is_success){