From 29a07c495081b95538fcbef56535649738286e8c Mon Sep 17 00:00:00 2001 From: liweijin <610336687@qq.com> Date: Fri, 14 Dec 2018 17:57:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E3=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AD=A6=E7=A4=BA=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operation-logs.component.html | 38 +++--- .../operation-logs.component.ts | 8 ++ .../color-settings.component.ts | 3 +- .../msg-alert-warning.component.html | 7 +- .../msg-alert-warning.component.ts | 126 ++++++++++++++---- .../personal-settings.component.ts | 7 +- .../role-management.component.ts | 5 +- 7 files changed, 141 insertions(+), 53 deletions(-) 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 ec5bc81..13b27f1 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 @@ -7,11 +7,19 @@ 关键词 - + -
+
+ + 时间 + + + + +
+
@@ -19,9 +27,7 @@
-
-
- +
@@ -29,24 +35,20 @@ - 时间 - 姓名 - 账号 - 日志类别 - 操作类别 - 描述 - 登录ip + 序号 + 用户名 + 模块 + 操作内容 + 操作时间 - - {{item.log_datetime| date:'yyyy-MM-dd HH:mm:ss'}} - {{item.real_name}} + + {{i+1}} {{item.user_name}} - {{logType[item.log_type]}} - {{item.opt_type}} + {{item.model_name}} {{item.summary}} - {{item.login_ip}} + {{item.log_datetime| date:'yyyy-MM-dd HH:mm:ss'}} diff --git a/src/app/pages/system-management/operation-logs/operation-logs.component.ts b/src/app/pages/system-management/operation-logs/operation-logs.component.ts index 937e471..e52b9c8 100644 --- a/src/app/pages/system-management/operation-logs/operation-logs.component.ts +++ b/src/app/pages/system-management/operation-logs/operation-logs.component.ts @@ -34,6 +34,7 @@ export class OperationLogsComponent implements OnInit { 'UPDATE':'修改', 'DELETE':'删除', }; + dateRange = []; constructor( private http:HttpClientService, private router:Router, @@ -48,16 +49,23 @@ export class OperationLogsComponent implements OnInit { }) this.queryTable(); } + onChange(result: Date): void { + this.search.date_start=new Date(result[0]).getTime(); + this.search.date_end=new Date(result[1]).getTime(); + } //重置，重置搜索条件 reset(){ this.search.page_index=1; this.search.page_size=10; this.search.keyword=''; + this.search.date_start=''; + this.search.date_end=''; this.queryTable(); } //获取列表 queryTable():void{ this.statusParamsTable.status=1; + this.tableData=[]; this.http.get('/sysapi/oplog/list',this.search).subscribe((json)=>{ if(json.is_success){ this.tableData=json.body.recordList; diff --git a/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts b/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts index a3dac5c..63aade6 100644 --- a/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts +++ b/src/app/pages/system-management/personal-settings/color-settings/color-settings.component.ts @@ -90,12 +90,13 @@ export class ColorSettingsComponent implements OnInit { //获取列表 queryTable():void{ this.statusParamsData.status=1; + this.tableData=[]; + this.DataList=[]; this.http.get('/adminapi/settings/uisettings',{groupCode:'userSettingColor'}).subscribe((json)=>{ if(json.is_success){ this.statusParamsData.status=3; let data=json.body; this.tableData=json.body; - this.DataList=[]; //当data为空是，初始化 //判断data是否为空，空的时候则为最初的初始化；如果不为空，则有设置过个人设置的某个模块 if(data&&data.length>0){ 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 478b399..e09e0bf 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 @@ -4,7 +4,8 @@
可选列（{{sourceList.length}}）
-
- - + +
\ No newline at end of file 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 970f55b..7be030e 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 @@ -1,44 +1,72 @@ import { Component, OnInit } from '@angular/core'; +import { HttpClientService } from '../../../../services/http-client.service'; +import { NzMessageService } from 'ng-zorro-antd'; @Component({ selector: 'app-msg-alert-warning', templateUrl: './msg-alert-warning.component.html', - styleUrls: ['./msg-alert-warning.component.scss'] + styleUrls: ['./msg-alert-warning.component.scss'], + providers:[HttpClientService] }) export class MsgAlertWarningComponent implements OnInit { public list: any[] = []; //原始数据项 public sourceList: any[] = []; //临时数据项-可选项 + public defaultData:any=[]; //默认的全部可选项 public targetList:any=[]; //临时数据项-已选项 public disableRight:any=true; //单个右移控制按钮可选状态 true 禁止选择 false可选择 public disabledLeft:any=true; //单个左移控制按钮可选状态 true 禁止选择 false可选择 public selectedType:any=''; //当前选中项所在项目 1在可选项 2在已选项框 public moveIndex:any='false'; - - constructor() { } + isLoadingSave:any=false; + statusParamsData:any={ //获取接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据 4请求成功，无数据 + status:1, + } + constructor( + private http:HttpClientService, + private message: NzMessageService, + ) { } 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"} ] - /* - 备注：实际数据中，把原始数据录入到临时变量中，方便取消按钮，重置数据 - 这里数组复制不能用浅复制sourceList=list;而是要用深度复制，this.sourceList=[...this.list] - */ - //深度复制 - this.list.forEach(item=>{ - let option=this.deepCopy(item); - this.sourceList.push(option); - }) + 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":"航站楼"}, + ] + this.queryTable(); } - //对象数组深度复制 deepCopy(data){ - let itemObj={ - bgColor:'#fafafa', - }; + let itemObj={}; for(let key in data){ itemObj[key]=data[key]; } return itemObj; } + //数组深度复制构造 + listsCope(sourceList,targetList){ + sourceList.forEach(item=>{ + let option=this.deepCopy(item); + targetList.push(option); + }) + } //左右选择项目 type 1右移 2左移 3全部右移 4全部左移 moveCross(type){ let index=this.moveIndex; @@ -87,19 +115,67 @@ export class MsgAlertWarningComponent implements OnInit { } //保存-自定义列显示保存 saveSelf(){ - console.log(this.targetList); - console.log(this.sourceList); + let content={ + defaultData:this.defaultData, + sourceList:this.sourceList, + targetList:this.targetList, + } + let settingContent=JSON.stringify(content); + let params:any={ + envCode:'web', + groupCode:'userSettingMsgAlert', + settingContent:settingContent, + } + this.isLoadingSave=true; + console.log(params); + this.http.post('/adminapi/settings/uisettings',params).subscribe((json)=>{ + this.isLoadingSave=false; + if(json.is_success){ + this.message.success(`保存成功!`); + this.queryTable(); + }else{ + this.message.error(`保存失败!`); + } + }) } //重置数据 cancelSelf(){ + this.queryTable(); + } + //获取列表 + queryTable():void{ + this.statusParamsData.status=1; + this.list=[]; this.sourceList=[]; - //等后台接口出来后，重置this.sourceList this.targetList - //深度复制 - this.list.forEach(item=>{ - let option=this.deepCopy(item); - this.sourceList.push(option); - }) this.targetList=[]; + this.http.get('/adminapi/settings/uisettings',{groupCode:'userSettingMsgAlert'}).subscribe((json)=>{ + if(json.is_success){ + this.statusParamsData.status=3; + let data=json.body; + //当data为空是，初始化 + this.listsCope(this.defaultData,this.list); + //判断data是否为空，空的时候则为最初的初始化；如果不为空，则有设置过个人设置的某个模块 + if(data&&data.length>0){ + data.forEach(item=>{ + if(item.settingContent){ + console.log(222) + let content=JSON.parse(item.settingContent); + this.listsCope(content.sourceList,this.sourceList); + this.listsCope(content.targetList,this.targetList); + }else{ + console.log(3333) + this.listsCope(this.list,this.sourceList); + } + }) + }else{ + console.log(5555) + //接口数据为空，说明各个模块设置都为未初始化,可选项则为默认全部列 + this.listsCope(this.list,this.sourceList); + } + }else{ + this.statusParamsData.status=0; + } + }) } } 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 adab357..bd974e3 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 @@ -251,14 +251,15 @@ export class PersonalSettingsComponent implements OnInit { //获取列表 queryTable():void{ this.statusParamsData.status=1; + this.list=[]; + this.sourceList=[]; + this.targetList=[]; + this.colsData=''; this.http.get('/adminapi/settings/uisettings',{groupCode:'userSettingCol'}).subscribe((json)=>{ if(json.is_success){ this.statusParamsData.status=3; let data=json.body; this.colsData=json.body; - this.list=[]; - this.sourceList=[]; - this.targetList=[]; //当data为空是，初始化 this.listsCope(this.defaultCols,this.list); //判断data是否为空，空的时候则为最初的初始化；如果不为空，则有设置过个人设置的某个模块 diff --git a/src/app/pages/system-management/role-management/role-management.component.ts b/src/app/pages/system-management/role-management/role-management.component.ts index e8da4f7..9514dff 100644 --- a/src/app/pages/system-management/role-management/role-management.component.ts +++ b/src/app/pages/system-management/role-management/role-management.component.ts @@ -4,7 +4,7 @@ import { Router } from '@angular/router'; import { NzMessageService } from 'ng-zorro-antd'; import 'ztree'; -declare var $: any; +declare var $: any; declare var jQuery: any; @Component({ @@ -27,8 +27,6 @@ export class RoleManagementComponent implements OnInit { page_size:'10', role_name:'', } - visible = false; //用户详情抽屉框显示隐藏 - userDetail:any={}; //用户详情 constructor( private http:HttpClientService, @@ -73,6 +71,7 @@ export class RoleManagementComponent implements OnInit { //获取列表 queryTable():void{ this.statusParamsTable.status=1; + this.tableData=[]; this.http.get('/sysapi/setting/role/list',this.search).subscribe((json)=>{ if(json.is_success){ this.tableData=json.body.list;