From 142b7a2d00b24fa48abd2a6b764686d2345997fc Mon Sep 17 00:00:00 2001 From: zhouyuejun <505127606@qq.com> Date: Mon, 11 Mar 2019 17:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=8F=9C=E5=8D=95=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=8F=8A=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/app/pages/main/main.component.ts | 56 ++--- src/app/pages/pages.component.ts | 194 +++--------------- .../department-management.component.ts | 19 +- .../role-management-modify.component.ts | 4 +- .../user-management-modify.component.html | 4 +- .../user-management-modify.component.ts | 2 +- 7 files changed, 74 insertions(+), 207 deletions(-) diff --git a/package.json b/package.json index 86540aa..58f77ce 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve --proxy-config proxy.conf.json", + "start": "ng serve --port 8080 --proxy-config proxy.conf.json", "build": "ng build", "test": "ng test", "lint": "ng lint", diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index ac3e750..aed4930 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -126,34 +126,34 @@ export class MainComponent implements OnInit { this.calcVisibleCount(); }.bind(this) - //订阅航班更新 - // this.websocketService.dynamicsMessage().subscribe( - // event => { - // setInterval(() => { - // let msg = { "topic": "heart-beat", "message": "" }; - // this.websocketService.websocket.send(JSON.stringify(msg)); - // }, 30000); - // let data = JSON.parse(event as string); - // if (data.topic === 'schd') { - // let message = JSON.parse(data.message); - // // console.log(message); - // //是否可以开始处理动态消息 - // if (this.canHandleDynamicMessage) { - // this.dynamicMessageHandle(message); - // } else { - // this.dynamicMessageArray.push(message); - // } - // } else if (data.topic === 'msg') { - // let message = JSON.parse(data.message); - // // console.log(message); - // if (this.canHandleDynamicAlert) { - // this.dynamicAlertHandle(message); - // } else { - // this.dynamicAlertArray.push(message); - // } - // } - // } - // ) + // 订阅航班更新 + this.websocketService.dynamicsMessage().subscribe( + event => { + setInterval(() => { + let msg = { "topic": "heart-beat", "message": "" }; + this.websocketService.websocket.send(JSON.stringify(msg)); + }, 30000); + let data = JSON.parse(event as string); + if (data.topic === 'schd') { + let message = JSON.parse(data.message); + // console.log(message); + //是否可以开始处理动态消息 + if (this.canHandleDynamicMessage) { + this.dynamicMessageHandle(message); + } else { + this.dynamicMessageArray.push(message); + } + } else if (data.topic === 'msg') { + let message = JSON.parse(data.message); + // console.log(message); + if (this.canHandleDynamicAlert) { + this.dynamicAlertHandle(message); + } else { + this.dynamicAlertArray.push(message); + } + } + } + ) this.httpCilent.get('/adminapi/settings/uisettings').subscribe( data => { diff --git a/src/app/pages/pages.component.ts b/src/app/pages/pages.component.ts index 2d38e60..0513871 100644 --- a/src/app/pages/pages.component.ts +++ b/src/app/pages/pages.component.ts @@ -19,175 +19,7 @@ export class PagesComponent implements OnInit { public role_type: string; public menuClose: boolean = false; public isSpinning: any = false; - menuData = [ - { - "name": "航班动态", - "icon": 'fa-plane', - "isExpend": false, - "isActive": true, - "path": "/app/main" - }, - { - "name": "季度计划", - "icon": 'fa-cube', - "isExpend": false, - "isActive": false, - "path": "/app/season" - }, - { - "name": "历史数据", - "icon": 'fa-history', - "isExpend": false, - "isActive": false, - "path": "/app/history" - }, - { - "name": "基础数据", - "icon": 'fa-database', - "isExpend": false, - "children": [ - { - "name": "值机岛", - "icon": "fa-eercast", - "isExpend": false, - "isActive": false, - "path": "/app/basic/checkingroup" - }, - { - "name": "登机门", - "icon": "fa-h-square", - "isExpend": false, - "isActive": false, - "path": "/app/basic/gate" - }, - { - "name": "航站楼", - "icon": "fa-wpexplorer", - "isExpend": false, - "isActive": false, - "path": "/app/basic/terminal" - }, - { - "name": "行李传送带", - "icon": "fa-ils", - "isExpend": false, - "isActive": false, - "path": "/app/basic/chut" - }, - { - "name": "行李转盘", - "icon": "fa-connectdevelop", - "isExpend": false, - "isActive": false, - "path": "/app/basic/carousel" - }, - { - "name": "机位", - "icon": "fa-exchange", - "isExpend": false, - "isActive": false, - "path": "/app/basic/stand" - }, - { - "name": "值机柜台", - "icon": "fa-desktop", - "isExpend": false, - "isActive": false, - "path": "/app/basic/checkindesk" - }, - { - "name": "机场", - "icon": "fa-fighter-jet", - "isExpend": false, - "isActive": false, - "path": "/app/basic/airport" - }, - { - "name": "城市", - "icon": "fa-globe", - "isExpend": false, - "isActive": false, - "path": "/app/basic/city" - }, - { - "name": "机型", - "icon": "fa-file-text-o", - "isExpend": false, - "isActive": false, - "path": "/app/basic/aircrafttype" - }, - { - "name": "飞机", - "icon": "fa-plane", - "isExpend": false, - "isActive": false, - "path": "/app/basic/aircraft" - }, - { - "name": "航站楼区域", - "icon": "fa-area-chart", - "isExpend": false, - "isActive": false, - "path": "/app/basic/terminalarea" - }, - { - "name": "航空公司", - "icon": "fa-building-o", - "isExpend": false, - "isActive": false, - "path": "/app/basic/airline" - }, - ] - }, - { - "name": "系统管理", - "icon": "fa-window-restore", - "isExpend": false, - "children": [ - { - "name": "个人设置", - "icon": "fa-cog", - "isExpend": false, - "isActive": false, - "path": "/app/system/settings" - }, - { - "name": "角色管理", - "icon": "fa-users", - "isExpend": false, - "isActive": false, - "path": "/app/system/roles" - }, - { - "name": "用户管理", - "icon": "fa-user", - "isExpend": false, - "isActive": false, - "path": "/app/system/users" - }, - { - "name": "部门管理", - "icon": "fa-street-view", - "isExpend": false, - "isActive": false, - "path": "/app/system/departments" - }, - { - "name": "操作日志", - "icon": "fa-sticky-note", - "isExpend": false, - "isActive": false, - "path": "/app/system/logs" - }, - { - "name": "数据同步", - "icon": "fa-refresh", - "isExpend": false, - "isActive": false, - "path": "/app/system/synchronization" - }, - ] - }] + menuData = [] constructor( private router: Router, @@ -202,7 +34,31 @@ export class PagesComponent implements OnInit { this.basicDataService.loadBasicData(); } + menuDataHandle(menu) { + menu['name'] = menu.data.menu.title; + menu['icon'] = menu.data.menu.icon; + menu['isExpend'] = false; + menu['isActive'] = false; + delete menu.data; + if (menu.children && menu.children.length > 0) { + menu.children.forEach(menu => { + this.menuDataHandle(menu); + }) + } + } + ngOnInit() { + this.httpClient.get('/sysapi/common/menu/list', { sysid: 1 }).subscribe( + res => { + let menuList = res.body.children[0].children; + menuList.forEach(menu => { + this.menuDataHandle(menu); + }) + // console.log(menuList); + this.menuData = menuList; + } + ) + if (sessionStorage.getItem('userInfo')) { this.user_name = JSON.parse(sessionStorage.getItem('userInfo')).login_name; this.role_type = JSON.parse(sessionStorage.getItem('userInfo')).real_name; 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 b604b33..62bca4d 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 @@ -94,7 +94,16 @@ export class DepartmentManagementComponent implements OnInit { if(type==1){ }else if(type==2){ - let item=this.orgDetail; + let item=this.orgDetail; + // console.log(item); + this.zNodesChild=this.zNodes.concat(); + for(let i = 0;i0){ 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 31df3d5..af903f3 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 @@ -107,16 +107,15 @@ export class RoleManagementModifyComponent implements OnInit { this.isLoadingSave = true; if (this.modifyType == 1) { this.http.post('/sysapi/setting/role/add/', this.validateForm.value).subscribe((json) => { - this.isLoadingSave = true; if (json.is_success) { this.message.success(`新增成功!`); this.router.navigate(['app/system/roles']) } else { this.message.error(`新增失败!`); } + this.isLoadingSave = false; }) } else if (this.modifyType == 2) { - this.isLoadingSave = true; this.http.put('/sysapi/setting/role/update/' + this.roleId, this.validateForm.value).subscribe((json) => { if (json.is_success) { this.message.success(`修改成功!`); @@ -124,6 +123,7 @@ export class RoleManagementModifyComponent implements OnInit { } else { this.message.error(`修改失败!`); } + this.isLoadingSave = false; }) } 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 ab2a7c7..de783d0 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 @@ -112,11 +112,11 @@ - +
+ [disabled]='!this.validateForm.valid||!this.orgDetail||!this.nameOnly'>保存
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 0479e5d..b124853 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 @@ -62,7 +62,7 @@ export class UserManagementModifyComponent implements OnInit { mobile: [''], sex: ['m'], status: ['1'], - roleList: [''], + roleList: ['', [Validators.required]], remark: [''] }); //取路由参数