-
-
-
-
可选列
-
-
-
-
-
暂无数据
-
+ {
- 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 = {}));
+ }
}
/**
+
+
+
\ 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 0d5bed4..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,38 +1,39 @@
-.main-container{
- padding: 30px 20px;
- width: 100%;
- height: 100%;
- background-color: #fff;
- .self-row-box{
- display: inline-block;
- .self-row-footer{
+.system-main-container{
+ .ant-tabs{
+ .self-row-box{
display: inline-block;
- position: relative;
- margin-left: 46%;
- margin-top: 40px;
- transform:translate(-50%,0);
- button:first-child {
- margin-right: 20px;
- }
- }
- .self-row-content{
- .ant-transfer-list{
- width: 300px;
- height: 500px;
- .self-row-tips{
- text-align: center;
- position: relative;
- top: 190px;
+ .self-row-footer{
+ display: inline-block;
+ position: relative;
+ margin-left: 46%;
+ margin-top: 40px;
+ transform:translate(-50%,0);
+ button:first-child {
+ margin-right: 20px;
}
}
- .move-btn-box{
- display: inline-block;
- margin: 0 10px;
- position: relative;
- top: 60px;
- .move-btn{
- display: block;
- margin-bottom: 8px
+ .self-row-content{
+ .ant-transfer-list{
+ width: 300px;
+ height: 500px;
+ .self-row-tips{
+ text-align: center;
+ position: relative;
+ top: 190px;
+ }
+ .ant-transfer-list-header{
+ font-weight: bold;
+ }
+ }
+ .move-btn-box{
+ display: inline-block;
+ margin: 0 10px;
+ position: relative;
+ top: 60px;
+ .move-btn{
+ display: block;
+ margin-bottom: 8px
+ }
}
}
}
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 d9da7e1..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[] = []; //原始数据项
@@ -16,23 +19,38 @@ export class PersonalSettingsComponent implements OnInit {
public disabledUpTop:any=true; //置顶控制按钮可选状态 true 禁止选择 false可选择
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:'',
+ }
- moveIndex:any='false';
-
- constructor() { }
+ constructor(
+ private http:HttpClientService,
+ ) { }
ngOnInit() {
- //备注：实际数据中，把原始数据录入到临时变量中，方便取消按钮，重置数据
- this.sourceList=[{"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"} ]
+ /*
+ 备注：实际数据中，把原始数据录入到临时变量中，方便取消按钮，重置数据
+ 这里数组复制不能用浅复制sourceList=list;而是要用深度复制，this.sourceList=[...this.list]
+ */
+ this.list.forEach(item=>{
+ let option=this.deepCopy(item);
+ this.sourceList.push(option);
+ })
+ this.queryTable();
}
- //保存-自定义列显示保存
- saveSelf(){
- console.log(this.targetList);
-
- }
- //重置数据
- cancelSelf(){
-
+ //对象数组深度复制
+ deepCopy(data){
+ let itemObj={
+ bgColor:'#fafafa',
+ };
+ for(let key in data){
+ itemObj[key]=data[key];
+ }
+ return itemObj;
}
//上下调整项目顺序 type 1上移 2下移 3置顶 4置底 要做头尾判断
moveUpDown(type){
@@ -135,6 +153,33 @@ export class PersonalSettingsComponent implements OnInit {
this.disabledUpTop=true;
}
+ //保存-自定义列显示保存
+ saveSelf(){
+ console.log(this.targetList);
+ console.log(this.sourceList);
+ }
+ //重置数据
+ cancelSelf(){
+ this.sourceList=[];
+ //等后台接口出来后，重置this.sourceList this.targetList
+ //深度复制
+ this.list.forEach(item=>{
+ let option=this.deepCopy(item);
+ this.sourceList.push(option);
+ })
+ 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 9f7bd64..7791f3e 100644
--- a/src/app/pages/system-management/system-management.module.ts
+++ b/src/app/pages/system-management/system-management.module.ts
@@ -1,5 +1,7 @@
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';
import { PersonalSettingsComponent } from './personal-settings/personal-settings.component';
import { RoleManagementComponent } from './role-management/role-management.component';
@@ -8,22 +10,26 @@ 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';
import { registerLocaleData } from '@angular/common';
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
+ NgZorroAntdModule,
+ ColorPickerModule,
+ ReactiveFormsModule,
+ FormsModule
],
- /** 配置 ng-zorro-antd 国际化 **/
- providers : [ { provide: NZ_I18N, useValue: zh_CN } ],
declarations: [
SystemManagementComponent,
PersonalSettingsComponent,
@@ -31,6 +37,12 @@ registerLocaleData(zh);
UserManagementComponent,
DepartmentManagementComponent,
OperationLogsComponent,
- DataSynchronizeComponent]
+ DataSynchronizeComponent,
+ ColorSettingsComponent,
+ MsgAlertWarningComponent,
+ FlightAgencyComponent,
+
+ ],
+ 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 @@
-
+
- 消息警示提醒
-
-
- 消息声音提醒
-
-
- 航班代理
-
-
- ORMS启动路径
-
-
- 颜色配置
-
-
- 刷新设置
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
- 可选列（{{sourceList.length}}）
+
+
-
+
+
暂无数据
+
-
-
-
-
-
-
-
-
- 已选列
-
-
- -
-
-
暂无数据
-
+
+
+
+
+
+
+
+ 已选列（{{targetList.length}}）
+
+
+ -
+
+
暂无数据
+
+
+
+
+
-
-
-
-
+
-
- - 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
+
+
+
+
+
+
+