diff --git a/src/app/pages/main.scss b/src/app/pages/main.scss index 43f4bdd..04473e5 100644 --- a/src/app/pages/main.scss +++ b/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{ 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..7c06993 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 } from 'ng-zorro-antd'; @Component({ selector: 'app-data-synchronize', @@ -6,10 +9,30 @@ import { Component, OnInit } from '@angular/core'; styleUrls: ['./data-synchronize.component.scss'] }) export class DataSynchronizeComponent implements OnInit { + selectedValue:any='1'; + dateRange:any=''; + search:any={ + date_start:'', + date_end:'' + } + constructor() { } - constructor() { } - - ngOnInit() { - } - + ngOnInit() { + } + 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; + } } 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/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/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.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 @@
-
- - - 角色管理 - - - 列表 - - -
-
+
diff --git a/src/app/pages/system-management/role-management/role-management.component.scss b/src/app/pages/system-management/role-management/role-management.component.scss index 43471b9..faa4367 100644 --- a/src/app/pages/system-management/role-management/role-management.component.scss +++ b/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{ 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 9514dff..87ee944 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 @@ -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修改 diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html index abcb59c..486eb33 100644 --- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html +++ b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html @@ -1,15 +1,4 @@
-
- - - 用户管理 - - - 新增用户 - 修改用户 - - -
diff --git a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss index 72ed262..1ee62fd 100644 --- a/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.scss +++ b/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; 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 a3e0501..ad95ddb 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 @@ -1,14 +1,4 @@
-
- - - 用户管理 - - - 列表 - - -
diff --git a/src/app/pages/system-management/user-management/user-management.component.scss b/src/app/pages/system-management/user-management/user-management.component.scss index 43471b9..a42cc05 100644 --- a/src/app/pages/system-management/user-management/user-management.component.scss +++ b/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; 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 8bdea13..6df9ba7 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 @@ -44,11 +44,11 @@ export class UserManagementComponent implements OnInit { ngOnInit() { // 页面监听 动态改变表单高度 - $('#tree-box').css('height',(document.documentElement.clientHeight-106+'px')); - $('#main-box').css('height',(document.documentElement.clientHeight-106+'px')); + $('#tree-box').css('height',(document.documentElement.clientHeight-126+'px')); + $('#main-box').css('height',(document.documentElement.clientHeight-126+'px')); $(window).resize(function(){ - $('#tree-box').css('height',(document.documentElement.clientHeight-106+'px')); - $('#main-box').css('height',(document.documentElement.clientHeight-106+'px')); + $('#tree-box').css('height',(document.documentElement.clientHeight-126+'px')); + $('#main-box').css('height',(document.documentElement.clientHeight-126+'px')); }) this.initTree(); this.queryTable();