From 651bad5fc560371e71d5aff1cc073fb48a79fd81 Mon Sep 17 00:00:00 2001 From: liweijin <610336687@qq.com> Date: Mon, 17 Dec 2018 17:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E5=AF=BC=E8=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/main.scss | 3 ++ .../department-management.component.html | 12 ++++++ .../department-management.component.scss | 1 + .../operation-logs.component.html | 1 + .../msg-alert-warning.component.html | 4 +- .../msg-alert-warning.component.ts | 42 +++++++++---------- .../role-management-modify.component.html | 11 +++++ .../role-management-modify.component.scss | 5 ++- .../role-management.component.html | 10 +++++ .../role-management.component.scss | 1 + .../user-management-modify.component.html | 11 +++++ .../user-management.component.html | 10 +++++ .../user-management.component.scss | 1 + 13 files changed, 88 insertions(+), 24 deletions(-) diff --git a/src/app/pages/main.scss b/src/app/pages/main.scss index 212039e..33ef4a9 100644 --- a/src/app/pages/main.scss +++ b/src/app/pages/main.scss @@ -18,6 +18,9 @@ .right{ float: right; } +.navigation{ + margin-bottom: 10px; +} .system-main-container { position: relative; padding: 20px 20px; 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 69aee83..e69c64b 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,4 +1,16 @@
+
+ + + 部门管理 + + + 新增 + 修改 + 详情 + + +
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 44baedb..4a6db33 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,5 +1,6 @@ @import "../../main.scss"; .system-main-container{ + padding-top: 10px; .org-manage{ .main-content{ overflow-y:scroll; 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 13b27f1..7f0ae1a 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,6 +1,7 @@
+
diff --git a/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.html b/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.html index e09e0bf..8700560 100644 --- a/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.html +++ b/src/app/pages/system-management/personal-settings/msg-alert-warning/msg-alert-warning.component.html @@ -2,7 +2,7 @@
-
可选列（{{sourceList.length}}）
+
备选的类别（{{sourceList.length}}）
    @@ -18,7 +18,7 @@
-
已选列（{{targetList.length}}）
+
已选的类别（{{targetList.length}}）
    • 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 7be030e..33300a1 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 @@ -28,27 +28,27 @@ export class MsgAlertWarningComponent implements OnInit { ngOnInit() { this.defaultData=[ - {"COL_CODE":" FLOP-CNCL", "COL_CN":"航班取消"}, - {"COL_CODE":" FLOP-FRET", "COL_CN":"航班返回"}, - {"COL_CODE":" FLOP-FDIV", "COL_CN":"航班备降"}, - {"COL_CODE":" FLOP-FDEL", "COL_CN":"航班删除"}, - {"COL_CODE":" FLOP-DELY", "COL_CN":"航班延误"}, - {"COL_CODE":" FLOP-ACTT", "COL_CN":"实际时间"}, - {"COL_CODE":" FLOP-GTDT", "COL_CN":"登机门消息"}, - {"COL_CODE":" FLOP-PSDT", "COL_CN":"机位变更"}, - {"COL_CODE":" FLOP-ESTT", "COL_CN":"预计到达时间"}, - {"COL_CODE":" FLOP-PADT", "COL_CN":"前站起飞"}, - {"COL_CODE":" FLOP-CKDT", "COL_CN":"值机柜台"}, - {"COL_CODE":" FLOP-BOTM", "COL_CN":"登机开始"}, - {"COL_CODE":" FLOP-CLDT", "COL_CN":"行李转盘"}, - {"COL_CODE":" FLOP-ROUT", "COL_CN":"航班航线"}, - {"COL_CODE":" FLOP-VIPP", "COL_CN":"航班VIP"}, - {"COL_CODE":" FLOP-HNAG", "COL_CN":"服务代理"}, - {"COL_CODE":" FLOP-FLBG", "COL_CN":"首末件行李到达"}, - {"COL_CODE":" FLOP-RENO", "COL_CN":"飞机号变更"}, - {"COL_CODE":" FLOP-ABTM", "COL_CN":"登桥撤桥"}, - {"COL_CODE":" FLOP-CHOT", "COL_CN":"上下轮档"}, - {"COL_CODE":" FLOP-TRML", "COL_CN":"航站楼"}, + {"COL_CODE":"FLOP-CNCL", "COL_CN":"航班取消"}, + {"COL_CODE":"FLOP-FRET", "COL_CN":"航班返回"}, + {"COL_CODE":"FLOP-FDIV", "COL_CN":"航班备降"}, + {"COL_CODE":"FLOP-FDEL", "COL_CN":"航班删除"}, + {"COL_CODE":"FLOP-DELY", "COL_CN":"航班延误"}, + {"COL_CODE":"FLOP-ACTT", "COL_CN":"实际时间"}, + {"COL_CODE":"FLOP-GTDT", "COL_CN":"登机门消息"}, + {"COL_CODE":"FLOP-PSDT", "COL_CN":"机位变更"}, + {"COL_CODE":"FLOP-ESTT", "COL_CN":"预计到达时间"}, + {"COL_CODE":"FLOP-PADT", "COL_CN":"前站起飞"}, + {"COL_CODE":"FLOP-CKDT", "COL_CN":"值机柜台"}, + {"COL_CODE":"FLOP-BOTM", "COL_CN":"登机开始"}, + {"COL_CODE":"FLOP-CLDT", "COL_CN":"行李转盘"}, + {"COL_CODE":"FLOP-ROUT", "COL_CN":"航班航线"}, + {"COL_CODE":"FLOP-VIPP", "COL_CN":"航班VIP"}, + {"COL_CODE":"FLOP-HNAG", "COL_CN":"服务代理"}, + {"COL_CODE":"FLOP-FLBG", "COL_CN":"首末件行李到达"}, + {"COL_CODE":"FLOP-RENO", "COL_CN":"飞机号变更"}, + {"COL_CODE":"FLOP-ABTM", "COL_CN":"登桥撤桥"}, + {"COL_CODE":"FLOP-CHOT", "COL_CN":"上下轮档"}, + {"COL_CODE":"FLOP-TRML", "COL_CN":"航站楼"}, ] this.queryTable(); } 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 9839741..c08c219 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,4 +1,15 @@
    +
    + + + 角色管理 + + + 新增角色 + 修改角色 + + +
    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 41e3b9e..fbfdb37 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,7 +1,10 @@ @import "../../../main.scss"; + .system-main-container{ + padding-top: 10px; + } .user-modify-box{ position: relative; - overflow-y:scroll; + 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 e262611..e4744c7 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,4 +1,14 @@
    +
    + + + 角色管理 + + + 列表 + + +
    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 a42cc05..43471b9 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,5 +1,6 @@ @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-modify/user-management-modify.component.html b/src/app/pages/system-management/user-management/user-management-modify/user-management-modify.component.html index 486eb33..abcb59c 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,4 +1,15 @@
    +
    + + + 用户管理 + + + 新增用户 + 修改用户 + + +
    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 ad95ddb..a3e0501 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,4 +1,14 @@
    +
    + + + 用户管理 + + + 列表 + + +
    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 a42cc05..43471b9 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,5 +1,6 @@ @import "../../main.scss"; .system-main-container{ + padding-top: 10px; .user-manage{ .system-main-content{ overflow-y:scroll;