diff --git a/src/app/pages/main.scss b/src/app/pages/main.scss index 33ef4a9..04473e5 100644 --- a/src/app/pages/main.scss +++ b/src/app/pages/main.scss @@ -18,7 +18,7 @@ .right{ float: right; } -.navigation{ +.navigation{ margin-bottom: 10px; } .system-main-container { @@ -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{ 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 cb1949a..f1d7628 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,3 +1,28 @@ -

- data-synchronize works! -

+
+
+
+
+ + 请求的消息类型 + + + + + + +
+
+ + 时间 + + + + +
+
+ +
+
\ No newline at end of file diff --git a/src/app/pages/system-management/data-synchronize/data-synchronize.component.scss b/src/app/pages/system-management/data-synchronize/data-synchronize.component.scss index e69de29..5c702da 100644 --- a/src/app/pages/system-management/data-synchronize/data-synchronize.component.scss +++ b/src/app/pages/system-management/data-synchronize/data-synchronize.component.scss @@ -0,0 +1,5 @@ +@import "../../main.scss"; +.user-footer{ + margin-left: 340px; + margin-top: 40px; +} \ 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 645ae82..8fbde75 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,4 +1,7 @@ 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'; @Component({ selector: 'app-data-synchronize', @@ -6,10 +9,46 @@ import { Component, OnInit } from '@angular/core'; 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, + ) { } - constructor() { } + 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; + } - ngOnInit() { - } + //保存 + 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/department-management/department-management.component.html b/src/app/pages/system-management/department-management/department-management.component.html index e69c64b..f925990 100644 --- a/src/app/pages/system-management/department-management/department-management.component.html +++ b/src/app/pages/system-management/department-management/department-management.component.html @@ -1,16 +1,4 @@
-
@@ -76,13 +64,6 @@ {{parentName|null}}
-
- - LOGO - - - -
机构负责人 diff --git a/src/app/pages/system-management/department-management/department-management.component.scss b/src/app/pages/system-management/department-management/department-management.component.scss index 4a6db33..fcc8c96 100644 --- a/src/app/pages/system-management/department-management/department-management.component.scss +++ b/src/app/pages/system-management/department-management/department-management.component.scss @@ -1,15 +1,18 @@ @import "../../main.scss"; .system-main-container{ - padding-top: 10px; .org-manage{ .main-content{ - overflow-y:scroll; + overflow-y:auto; + .detail-item-text { + line-height: 40px; + } .operation-box{ border-bottom: 1px solid #e8e8e8; padding-bottom: 20px; button{ margin-right: 10px; } + } .org-detail-logo{ width: 40px; diff --git a/src/app/pages/system-management/department-management/department-management.component.ts b/src/app/pages/system-management/department-management/department-management.component.ts index b9bc93d..d36c898 100644 --- a/src/app/pages/system-management/department-management/department-management.component.ts +++ b/src/app/pages/system-management/department-management/department-management.component.ts @@ -145,7 +145,6 @@ export class DepartmentManagementComponent implements OnInit { }) } let params=Object.assign({},this.validateForm.value,{pid:pid},{userList:userList}) - console.log(params) if(this.modifyType==1){ this.http.post('/sysapi/setting/organization/add/',params).subscribe((json)=>{ if(json.is_success){ @@ -172,7 +171,6 @@ export class DepartmentManagementComponent implements OnInit { } //保存机构负责人 userSave(){ - console.log(this.userData); this.userData.forEach(item=>{ if(item.checked&&!item.disabled){ // 增加数据 @@ -180,7 +178,6 @@ export class DepartmentManagementComponent implements OnInit { } }) this.visibleUsers = false; - console.log(this.userSelecteds) } //保存选择机构 treeSave(){ diff --git a/src/app/pages/system-management/operation-logs/operation-logs.component.scss b/src/app/pages/system-management/operation-logs/operation-logs.component.scss index 59da8bc..d463778 100644 --- a/src/app/pages/system-management/operation-logs/operation-logs.component.scss +++ b/src/app/pages/system-management/operation-logs/operation-logs.component.scss @@ -1,8 +1,9 @@ @import "../../main.scss"; .system-main-container{ + overflow-y:auto; .user-manage{ .system-main-content{ - overflow-y:scroll; + } .card{ 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 e52b9c8..cd64bf2 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 @@ -42,16 +42,23 @@ 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 { - this.search.date_start=new Date(result[0]).getTime(); - this.search.date_end=new Date(result[1]).getTime(); + 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(){ diff --git a/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts b/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts index 63aade6..851896b 100644 --- a/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts +++ b/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts @@ -64,7 +64,6 @@ export class ColorSettingsComponent implements OnInit { } //保存 save(){ - console.log(this.DataList) let settingContent=JSON.stringify(this.DataList); let params:any={ envCode:'web', @@ -72,7 +71,6 @@ export class ColorSettingsComponent implements OnInit { settingContent:settingContent, } this.isLoadingSave=true; - console.log(params); this.http.post('/adminapi/settings/uisettings',params).subscribe((json)=>{ this.isLoadingSave=false; if(json.is_success){ @@ -102,11 +100,9 @@ export class ColorSettingsComponent implements OnInit { if(data&&data.length>0){ data.forEach(item=>{ if(item.settingContent){ - console.log(222) let content=JSON.parse(item.settingContent); this.listsCope(content,this.DataList); }else{ - console.log(3333) this.listsCope(this.defaultList,this.DataList); } }) diff --git a/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.ts b/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.ts index 33300a1..2459f83 100644 --- a/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.ts +++ b/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.ts @@ -127,7 +127,6 @@ export class MsgAlertWarningComponent implements OnInit { settingContent:settingContent, } this.isLoadingSave=true; - console.log(params); this.http.post('/adminapi/settings/uisettings',params).subscribe((json)=>{ this.isLoadingSave=false; if(json.is_success){ @@ -158,17 +157,14 @@ export class MsgAlertWarningComponent implements OnInit { if(data&&data.length>0){ data.forEach(item=>{ if(item.settingContent){ - console.log(222) let content=JSON.parse(item.settingContent); this.listsCope(content.sourceList,this.sourceList); this.listsCope(content.targetList,this.targetList); }else{ - console.log(3333) this.listsCope(this.list,this.sourceList); } }) }else{ - console.log(5555) //接口数据为空,说明各个模块设置都为未初始化,可选项则为默认全部列 this.listsCope(this.list,this.sourceList); } 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 bd974e3..74c3bc2 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 @@ -213,8 +213,6 @@ export class PersonalSettingsComponent implements OnInit { groupCode:'userSettingFlyAgency', */ saveSelf(){ - console.log(this.targetList); - console.log(this.sourceList); this.sourceList.forEach((item,index)=>{ item.COL_ORDER=index+1 }) @@ -233,7 +231,6 @@ export class PersonalSettingsComponent implements OnInit { settingContent:settingContent, } this.isLoadingSave=true; - console.log(params); this.http.post('/adminapi/settings/uisettings',params).subscribe((json)=>{ this.isLoadingSave=false; if(json.is_success){ @@ -266,17 +263,14 @@ export class PersonalSettingsComponent implements OnInit { if(data&&data.length>0){ data.forEach(item=>{ if(item.settingContent){ - console.log(222) let content=JSON.parse(item.settingContent); this.listsCope(content.sourceList,this.sourceList); this.listsCope(content.targetList,this.targetList); }else{ - console.log(3333) this.listsCope(this.list,this.sourceList); } }) }else{ - console.log(5555) //接口数据为空,说明各个模块设置都为未初始化,可选项则为默认全部列 this.listsCope(this.list,this.sourceList); } diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html index c08c219..9839741 100644 --- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html +++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html @@ -1,15 +1,4 @@
-
diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss index fbfdb37..e5cab96 100644 --- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss +++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.scss @@ -1,10 +1,9 @@ @import "../../../main.scss"; .system-main-container{ - padding-top: 10px; + overflow-y:auto; } .user-modify-box{ position: relative; - overflow-y:auto; .user-footer{ text-align: center; margin-top: -20px; diff --git a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts index d14f70c..b9ebf22 100644 --- a/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts +++ b/src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.ts @@ -103,7 +103,6 @@ export class RoleManagementModifyComponent implements OnInit { permission:permission, user:users, }) - console.log(this.validateForm.value) this.isLoadingSave=true; if(this.modifyType==1){ this.http.post('/sysapi/setting/role/add/',this.validateForm.value).subscribe((json)=>{ @@ -132,8 +131,6 @@ export class RoleManagementModifyComponent implements OnInit { queryUserById():void{ this.http.get('/sysapi/setting/role/users/'+this.roleId).subscribe((json)=>{ if(json.is_success){ - console.log(12121212) - console.log(json.body) json.body.forEach(item=>{ item.checked=true; item.disabled=false; @@ -161,8 +158,6 @@ export class RoleManagementModifyComponent implements OnInit { status:item.status, }) this.permissionChecked=item.permission; - console.log(22211111) - console.log(this.permissionChecked) this.initTree(); }else{ this.statusParamsDetail=4; @@ -176,7 +171,6 @@ export class RoleManagementModifyComponent implements OnInit { } //保存机构负责人 userSave(){ - console.log(this.userData); this.userData.forEach(item=>{ if(item.checked&&!item.disabled){ // 增加数据 @@ -184,7 +178,6 @@ export class RoleManagementModifyComponent implements OnInit { } }) this.visibleUsers = false; - console.log(this.userSelecteds) } //处理机构负责人选择和数据回填 userSelect(){ @@ -245,13 +238,9 @@ export class RoleManagementModifyComponent implements OnInit { this.statusParamsUsers.status=4; } this.userData=data; - console.log(5555) - console.log(data) }else{ this.statusParamsUsers.status=0; } - console.log(66666) - console.log(this.userSelecteds) }) } @@ -333,7 +322,6 @@ export class RoleManagementModifyComponent implements OnInit { setNode(node){ this.permissionChecked.forEach(item=>{ if(item.pid==node.id){ - console.log(node.name) node.checked=true; } }) diff --git a/src/app/pages/system-management/role-management/role-management.component.html b/src/app/pages/system-management/role-management/role-management.component.html index e4744c7..13889ea 100644 --- a/src/app/pages/system-management/role-management/role-management.component.html +++ b/src/app/pages/system-management/role-management/role-management.component.html @@ -1,16 +1,6 @@
-
-
+