cdia/airport-chengdu-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

个人设置开发

Browse Source
This commit is contained in:
liweijin
2018-11-15 18:29:55 +08:00
parent 58eff4ad23
commit ae65e0ae65
17 changed files with 343 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
angular.json
+6 -2
View File
@@ -35,11 +35,15 @@
"node_modules/bootstrap/scss/bootstrap.scss", "node_modules/bootstrap/scss/bootstrap.scss",
"node_modules/font-awesome/scss/font-awesome.scss", "node_modules/font-awesome/scss/font-awesome.scss",
"node_modules/ng-zorro-antd/ng-zorro-antd.min.css", "node_modules/ng-zorro-antd/ng-zorro-antd.min.css",
"src/styles.scss" "src/styles.scss",
"node_modules/ztree/css/zTreeStyle/zTreeStyle.css"
], ],
"scripts": [ "scripts": [
"node_modules/jquery/dist/jquery.min.js", "node_modules/jquery/dist/jquery.min.js",
"node_modules/bootstrap/dist/js/bootstrap.min.js" "node_modules/bootstrap/dist/js/bootstrap.min.js",
"node_modules/ztree/js/jquery.ztree.core.min.js",
"node_modules/ztree/js/jquery.ztree.excheck.min.js",
"node_modules/ztree/js/jquery.ztree.exhide.min.js"
] ]
}, },
"configurations": { "configurations": {
package.json
+3 -2
View File
@@ -3,7 +3,7 @@
"version": "0.0.0", "version": "0.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve --proxy-config proxy.conf.json",
"build": "ng build", "build": "ng build",
"test": "ng test", "test": "ng test",
"lint": "ng lint", "lint": "ng lint",
@@ -27,7 +27,8 @@
"ng-zorro-antd": "^1.8.0", "ng-zorro-antd": "^1.8.0",
"ngx-color-picker": "^7.0.1", "ngx-color-picker": "^7.0.1",
"rxjs": "^6.0.0", "rxjs": "^6.0.0",
"zone.js": "^0.8.26" "zone.js": "^0.8.26",
"ztree": "^3.5.24"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.6.1", "@angular-devkit/build-angular": "~0.6.1",
proxy.conf.json
+10
View File
@@ -0,0 +1,10 @@
{
"/sysapi":{
"target": "http://130.120.3.231:91",
"secure": false,
"changeOrigin": true,
"ws": true
}
}
src/app/pages/main.scss
+42
View File
@@ -0,0 +1,42 @@
.system-main-container {
padding: 20px 20px;
width: 100%;
height: 100%;
min-height: 300px;
background-color: #f0f0f0;
.system-main-body{
height: 100%;
width: 100%;
}
}
.card{
height: 100%;
background: #fff;
padding: 20px;
box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
}
.tree-box{
float: left;
padding: 20px;
height: 100%;
background: #fff;
box-shadow: 1px 1px 4px 1px rgba(0,0,0,0.15);
}
/* 目录树样式 */
:host /deep/ ul.tree{
padding-left: 25px;
line-height: 30px;
list-style: none;
}
:host /deep/ .node-value{
display: inline-block;
padding: 0 10px;
border-radius:3px;
cursor: pointer;
}
:host /deep/ .node-selected{
background-color: #dcdcdc
}
src/app/pages/system-management/personal-settings/color-settings/color-settings.component.scss
+2 -2
View File
@@ -6,11 +6,11 @@
display: inline-block; display: inline-block;
margin-right: 10px; margin-right: 10px;
margin-bottom: 10px; margin-bottom: 10px;
width: 524px; width: 444px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
text-align: center; text-align: center;
border-radius: 4px; border-radius: 2px;
} }
.setting-bg-color{ .setting-bg-color{
margin-right: 10px; margin-right: 10px;
src/app/pages/system-management/personal-settings/flight-agency/flight-agency.component.html
+15
View File
@@ -0,0 +1,15 @@
<div class="flight-agency-container">
<p>请选择需要提示的航班代理</p>
<div class="radio-group-box">
<nz-radio-group [(ngModel)]="radioValue">
<label nz-radio nzValue="1">全部代理</label>
<label nz-radio nzValue="2">机场代理</label>
<label nz-radio nzValue="3">国航代理</label>
<label nz-radio nzValue="4">川航代理</label>
</nz-radio-group>
</div>
<div class="self-row-footer">
<button (click)='save()' nzTitle="保存配置" nzPlacement="top" nz-tooltip nz-button nzSize="large" nzType="primary"><i class="fa fa-check" aria-hidden="true"></i> 确定</button>
<button (click)='cancel()' nzTitle="取消配置" nzPlacement="top" nz-tooltip nz-button nzSize="large" nzType="default"><i class="fa fa-times" aria-hidden="true"></i> 取消</button>
</div>
</div>
src/app/pages/system-management/personal-settings/flight-agency/flight-agency.component.scss
+15
View File
@@ -0,0 +1,15 @@
.flight-agency-container{
.radio-group-box{
}
.self-row-footer{
display: inline-block;
position: relative;
margin-left: 46%;
margin-top: 100px;
transform:translate(-50%,0);
button:first-child {
margin-right: 20px;
}
}
}
src/app/pages/system-management/personal-settings/flight-agency/flight-agency.component.spec.ts
+25
View File
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FlightAgencyComponent } from './flight-agency.component';
describe('FlightAgencyComponent', () => {
let component: FlightAgencyComponent;
let fixture: ComponentFixture<FlightAgencyComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ FlightAgencyComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(FlightAgencyComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/pages/system-management/personal-settings/flight-agency/flight-agency.component.ts
+23
View File
@@ -0,0 +1,23 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-flight-agency',
templateUrl: './flight-agency.component.html',
styleUrls: ['./flight-agency.component.scss']
})
export class FlightAgencyComponent implements OnInit {
public radioValue='1';
constructor() { }
ngOnInit() {
}
//保存
save(){
}
//取消
cancel(){
}
}
src/app/pages/system-management/personal-settings/personal-settings.component.html
+52 -56
View File
@@ -1,63 +1,59 @@
<div class="main-container"> <div class="system-main-container">
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'"> <div class="card">
<nz-tab nzTitle="自定义显示列"> <nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
<div class="self-row-box"> <nz-tab nzTitle="自定义显示列">
<div class="self-row-content"> <div class="self-row-box">
<div class="ant-transfer-list"> <div class="self-row-content">
<div class="ant-transfer-list-header">可选列（{{sourceList.length}}）</div> <div class="ant-transfer-list">
<div class="ant-transfer-list-body"> <div class="ant-transfer-list-header">可选列（{{sourceList.length}}）</div>
<ul class="ant-transfer-list-content"> <div class="ant-transfer-list-body">
<li (click)="selectNode(item,i,1)" [ngClass]="{'bg':moveIndex==i&&selectedType==1}" class="ant-transfer-list-content-item ng-star-inserted" *ngFor="let item of sourceList;let i=index"><label class="ant-checkbox-wrapper ng-untouched ng-pristine ng-valid"><span>{{item.COL_CN}}</span></label></li> <ul class="ant-transfer-list-content">
<div class="self-row-tips" *ngIf="!(sourceList.length>0)">暂无数据</div> <li (click)="selectNode(item,i,1)" [ngClass]="{'bg':moveIndex==i&&selectedType==1}" class="ant-transfer-list-content-item ng-star-inserted" *ngFor="let item of sourceList;let i=index"><label class="ant-checkbox-wrapper ng-untouched ng-pristine ng-valid"><span>{{item.COL_CN}}</span></label></li>
</ul> <div class="self-row-tips" *ngIf="!(sourceList.length>0)">暂无数据</div>
</ul>
</div>
</div> </div>
</div> <div class="move-btn-box">
<div class="move-btn-box"> <button (click)='moveCross(3)' nzTitle="全部右移" nzPlacement="left" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='!(sourceList.length>0)' nzType="primary"><i nz-icon type="double-right" theme="outline"></i></button>
<button (click)='moveCross(3)' nzTitle="全部右移" nzPlacement="left" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='!(sourceList.length>0)' nzType="primary"><i nz-icon type="double-right" theme="outline"></i></button> <button (click)='moveCross(1)' nzTitle="右移" nzPlacement="left" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disableRight||sourceList.length==0' nzType="primary"><i nz-icon type="right" theme="outline"></i></button>
<button (click)='moveCross(1)' nzTitle="右移" nzPlacement="left" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disableRight||sourceList.length==0' nzType="primary"><i nz-icon type="right" theme="outline"></i></button> <button (click)='moveCross(2)' nzTitle="左移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disabledLeft||targetList.length==0' nzType="primary"><i nz-icon type="left" theme="outline"></i></button>
<button (click)='moveCross(2)' nzTitle="左移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disabledLeft||targetList.length==0' nzType="primary"><i nz-icon type="left" theme="outline"></i></button> <button (click)='moveCross(4)' nzTitle="全部左移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='!(targetList.length>0)' nzType="primary"><i nz-icon type="double-left" theme="outline"></i></button>
<button (click)='moveCross(4)' nzTitle="全部左移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='!(targetList.length>0)' nzType="primary"><i nz-icon type="double-left" theme="outline"></i></button> </div>
</div> <div class="ant-transfer-list">
<div class="ant-transfer-list"> <div class="ant-transfer-list-header">已选列（{{targetList.length}}）</div>
<div class="ant-transfer-list-header">已选列（{{targetList.length}}）</div> <div class="ant-transfer-list-body">
<div class="ant-transfer-list-body"> <ul class="ant-transfer-list-content">
<ul class="ant-transfer-list-content"> <li (click)="selectNode(item,i,2)" [ngClass]="{'bg':moveIndex==i&&selectedType==2}" class="ant-transfer-list-content-item ng-star-inserted" *ngFor="let item of targetList;let i=index"><label class="ant-checkbox-wrapper ng-untouched ng-pristine ng-valid"><span>{{item.COL_CN}}</span></label></li>
<li (click)="selectNode(item,i,2)" [ngClass]="{'bg':moveIndex==i&&selectedType==2}" class="ant-transfer-list-content-item ng-star-inserted" *ngFor="let item of targetList;let i=index"><label class="ant-checkbox-wrapper ng-untouched ng-pristine ng-valid"><span>{{item.COL_CN}}</span></label></li> <div class="self-row-tips" *ngIf="!(targetList.length>0)">暂无数据</div>
<div class="self-row-tips" *ngIf="!(targetList.length>0)">暂无数据</div> </ul>
</ul>
</div>
</div>
<div class="move-btn-box">
<button (click)='moveUpDown(3)' nzTitle="置顶" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disabledUpTop' nzType="primary"><i nz-icon type="arrow-up" theme="outline"></i></button>
<button (click)='moveUpDown(1)' nzTitle="上移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disableUp' nzType="primary"><i nz-icon type="up" theme="outline"></i></button>
<button (click)='moveUpDown(2)' nzTitle="下移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disableDown' nzType="primary"><i nz-icon type="down" theme="outline"></i></button>
<button (click)='moveUpDown(4)' nzTitle="置底" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disabledDownBtm' nzType="primary"><i nz-icon type="arrow-down" theme="outline"></i></button>
</div> </div>
</div> </div>
<div class="move-btn-box"> <div class="self-row-footer">
<button (click)='moveUpDown(3)' nzTitle="置顶" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disabledUpTop' nzType="primary"><i nz-icon type="arrow-up" theme="outline"></i></button> <button (click)='saveSelf()' nzTitle="保存配置" nzPlacement="top" nz-tooltip nz-button nzSize="large" nzType="primary"><i class="fa fa-check" aria-hidden="true"></i> 确定</button>
<button (click)='moveUpDown(1)' nzTitle="上移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disableUp' nzType="primary"><i nz-icon type="up" theme="outline"></i></button> <button (click)='cancelSelf()' nzTitle="取消配置" nzPlacement="top" nz-tooltip nz-button nzSize="large" nzType="default"><i class="fa fa-times" aria-hidden="true"></i> 取消</button>
<button (click)='moveUpDown(2)' nzTitle="下移" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disableDown' nzType="primary"><i nz-icon type="down" theme="outline"></i></button>
<button (click)='moveUpDown(4)' nzTitle="置底" nzPlacement="right" nz-tooltip class="move-btn" nz-button nzSize="large" [disabled]='disabledDownBtm' nzType="primary"><i nz-icon type="arrow-down" theme="outline"></i></button>
</div> </div>
</div> </div>
<div class="self-row-footer"> </nz-tab>
<button (click)='saveSelf()' nzTitle="保存配置" nzPlacement="top" nz-tooltip nz-button nzSize="large" nzType="primary"><i class="fa fa-check" aria-hidden="true"></i> 确定</button> <nz-tab nzTitle="消息警示提醒">
<button (click)='cancelSelf()' nzTitle="取消配置" nzPlacement="top" nz-tooltip nz-button nzSize="large" nzType="default"><i class="fa fa-times" aria-hidden="true"></i> 取消</button> <app-msg-alert-warning></app-msg-alert-warning>
</div> </nz-tab>
</div> <nz-tab nzTitle="消息声音提醒">
</nz-tab> <app-msg-alert-warning></app-msg-alert-warning>
<nz-tab nzTitle="消息警示提醒"> </nz-tab>
<app-msg-alert-warning></app-msg-alert-warning> <nz-tab nzTitle="航班代理">
</nz-tab> <app-flight-agency></app-flight-agency>
<nz-tab nzTitle="消息声音提醒"> </nz-tab>
<app-msg-alert-warning></app-msg-alert-warning> <nz-tab nzTitle="颜色配置">
</nz-tab> <app-color-settings></app-color-settings>
<nz-tab nzTitle="航班代理"> </nz-tab>
航班代理 </nz-tabset>
</nz-tab> </div>
<nz-tab nzTitle="ORMS启动路径">
ORMS启动路径
</nz-tab>
<nz-tab nzTitle="颜色配置">
<app-color-settings></app-color-settings>
</nz-tab>
<nz-tab nzTitle="刷新设置">
刷新设置
</nz-tab>
</nz-tabset>
</div> </div>
src/app/pages/system-management/personal-settings/personal-settings.component.scss
+1 -7
View File
@@ -1,11 +1,5 @@
.main-container{ .system-main-container{
padding: 30px 20px;
width: 100%;
height: 100%;
min-height: 300px;
background-color: #fff;
.ant-tabs{ .ant-tabs{
height: 100%;
.self-row-box{ .self-row-box{
display: inline-block; display: inline-block;
.self-row-footer{ .self-row-footer{
src/app/pages/system-management/personal-settings/personal-settings.component.ts
+24 -2
View File
@@ -1,9 +1,12 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { HttpClientService } from '../../../services/http-client.service';
@Component({ @Component({
selector: 'app-personal-settings', selector: 'app-personal-settings',
templateUrl: './personal-settings.component.html', templateUrl: './personal-settings.component.html',
styleUrls: ['./personal-settings.component.scss'] styleUrls: ['./personal-settings.component.scss','../../main.scss'],
providers:[HttpClientService]
}) })
export class PersonalSettingsComponent implements OnInit { export class PersonalSettingsComponent implements OnInit {
public list: any[] = []; //原始数据项 public list: any[] = []; //原始数据项
@@ -17,8 +20,15 @@ export class PersonalSettingsComponent implements OnInit {
public disabledDownBtm:any=true; //最低控制按钮可选状态 true 禁止选择 false可选择 public disabledDownBtm:any=true; //最低控制按钮可选状态 true 禁止选择 false可选择
public selectedType:any=''; //当前选中项所在项目 1在可选项 2在已选项框 public selectedType:any=''; //当前选中项所在项目 1在可选项 2在已选项框
public moveIndex:any='false'; public moveIndex:any='false';
public search:any={
page_index:'1',
page_size:'10',
role_name:'',
}
constructor() { } constructor(
private http:HttpClientService,
) { }
ngOnInit() { 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"} ] 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); let option=this.deepCopy(item);
this.sourceList.push(option); this.sourceList.push(option);
}) })
this.queryTable();
} }
//对象数组深度复制 //对象数组深度复制
deepCopy(data){ deepCopy(data){
@@ -158,6 +169,17 @@ export class PersonalSettingsComponent implements OnInit {
}) })
this.targetList=[]; 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)
}
})
}
} }
src/app/pages/system-management/system-management.module.ts
+8 -3
View File
@@ -1,4 +1,5 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ColorPickerModule } from 'ngx-color-picker'; import { ColorPickerModule } from 'ngx-color-picker';
import { SystemManagementComponent } from './system-management.component'; 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 { OperationLogsComponent } from './operation-logs/operation-logs.component';
import { DataSynchronizeComponent } from './data-synchronize/data-synchronize.component'; import { DataSynchronizeComponent } from './data-synchronize/data-synchronize.component';
import { SystemManagementRouting } from './system-management-routing.module' import { SystemManagementRouting } from './system-management-routing.module'
import { NgZorroAntdModule, NZ_I18N, zh_CN } from 'ng-zorro-antd'; import { NgZorroAntdModule, NZ_I18N, zh_CN } from 'ng-zorro-antd';
@@ -17,14 +19,16 @@ import zh from '@angular/common/locales/zh';
registerLocaleData(zh); registerLocaleData(zh);
import { ColorSettingsComponent } from './personal-settings/color-settings/color-settings.component'; import { ColorSettingsComponent } from './personal-settings/color-settings/color-settings.component';
import { MsgAlertWarningComponent } from './personal-settings/msg-alert-warning/msg-alert-warning.component'; import { MsgAlertWarningComponent } from './personal-settings/msg-alert-warning/msg-alert-warning.component';
import { FlightAgencyComponent } from './personal-settings/flight-agency/flight-agency.component';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
SystemManagementRouting, SystemManagementRouting,
/** 导入 ng-zorro-antd 模块 **/
NgZorroAntdModule, NgZorroAntdModule,
ColorPickerModule ColorPickerModule,
ReactiveFormsModule,
FormsModule
], ],
declarations: [ declarations: [
SystemManagementComponent, SystemManagementComponent,
@@ -36,8 +40,9 @@ import { MsgAlertWarningComponent } from './personal-settings/msg-alert-warning/
DataSynchronizeComponent, DataSynchronizeComponent,
ColorSettingsComponent, ColorSettingsComponent,
MsgAlertWarningComponent, MsgAlertWarningComponent,
FlightAgencyComponent,
], ],
/** 配置 ng-zorro-antd 国际化 **/
providers : [ { provide: NZ_I18N, useValue: zh_CN } ], providers : [ { provide: NZ_I18N, useValue: zh_CN } ],
}) })
export class SystemManagementModule { } export class SystemManagementModule { }
src/app/pages/system-management/user-management/user-management.component.html
+10 -3
View File
@@ -1,3 +1,10 @@
<p> <div class="system-main-container">
user-management works! <div class="user-manage">
</p> <div class="tree-box">
<ul id="treeDemo" class="ztree"></ul>
</div>
<div class="card">
</div>
</div>
</div>
src/app/pages/system-management/user-management/user-management.component.scss
+5
View File
@@ -0,0 +1,5 @@
.user-manage{
.card{
}
}
src/app/pages/system-management/user-management/user-management.component.ts
+87 -4
View File
@@ -1,15 +1,98 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { HttpClientService } from '../../../services/http-client.service';
import 'ztree';
declare var $: any;
declare var jQuery: any;
@Component({ @Component({
selector: 'app-user-management', selector: 'app-user-management',
templateUrl: './user-management.component.html', templateUrl: './user-management.component.html',
styleUrls: ['./user-management.component.scss'] styleUrls: ['./user-management.component.scss','../../main.scss']
}) })
export class UserManagementComponent implements OnInit { 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<json.body.length;i++){
let option=json.body[i];
option.name=option.organization;
if(option.pid){
option.pId=option.pid;
}else{
option.pId='hsfuhiw34239j89sauf98992h3indshv98h392hf9mplsd032fs2a2313fc';
}
}
json.body.push({
name:"全部机构",
isParent:true,
open:true,
id:'hsfuhiw34239j89sauf98992h3indshv98h392hf9mplsd032fs2a2313fc',
})
}
this.zNodes=json.body;
$.fn.zTree.init($("#treeDemo"), this.setting, this.zNodes);
var zTree = $.fn.zTree.getZTreeObj("treeDemo");
let node = zTree.getNodes();
})
}
} }
src/app/services/http-client.service.ts
+15 -3
View File
@@ -60,15 +60,27 @@ export class HttpClientService {
* @param url * @param url
* @param options * @param options
*/ */
get(url: string, options: { get(url: string,params?:object, options?: {
headers?: HttpHeaders | { [header: string]: string | string[] }, headers?: HttpHeaders | { [header: string]: string | string[] },
observe?: HttpObserve, observe?: HttpObserve,
params?: HttpParams | { [param: string]: string | string[] }, params?: HttpParams | { [param: string]: string | string[] },
reportProgress?: boolean, reportProgress?: boolean,
responseType?: 'arraybuffer' | 'blob' | 'json' | 'text', responseType?: 'arraybuffer' | 'blob' | 'json' | 'text',
withCredentials?: boolean, withCredentials?: boolean,
} = {}): Observable<any> { } ): Observable<any> {
return this.commonProcess(this.httpClient.get(url, options = {})); let paramsString = [];
url = url + '?'
let t = Math.random();
if (params&&params) {
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 = {}));
}
} }
/** /**