Merge branch 'develop-2'

src/app/pages/main.scss

@@ -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/system-management/data-synchronize/data-synchronize.component.html

@@ -1,3 +1,28 @@
-<p>
+<div class="system-main-container"> 
-  data-synchronize works!
+	<div class="system-main-content card">
-</p>
+		<div nz-row>
+			<div nz-col nzSpan="8"> 
+						<nz-form-item >
+							<nz-form-label class="left">请求的消息类型</nz-form-label>
+							<nz-form-control nzSpan="10">
+							  <nz-select style="width: 160px;" [(ngModel)]="selectedValue" nzAllowClear nzPlaceHolder="Choose">
+						        <nz-option nzValue="1" nzLabel="日航班计划"></nz-option>
+						      </nz-select>
+							</nz-form-control>
+						</nz-form-item>
+					</div>
+			<div nz-col nzSpan="9"> 
+				<nz-form-item >
+					<nz-form-label class="left">时间</nz-form-label>
+					<nz-form-control nzSpan="20">
+					  <nz-range-picker [(ngModel)]="dateRange" (ngModelChange)="onChange($event)" nzShowTime></nz-range-picker>
+					</nz-form-control>
+				</nz-form-item>
+			</div>
+		</div>
+		<div class="user-footer">
+			<button (click)='save()'  nz-button nzType="primary"  class="mr10" [disabled]='!dateRange'>确定</button>
+			<button (click)='cancel()' nz-button nzType="default">取消</button>
+		</div>
+	</div>
+</div>

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;
+}

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';
-  constructor() { }
+	dateRange:any='';
+	search:any={
+		startDate:'',
+		endDate:''
+	}
+	constructor(
+		private http:HttpClientService,
+		private message: NzMessageService,
+		private modal: NzModalService,
+		) { }
 
 	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;
+	}
+
+	//保存
+	save(){
+		this.http.post('/msgexchangeapi/schd/sync',this.search).subscribe((json)=>{
+		   if(json.is_success){
+		       this.message.success(`提交成功!`);
+		     }else{
+		       this.message.error(`提交失败!`);
+		     }
+		})
+	}
 
 }

src/app/pages/system-management/department-management/department-management.component.html

@@ -1,16 +1,4 @@
 <div class="system-main-container"> 
-	<div class="navigation">
-		<nz-breadcrumb>
-	      <nz-breadcrumb-item>
-	        部门管理
-	      </nz-breadcrumb-item>
-	      <nz-breadcrumb-item>
-	         <span *ngIf='modifyType==1'>新增</span>
-	        <span *ngIf='modifyType==2'>修改</span>
-	        <span *ngIf='modifyType==3'>详情</span>
-	      </nz-breadcrumb-item>
-	    </nz-breadcrumb>
-	</div>
 	<div class="org-manage">
 		<div class="tree-box">
 			<app-request-status [statusParams]='statusParamsTree'></app-request-status>
@@ -76,13 +64,6 @@
 							<span class="detail-item-text">{{parentName|null}}</span>
 						</nz-form-item>
 					</div>
-					<div nz-col nzSpan="24">
-						<nz-form-item>
-							<nz-form-label>LOGO</nz-form-label>
-							<span *ngIf='!orgDetail.logo'>无</span>
-							<img *ngIf='orgDetail.logo' class="org-detail-logo" [src]="orgDetail.logo" alt="">
-						</nz-form-item>
-					</div>
 					<div nz-col nzSpan="24">
 						<nz-form-item>
 							<nz-form-label>机构负责人</nz-form-label>

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;

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

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{
 			

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_start=this.changeDate(result[0]);
-		this.search.date_end=new Date(result[1]).getTime();
+		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(){

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);
 						}
 					})

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);
 				}

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);
 				}

src/app/pages/system-management/role-management/role-management-modify/role-management-modify.component.html

@@ -1,15 +1,4 @@
 <div class="system-main-container">
-	<div class="navigation">
-		<nz-breadcrumb>
-	      <nz-breadcrumb-item>
-	        <a [routerLink]="['../']">角色管理</a>
-	      </nz-breadcrumb-item>
-	      <nz-breadcrumb-item>
-	        <span *ngIf='modifyType==1'>新增角色</span>
-	        <span *ngIf='modifyType==2'>修改角色</span>
-	      </nz-breadcrumb-item>
-	    </nz-breadcrumb>
-	</div>
 	<div class="user-modify-box card" id="main-container">
 		<app-request-status *ngIf="modifyType==2" [statusParams]='statusParamsDetail'></app-request-status>
 		<nz-skeleton [nzActive]="true"  [nzParagraph]="{ rows: 16 }" *ngIf='modifyType==2&&statusParamsDetail.status==1'></nz-skeleton>

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;

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;
       		}
       	})

src/app/pages/system-management/role-management/role-management.component.html

@@ -1,16 +1,6 @@
 <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" id="main-box">
+		<div class="system-main-content card">
 			<div class="search-box">
 				<div nz-row>
 					<div nz-col nzSpan="8">

src/app/pages/system-management/role-management/role-management.component.scss

@@ -1,9 +1,9 @@
 @import "../../main.scss";
 .system-main-container{
-	padding-top: 10px;
+	overflow-y:auto;
 	.user-manage{ 
 		.system-main-content{
-			overflow-y:scroll;
+			min-height: 500px;
 		}
 		.card{
 			

src/app/pages/system-management/role-management/role-management.component.ts

@@ -35,11 +35,6 @@ 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修改

src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html

@@ -1,15 +1,4 @@
 <div class="system-main-container">
-	<div class="navigation">
-		<nz-breadcrumb>
-	      <nz-breadcrumb-item>
-	        <a [routerLink]="['../']">用户管理</a>
-	      </nz-breadcrumb-item>
-	      <nz-breadcrumb-item>
-	        <span *ngIf='modifyType==1'>新增用户</span>
-	        <span *ngIf='modifyType==2'>修改用户</span>
-	      </nz-breadcrumb-item>
-	    </nz-breadcrumb>
-	</div>
 	<div class="user-modify-box card" id="main-container">
 		<app-request-status *ngIf="modifyType==2" [statusParams]='statusParamsDetail'></app-request-status>
 		<nz-skeleton [nzActive]="true"  [nzParagraph]="{ rows: 16 }" *ngIf='modifyType==2&&statusParamsDetail.status==1'></nz-skeleton>

src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss

@@ -1,6 +1,8 @@
+.system-main-container{
+	overflow-y:auto;
+}
 .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-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) => {

src/app/pages/system-management/user-management/user-management.component.html

@@ -1,14 +1,4 @@
 <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="tree-box" id="tree-box">
 			<app-request-status [statusParams]='statusParamsTree'></app-request-status>

src/app/pages/system-management/user-management/user-management.component.scss

@@ -1,6 +1,5 @@
 @import "../../main.scss";
 .system-main-container{
-	padding-top: 10px;
 	.user-manage{ 
 		.system-main-content{
 			overflow-y:scroll;

src/app/pages/system-management/user-management/user-management.component.ts

@@ -44,11 +44,11 @@ export class UserManagementComponent implements OnInit {
 
 	ngOnInit() {
 		// 页面监听 动态改变表单高度
-		$('#tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
+		$('#tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
-		$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
+		$('#main-box').css('height',(document.documentElement.clientHeight-126+'px'));
 		$(window).resize(function(){
-			$('#tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
+			$('#tree-box').css('height',(document.documentElement.clientHeight-126+'px'));
-			$('#main-box').css('height',(document.documentElement.clientHeight-106+'px'));
+			$('#main-box').css('height',(document.documentElement.clientHeight-126+'px'));
 		})
 		this.initTree();
 		this.queryTable();