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 7c06993..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,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { HttpClientService } from '../../../services/http-client.service'; import { Router } from '@angular/router'; -import { NzMessageService } from 'ng-zorro-antd'; +import { NzMessageService,NzModalRef, NzModalService } from 'ng-zorro-antd'; @Component({ selector: 'app-data-synchronize', @@ -12,16 +12,20 @@ export class DataSynchronizeComponent implements OnInit { selectedValue:any='1'; dateRange:any=''; search:any={ - date_start:'', - date_end:'' + startDate:'', + endDate:'' } - constructor() { } + constructor( + private http:HttpClientService, + private message: NzMessageService, + private modal: NzModalService, + ) { } ngOnInit() { } onChange(result: Date): void { - this.search.date_start=this.changeDate(result[0]); - this.search.date_end=this.changeDate(result[1]); + this.search.startDate=this.changeDate(result[0]); + this.search.endDate=this.changeDate(result[1]); } //日期时间处理 @@ -35,4 +39,16 @@ export class DataSynchronizeComponent implements OnInit { var s = date.getSeconds()<10?'0'+date.getSeconds():date.getSeconds()+''; return Y+'-'+M+'-'+D+' '+h+':'+m+':'+s; } + + //保存 + 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.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/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.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/user-management/user-management-modify/user-management-modify.component.ts b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts index 0a48e7f..303fc1f 100644 --- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.ts @@ -116,8 +116,6 @@ export class UserManagementModifyComponent implements OnInit { } //检验系统账号的唯一性 checkName(){ - console.log(this.validateForm.value.login_name.trim()) - console.log(this.oldLoginName) if(this.modifyType==2&&this.validateForm.value.login_name.trim()==this.oldLoginName){ this.nameOnly = true; this.checkNameStatus='success'; @@ -241,7 +239,6 @@ export class UserManagementModifyComponent implements OnInit { params.orgList.push(option) } }) - console.log(params) this.isLoadingSave=true; if(type==1){ this.http.post('/sysapi/setting/user/add', params).subscribe((json) => {