+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
-
-
-
-
-
-
-
-
-
-
-
-
- 暂无数据
-
+
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- 航班代理
-
-
- ORMS启动路径
-
-
-
-
-
- 刷新设置
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/system-management/personal-settings/personal-settings.component.scss b/src/app/pages/system-management/personal-settings/personal-settings.component.scss
index 76b13c8..ea262bb 100644
--- a/src/app/pages/system-management/personal-settings/personal-settings.component.scss
+++ b/src/app/pages/system-management/personal-settings/personal-settings.component.scss
@@ -1,11 +1,5 @@
-.main-container{
- padding: 30px 20px;
- width: 100%;
- height: 100%;
- min-height: 300px;
- background-color: #fff;
+.system-main-container{
.ant-tabs{
- height: 100%;
.self-row-box{
display: inline-block;
.self-row-footer{
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 ad9dca2..d8f8f01 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
@@ -1,9 +1,12 @@
import { Component, OnInit } from '@angular/core';
+import { HttpClientService } from '../../../services/http-client.service';
+
@Component({
selector: 'app-personal-settings',
templateUrl: './personal-settings.component.html',
- styleUrls: ['./personal-settings.component.scss']
+ styleUrls: ['./personal-settings.component.scss','../../main.scss'],
+ providers:[HttpClientService]
})
export class PersonalSettingsComponent implements OnInit {
public list: any[] = []; //原始数据项
@@ -17,8 +20,15 @@ export class PersonalSettingsComponent implements OnInit {
public disabledDownBtm:any=true; //最低控制按钮可选状态 true 禁止选择 false可选择
public selectedType:any=''; //当前选中项所在项目 1在可选项 2在已选项框
public moveIndex:any='false';
+ public search:any={
+ page_index:'1',
+ page_size:'10',
+ role_name:'',
+ }
- constructor() { }
+ constructor(
+ private http:HttpClientService,
+ ) { }
ngOnInit() {
this.list=[{"COL_CODE":"FLNO", "COL_CN":"航班号", "COL_ORDER":"10"}, {"COL_CODE":"ALCD", "COL_CN":"航空公司", "COL_ORDER":"8"}, {"COL_CODE":"FLIN", "COL_CN":"航线类别", "COL_ORDER":"4"}, {"COL_CODE":"FLTY", "COL_CN":"航班类别", "COL_ORDER":"5"}, {"COL_CODE":"MVIN", "COL_CN":"航向指示", "COL_ORDER":"9"}, {"COL_CODE":"TRML", "COL_CN":"候机楼", "COL_ORDER":"7"}, {"COL_CODE":"RENO", "COL_CN":"飞机号", "COL_ORDER":"3"}, {"COL_CODE":"SODT", "COL_CN":"计划到达/出发", "COL_ORDER":"13"}, {"COL_CODE":"ESTT", "COL_CN":"预计到达/出发", "COL_ORDER":"14"}, {"COL_CODE":"ACTT", "COL_CN":"实际到达/出发", "COL_ORDER":"15"}, {"COL_CODE":"STND", "COL_CN":"停机位", "COL_ORDER":"16"}, {"COL_CODE":"ORDER", "COL_CN":"排序", "COL_ORDER":"17"} ]
@@ -30,6 +40,7 @@ export class PersonalSettingsComponent implements OnInit {
let option=this.deepCopy(item);
this.sourceList.push(option);
})
+ this.queryTable();
}
//对象数组深度复制
deepCopy(data){
@@ -158,6 +169,17 @@ export class PersonalSettingsComponent implements OnInit {
})
this.targetList=[];
}
+ //获取列表
+ queryTable():void{
+ console.log(1111)
+ this.http.get('/sysapi/setting/user/list',this.search).subscribe((json)=>{
+ if(json.is_success){
+ console.log(2222)
+ }else{
+ alert(json.err_msg)
+ }
+ })
+ }
}
\ No newline at end of file
diff --git a/src/app/pages/system-management/system-management.module.ts b/src/app/pages/system-management/system-management.module.ts
index 351380a..7791f3e 100644
--- a/src/app/pages/system-management/system-management.module.ts
+++ b/src/app/pages/system-management/system-management.module.ts
@@ -1,4 +1,5 @@
import { NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { ColorPickerModule } from 'ngx-color-picker';
import { SystemManagementComponent } from './system-management.component';
@@ -9,6 +10,7 @@ import { DepartmentManagementComponent } from './department-management/departmen
import { OperationLogsComponent } from './operation-logs/operation-logs.component';
import { DataSynchronizeComponent } from './data-synchronize/data-synchronize.component';
+
import { SystemManagementRouting } from './system-management-routing.module'
import { NgZorroAntdModule, NZ_I18N, zh_CN } from 'ng-zorro-antd';
@@ -17,14 +19,16 @@ import zh from '@angular/common/locales/zh';
registerLocaleData(zh);
import { ColorSettingsComponent } from './personal-settings/color-settings/color-settings.component';
import { MsgAlertWarningComponent } from './personal-settings/msg-alert-warning/msg-alert-warning.component';
+import { FlightAgencyComponent } from './personal-settings/flight-agency/flight-agency.component';
@NgModule({
imports: [
CommonModule,
SystemManagementRouting,
- /** 导入 ng-zorro-antd 模块 **/
NgZorroAntdModule,
- ColorPickerModule
+ ColorPickerModule,
+ ReactiveFormsModule,
+ FormsModule
],
declarations: [
SystemManagementComponent,
@@ -36,8 +40,9 @@ import { MsgAlertWarningComponent } from './personal-settings/msg-alert-warning/
DataSynchronizeComponent,
ColorSettingsComponent,
MsgAlertWarningComponent,
+ FlightAgencyComponent,
+
],
- /** 配置 ng-zorro-antd 国际化 **/
providers : [ { provide: NZ_I18N, useValue: zh_CN } ],
})
export class SystemManagementModule { }
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 e453d52..6d449f1 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,3 +1,10 @@
-
- user-management works!
-
+
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 e69de29..c251a11 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
@@ -0,0 +1,5 @@
+.user-manage{
+ .card{
+
+ }
+}
\ No newline at end of file
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 a374bb2..fa650e0 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
@@ -1,15 +1,98 @@
import { Component, OnInit } from '@angular/core';
+import { HttpClientService } from '../../../services/http-client.service';
+
+import 'ztree';
+declare var $: any;
+declare var jQuery: any;
@Component({
selector: 'app-user-management',
templateUrl: './user-management.component.html',
- styleUrls: ['./user-management.component.scss']
+ styleUrls: ['./user-management.component.scss','../../main.scss']
})
export class UserManagementComponent implements OnInit {
+ treeSelected:any; //树模型-当前选中项
+ public search:any={
+ page_index:'1',
+ page_size:'10',
+ real_name:'',
+ login_name:'',
+ orgId:'',
+ }
+ parentNode:any;
+ parentName:any;
+ isTreeTop:any=false; //判断是否为树最顶层
- constructor() { }
+ constructor(
+ private http:HttpClientService,
+ ) { }
- ngOnInit() {
- }
+ ngOnInit() {
+ this.initTree();
+ }
+ //树模型参数设置
+ public zNodes: any[];
+ setting = {
+ data: {
+ simpleData: {
+ enable: true
+ }
+ },
+ view: {
+ showLine: false,
+ dblClickExpand: false,
+ showIcon:true
+ },
+ callback: {
+ //节点点击事件
+ onClick: (event, treeId, treeNode, clickFlag) => {
+ var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+ zTree.expandNode(treeNode);
+ this.treeSelected=treeNode;
+ this.search.orgId=this.treeSelected.id;
+ this.parentNode=this.treeSelected.getParentNode();
+ if(!this.parentNode){
+ this.isTreeTop=true;
+ }else{
+ this.isTreeTop=false;
+ }
+ },
+ //节点展开事件
+ onExpand: (event, treeId, treeNode) => {
+
+ }
+ },
+ };
+ //新树模型
+ initTree(){
+ //获取目录列表
+ this.http.get("/sysapi/setting/organization/list",).subscribe(json=>{
+ if(json.is_success&&json.body){
+ let children=[];
+ for(var i=0;i
{
- return this.commonProcess(this.httpClient.get(url, options = {}));
+ } ): Observable {
+ let paramsString = [];
+ url = url + '?'
+ let t = Math.random();
+ if (params&¶ms) {
+ for (const key in params) {
+ if (params[key] !== '') {
+ paramsString.push([key, params[key]].join('='))
+ }
+ }
+ return this.commonProcess(this.httpClient.get(encodeURI(url + paramsString.join('&') + '&t=' + t), options = {}));
+ }else{
+ return this.commonProcess(this.httpClient.get(url + 't=' + t, options = {}));
+ }
}
/**
From 08403bb834e20ba59aca357a4ad831c72721226e Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Fri, 16 Nov 2018 11:52:45 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/basic-data-service.ts | 48 ++++++++++++++++++++++++++++
src/app/pages/main/main.component.ts | 9 +++++-
src/app/pages/main/main.module.ts | 4 ++-
src/app/pages/pages.component.ts | 18 +++++++----
src/app/pages/pages.module.ts | 5 ++-
5 files changed, 74 insertions(+), 10 deletions(-)
create mode 100644 src/app/pages/basic-data-service.ts
diff --git a/src/app/pages/basic-data-service.ts b/src/app/pages/basic-data-service.ts
new file mode 100644
index 0000000..ca0ac9f
--- /dev/null
+++ b/src/app/pages/basic-data-service.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@angular/core';
+import { HttpClientService } from '../services/http-client.service';
+import { Subject } from 'rxjs'
+
+@Injectable()
+export class BasicDataService{
+ public checkin_group;
+ public checkin_group_subject = new Subject();
+ public gate;
+ public gate_subject = new Subject();
+ public terminal;
+ public terminal_subject = new Subject();
+ public chut;
+ public chut_subject = new Subject();
+ public stand;
+ public stand_subject = new Subject();
+ public carousel;
+ public carousel_subject = new Subject();
+ public checkin_desk;
+ public checkin_desk_subject = new Subject();
+ public airport;
+ public airport_subject = new Subject();
+ public city;
+ public city_subject = new Subject();
+ public aircraft_type;
+ public aircraft_type_subject = new Subject();
+ public aircraft;
+ public aircraft_subject = new Subject();
+ public terminal_area;
+ public terminal_area_subject = new Subject();
+ public airline;
+ public airline_subject = new Subject();
+
+ constructor(
+ private httpClient:HttpClientService
+ ){}
+
+ loadBasicData(){
+ console.log('---')
+ this.httpClient.get('/adminapi/basicdata/checkinGroups').subscribe(
+ data=>{
+ console.log(data)
+ }
+ )
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts
index e65d89d..bd2a7ac 100644
--- a/src/app/pages/main/main.component.ts
+++ b/src/app/pages/main/main.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { ChangeDetectorRef } from '@angular/core';
import { HttpClientService } from '../../services/http-client.service';
+import {BasicDataService} from '../basic-data-service'
import dateFormatter from '../../utils/data-formatter';
import routeType from '../../utils/route-type';
@@ -18,9 +19,15 @@ import * as $ from 'jquery';
export class MainComponent implements OnInit {
constructor(
+
+ private basicDataService:BasicDataService,
private httpCilent: HttpClientService,
private changeDetectorRef: ChangeDetectorRef
- ) { }
+ ) {
+ this.basicDataService.checkin_group_subject.subscribe(val=>{
+ console.log(val)
+ })
+ }
public raw_data: Array