Merge branch 'develop-2'
This commit is contained in:
zhouyuejun
+6
-1
@@ -24,7 +24,12 @@
|
||||
"tsConfig": "src/tsconfig.app.json",
|
||||
"assets": [
|
||||
"src/favicon.ico",
|
||||
"src/assets"
|
||||
"src/assets",
|
||||
{
|
||||
"glob": "**/*",
|
||||
"input": "./node_modules/@ant-design/icons-angular/src/inline-svg/",
|
||||
"output": "/assets/"
|
||||
}
|
||||
],
|
||||
"styles": [
|
||||
"node_modules/bootstrap/scss/bootstrap.scss",
|
||||
|
||||
Generated
+532
@@ -249,6 +249,7 @@
|
||||
"requires": {
|
||||
"anymatch": "1.3.2",
|
||||
"async-each": "1.0.1",
|
||||
"fsevents": "1.2.4",
|
||||
"glob-parent": "2.0.0",
|
||||
"inherits": "2.0.3",
|
||||
"is-binary-path": "1.0.1",
|
||||
@@ -1759,6 +1760,7 @@
|
||||
"anymatch": "2.0.0",
|
||||
"async-each": "1.0.1",
|
||||
"braces": "2.3.2",
|
||||
"fsevents": "1.2.4",
|
||||
"glob-parent": "3.1.0",
|
||||
"inherits": "2.0.3",
|
||||
"is-binary-path": "1.0.1",
|
||||
@@ -3619,6 +3621,535 @@
|
||||
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
|
||||
"dev": true
|
||||
},
|
||||
"fsevents": {
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
|
||||
"integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"nan": "2.11.1",
|
||||
"node-pre-gyp": "0.10.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"abbrev": {
|
||||
"version": "1.1.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"ansi-regex": {
|
||||
"version": "2.1.1",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"aproba": {
|
||||
"version": "1.2.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"are-we-there-yet": {
|
||||
"version": "1.1.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"delegates": "1.0.0",
|
||||
"readable-stream": "2.3.6"
|
||||
}
|
||||
},
|
||||
"balanced-match": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"brace-expansion": {
|
||||
"version": "1.1.11",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"balanced-match": "1.0.0",
|
||||
"concat-map": "0.0.1"
|
||||
}
|
||||
},
|
||||
"chownr": {
|
||||
"version": "1.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"code-point-at": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"concat-map": {
|
||||
"version": "0.0.1",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"console-control-strings": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"core-util-is": {
|
||||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"debug": {
|
||||
"version": "2.6.9",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"ms": "2.0.0"
|
||||
}
|
||||
},
|
||||
"deep-extend": {
|
||||
"version": "0.5.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"delegates": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"detect-libc": {
|
||||
"version": "1.0.3",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"fs-minipass": {
|
||||
"version": "1.2.5",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"minipass": "2.2.4"
|
||||
}
|
||||
},
|
||||
"fs.realpath": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"gauge": {
|
||||
"version": "2.7.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"aproba": "1.2.0",
|
||||
"console-control-strings": "1.1.0",
|
||||
"has-unicode": "2.0.1",
|
||||
"object-assign": "4.1.1",
|
||||
"signal-exit": "3.0.2",
|
||||
"string-width": "1.0.2",
|
||||
"strip-ansi": "3.0.1",
|
||||
"wide-align": "1.1.2"
|
||||
}
|
||||
},
|
||||
"glob": {
|
||||
"version": "7.1.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"fs.realpath": "1.0.0",
|
||||
"inflight": "1.0.6",
|
||||
"inherits": "2.0.3",
|
||||
"minimatch": "3.0.4",
|
||||
"once": "1.4.0",
|
||||
"path-is-absolute": "1.0.1"
|
||||
}
|
||||
},
|
||||
"has-unicode": {
|
||||
"version": "2.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"iconv-lite": {
|
||||
"version": "0.4.21",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"safer-buffer": "2.1.2"
|
||||
}
|
||||
},
|
||||
"ignore-walk": {
|
||||
"version": "3.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"minimatch": "3.0.4"
|
||||
}
|
||||
},
|
||||
"inflight": {
|
||||
"version": "1.0.6",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"once": "1.4.0",
|
||||
"wrappy": "1.0.2"
|
||||
}
|
||||
},
|
||||
"inherits": {
|
||||
"version": "2.0.3",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"ini": {
|
||||
"version": "1.3.5",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"is-fullwidth-code-point": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"number-is-nan": "1.0.1"
|
||||
}
|
||||
},
|
||||
"isarray": {
|
||||
"version": "1.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"minimatch": {
|
||||
"version": "3.0.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"brace-expansion": "1.1.11"
|
||||
}
|
||||
},
|
||||
"minimist": {
|
||||
"version": "0.0.8",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"minipass": {
|
||||
"version": "2.2.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"safe-buffer": "5.1.1",
|
||||
"yallist": "3.0.2"
|
||||
}
|
||||
},
|
||||
"minizlib": {
|
||||
"version": "1.1.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"minipass": "2.2.4"
|
||||
}
|
||||
},
|
||||
"mkdirp": {
|
||||
"version": "0.5.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"minimist": "0.0.8"
|
||||
}
|
||||
},
|
||||
"ms": {
|
||||
"version": "2.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"needle": {
|
||||
"version": "2.2.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"debug": "2.6.9",
|
||||
"iconv-lite": "0.4.21",
|
||||
"sax": "1.2.4"
|
||||
}
|
||||
},
|
||||
"node-pre-gyp": {
|
||||
"version": "0.10.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"detect-libc": "1.0.3",
|
||||
"mkdirp": "0.5.1",
|
||||
"needle": "2.2.0",
|
||||
"nopt": "4.0.1",
|
||||
"npm-packlist": "1.1.10",
|
||||
"npmlog": "4.1.2",
|
||||
"rc": "1.2.7",
|
||||
"rimraf": "2.6.2",
|
||||
"semver": "5.5.0",
|
||||
"tar": "4.4.1"
|
||||
}
|
||||
},
|
||||
"nopt": {
|
||||
"version": "4.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"abbrev": "1.1.1",
|
||||
"osenv": "0.1.5"
|
||||
}
|
||||
},
|
||||
"npm-bundled": {
|
||||
"version": "1.0.3",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"npm-packlist": {
|
||||
"version": "1.1.10",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"ignore-walk": "3.0.1",
|
||||
"npm-bundled": "1.0.3"
|
||||
}
|
||||
},
|
||||
"npmlog": {
|
||||
"version": "4.1.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"are-we-there-yet": "1.1.4",
|
||||
"console-control-strings": "1.1.0",
|
||||
"gauge": "2.7.4",
|
||||
"set-blocking": "2.0.0"
|
||||
}
|
||||
},
|
||||
"number-is-nan": {
|
||||
"version": "1.0.1",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"object-assign": {
|
||||
"version": "4.1.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"once": {
|
||||
"version": "1.4.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"wrappy": "1.0.2"
|
||||
}
|
||||
},
|
||||
"os-homedir": {
|
||||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"os-tmpdir": {
|
||||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"osenv": {
|
||||
"version": "0.1.5",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"os-homedir": "1.0.2",
|
||||
"os-tmpdir": "1.0.2"
|
||||
}
|
||||
},
|
||||
"path-is-absolute": {
|
||||
"version": "1.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"process-nextick-args": {
|
||||
"version": "2.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"rc": {
|
||||
"version": "1.2.7",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"deep-extend": "0.5.1",
|
||||
"ini": "1.3.5",
|
||||
"minimist": "1.2.0",
|
||||
"strip-json-comments": "2.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"minimist": {
|
||||
"version": "1.2.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"readable-stream": {
|
||||
"version": "2.3.6",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"core-util-is": "1.0.2",
|
||||
"inherits": "2.0.3",
|
||||
"isarray": "1.0.0",
|
||||
"process-nextick-args": "2.0.0",
|
||||
"safe-buffer": "5.1.1",
|
||||
"string_decoder": "1.1.1",
|
||||
"util-deprecate": "1.0.2"
|
||||
}
|
||||
},
|
||||
"rimraf": {
|
||||
"version": "2.6.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"glob": "7.1.2"
|
||||
}
|
||||
},
|
||||
"safe-buffer": {
|
||||
"version": "5.1.1",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"safer-buffer": {
|
||||
"version": "2.1.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"sax": {
|
||||
"version": "1.2.4",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"semver": {
|
||||
"version": "5.5.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"set-blocking": {
|
||||
"version": "2.0.0",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"signal-exit": {
|
||||
"version": "3.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"string-width": {
|
||||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"code-point-at": "1.1.0",
|
||||
"is-fullwidth-code-point": "1.0.0",
|
||||
"strip-ansi": "3.0.1"
|
||||
}
|
||||
},
|
||||
"string_decoder": {
|
||||
"version": "1.1.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"safe-buffer": "5.1.1"
|
||||
}
|
||||
},
|
||||
"strip-ansi": {
|
||||
"version": "3.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"ansi-regex": "2.1.1"
|
||||
}
|
||||
},
|
||||
"strip-json-comments": {
|
||||
"version": "2.0.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"tar": {
|
||||
"version": "4.4.1",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"chownr": "1.0.1",
|
||||
"fs-minipass": "1.2.5",
|
||||
"minipass": "2.2.4",
|
||||
"minizlib": "1.1.0",
|
||||
"mkdirp": "0.5.1",
|
||||
"safe-buffer": "5.1.1",
|
||||
"yallist": "3.0.2"
|
||||
}
|
||||
},
|
||||
"util-deprecate": {
|
||||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true
|
||||
},
|
||||
"wide-align": {
|
||||
"version": "1.1.2",
|
||||
"bundled": true,
|
||||
"dev": true,
|
||||
"optional": true,
|
||||
"requires": {
|
||||
"string-width": "1.0.2"
|
||||
}
|
||||
},
|
||||
"wrappy": {
|
||||
"version": "1.0.2",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
},
|
||||
"yallist": {
|
||||
"version": "3.0.2",
|
||||
"bundled": true,
|
||||
"dev": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"fstream": {
|
||||
"version": "1.0.11",
|
||||
"resolved": "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz",
|
||||
@@ -5224,6 +5755,7 @@
|
||||
"requires": {
|
||||
"anymatch": "1.3.2",
|
||||
"async-each": "1.0.1",
|
||||
"fsevents": "1.2.4",
|
||||
"glob-parent": "2.0.0",
|
||||
"inherits": "2.0.3",
|
||||
"is-binary-path": "1.0.1",
|
||||
|
||||
@@ -30,7 +30,9 @@ export class LoginComponent implements OnInit {
|
||||
|
||||
_submit() {
|
||||
let date = new Date()
|
||||
date.setTime(date.getTime() + 10 * 60 * 1000)
|
||||
// date.setTime(date.getTime() + 10 * 60 * 1000)
|
||||
//为了测试方便，把用户登录缓存时间加长
|
||||
date.setTime(date.getTime() + 10 * 60 * 1000000000000)
|
||||
document.cookie = 'token=cnlpYWRtaW4lM0FyeWlhZG1pbg==;path=/;expires=' + date.toUTCString()
|
||||
|
||||
const toastCfg = new ToastConfig(ToastType.SUCCESS, '', '登录成功！', 3000);
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
.left-wrapper {
|
||||
height: 100%;
|
||||
width: 235px;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
left: 0;
|
||||
background-color: rgb(46, 59, 76);
|
||||
float: left;
|
||||
.left-header {
|
||||
|
||||
@@ -1,3 +1,64 @@
|
||||
<p>
|
||||
personal-settings works!
|
||||
</p>
|
||||
<div class="main-container">
|
||||
<nz-tabset [nzTabPosition]="'top'" [nzType]="'card'">
|
||||
<nz-tab nzTitle="自定义显示列">
|
||||
<div class="self-row-box">
|
||||
|
||||
<div class="self-row-content">
|
||||
<div class="ant-transfer-list">
|
||||
<div class="ant-transfer-list-header">可选列</div>
|
||||
<div class="ant-transfer-list-body">
|
||||
<ul class="ant-transfer-list-content">
|
||||
<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>
|
||||
<div class="self-row-tips" *ngIf="!sourceList.length>0">暂无数据</div>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="move-btn-box">
|
||||
<button (click)='moveCross(3)' 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)' 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)' 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)' 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 class="ant-transfer-list">
|
||||
<div class="ant-transfer-list-header">已选列</div>
|
||||
<div class="ant-transfer-list-body">
|
||||
<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>
|
||||
<div class="self-row-tips" *ngIf="!targetList.length>0">暂无数据</div>
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="move-btn-box">
|
||||
<button (click)='moveUpDown(3)' 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)' class="move-btn" nz-button nzSize="large" [disabled]='disableUp' nzType="primary"><i nz-icon type="up" theme="outline"></i></button>
|
||||
<button (click)='moveUpDown(2)' class="move-btn" nz-button nzSize="large" [disabled]='disableDown' nzType="primary"><i nz-icon type="down" theme="outline"></i></button>
|
||||
<button (click)='moveUpDown(4)' class="move-btn" nz-button nzSize="large" [disabled]='disabledDownBtm' nzType="primary"><i nz-icon type="arrow-down" theme="outline"></i></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="self-row-footer">
|
||||
<button (click)='saveSelf()' nz-button nzSize="large" nzType="primary"><i class="fa fa-check" aria-hidden="true"></i> 确定</button>
|
||||
<button (click)='cancelSelf()' nz-button nzSize="large" nzType="default"><i class="fa fa-times" aria-hidden="true"></i> 取消</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="消息警示提醒">
|
||||
消息警示提醒
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="消息声音提醒">
|
||||
消息声音提醒
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="航班代理">
|
||||
航班代理
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="ORMS启动路径">
|
||||
ORMS启动路径
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="颜色配置">
|
||||
颜色配置
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="刷新设置">
|
||||
刷新设置
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
</div>
|
||||
@@ -0,0 +1,43 @@
|
||||
.main-container{
|
||||
padding: 30px 20px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background-color: #fff;
|
||||
.self-row-box{
|
||||
display: inline-block;
|
||||
.self-row-footer{
|
||||
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;
|
||||
}
|
||||
}
|
||||
.move-btn-box{
|
||||
display: inline-block;
|
||||
margin: 0 10px;
|
||||
position: relative;
|
||||
top: 60px;
|
||||
.move-btn{
|
||||
display: block;
|
||||
margin-bottom: 8px
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.bg{
|
||||
background-color: #e6f7ff;
|
||||
}
|
||||
@@ -6,10 +6,135 @@ import { Component, OnInit } from '@angular/core';
|
||||
styleUrls: ['./personal-settings.component.scss']
|
||||
})
|
||||
export class PersonalSettingsComponent implements OnInit {
|
||||
public list: any[] = []; //原始数据项
|
||||
public sourceList: any[] = []; //临时数据项-可选项
|
||||
public targetList:any=[]; //临时数据项-已选项
|
||||
public disableRight:any=true; //单个右移控制按钮可选状态 true 禁止选择 false可选择
|
||||
public disabledLeft:any=true; //单个左移控制按钮可选状态 true 禁止选择 false可选择
|
||||
public disableUp:any=true; //上移控制按钮可选状态 true 禁止选择 false可选择
|
||||
public disableDown:any=true; //下移控制按钮可选状态 true 禁止选择 false可选择
|
||||
public disabledUpTop:any=true; //置顶控制按钮可选状态 true 禁止选择 false可选择
|
||||
public disabledDownBtm:any=true; //最低控制按钮可选状态 true 禁止选择 false可选择
|
||||
public selectedType:any=''; //当前选中项所在项目 1在可选项 2在已选项框
|
||||
|
||||
constructor() { }
|
||||
moveIndex:any='false';
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
constructor() { }
|
||||
|
||||
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"} ]
|
||||
}
|
||||
//保存-自定义列显示保存
|
||||
saveSelf(){
|
||||
console.log(this.targetList);
|
||||
|
||||
}
|
||||
//重置数据
|
||||
cancelSelf(){
|
||||
|
||||
}
|
||||
//上下调整项目顺序 type 1上移 2下移 3置顶 4置底 要做头尾判断
|
||||
moveUpDown(type){
|
||||
let index=this.moveIndex;
|
||||
if(type==1){
|
||||
this.targetList[index] = this.targetList.splice(index-1, 1, this.targetList[index])[0];
|
||||
this.moveIndex--;
|
||||
}else if(type==2){
|
||||
this.targetList[index] = this.targetList.splice(index+1, 1, this.targetList[index])[0];
|
||||
this.moveIndex++;
|
||||
}else if(type==3){
|
||||
let item=this.targetList[index];
|
||||
this.targetList.splice(index,1)
|
||||
this.targetList.unshift(item);
|
||||
this.moveIndex=0;
|
||||
}else if(type==4){
|
||||
this.targetList.push(this.targetList[index]);
|
||||
this.targetList.splice(index,1);
|
||||
this.moveIndex=this.targetList.length-1;
|
||||
}
|
||||
this.btnStatusContrl();
|
||||
|
||||
}
|
||||
//左右选择项目 type 1右移 2左移 3全部右移 4全部左移
|
||||
moveCross(type){
|
||||
let index=this.moveIndex;
|
||||
if(type==1){
|
||||
let item=this.sourceList[index];
|
||||
this.sourceList.splice(index,1)
|
||||
this.targetList.push(item);
|
||||
if(this.sourceList.length==0){
|
||||
this.disableRight=true;
|
||||
}
|
||||
}else if(type==2){
|
||||
let item=this.targetList[index];
|
||||
this.targetList.splice(index,1)
|
||||
this.sourceList.push(item);
|
||||
if(this.targetList.length==0){
|
||||
this.disabledLeft=true;
|
||||
}
|
||||
}else if(type==3){
|
||||
this.sourceList.forEach(item=>{
|
||||
this.targetList.push(item)
|
||||
})
|
||||
this.sourceList=[];
|
||||
}else if(type==4){
|
||||
this.targetList.forEach(item=>{
|
||||
this.sourceList.push(item)
|
||||
})
|
||||
this.targetList=[];
|
||||
}
|
||||
this.moveIndex='false';
|
||||
this.selectedType='';
|
||||
this.disabledLeft=true;
|
||||
this.disableRight=true;
|
||||
this.sortBtnDisabled();
|
||||
}
|
||||
//选中选框中的项 type 1可选框的项 2已选框的项
|
||||
selectNode(item,index,type){
|
||||
this.selectedType=type;
|
||||
this.moveIndex=index;
|
||||
if(type==1){
|
||||
this.disabledLeft=true;
|
||||
this.disableRight=false;
|
||||
this.sortBtnDisabled();
|
||||
}else if(type==2){
|
||||
this.disableRight=true;
|
||||
this.disabledLeft=false;
|
||||
this.btnStatusContrl();
|
||||
}
|
||||
|
||||
}
|
||||
//右侧上下移懂按钮禁用状态控制
|
||||
btnStatusContrl(){
|
||||
let len=this.targetList.length;
|
||||
if(len<2){
|
||||
this.disabledUpTop=true;
|
||||
this.disableDown=true;
|
||||
}
|
||||
if(this.moveIndex==0){
|
||||
this.disabledUpTop=true;
|
||||
this.disableUp=true;
|
||||
}else{
|
||||
this.disabledUpTop=false
|
||||
this.disableUp=false;
|
||||
}
|
||||
if(this.moveIndex==len-1){
|
||||
this.disabledDownBtm=true;
|
||||
this.disableDown=true;
|
||||
}else{
|
||||
this.disabledDownBtm=false;
|
||||
this.disableDown=false;
|
||||
}
|
||||
}
|
||||
//排序按钮状态统一控制
|
||||
sortBtnDisabled(){
|
||||
this.disableDown=true;
|
||||
this.disableUp=true;
|
||||
this.disabledDownBtm=true;
|
||||
this.disabledUpTop=true;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -9,12 +9,21 @@ import { OperationLogsComponent } from './operation-logs/operation-logs.componen
|
||||
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);
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
SystemManagementRouting
|
||||
SystemManagementRouting,
|
||||
/** 导入 ng-zorro-antd 模块 **/
|
||||
NgZorroAntdModule
|
||||
],
|
||||
/** 配置 ng-zorro-antd 国际化 **/
|
||||
providers : [ { provide: NZ_I18N, useValue: zh_CN } ],
|
||||
declarations: [
|
||||
SystemManagementComponent,
|
||||
PersonalSettingsComponent,
|
||||
|
||||
@@ -4,7 +4,6 @@ body {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
font-size: 14px !important;
|
||||
overflow: hidden;
|
||||
font-family: "Roboto", sans-serif !important;
|
||||
background-color: #1190d6 !important;
|
||||
}
|
||||
@@ -18,7 +17,7 @@ button,
|
||||
.c-pointer {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
||||
/*整体部分*/
|
||||
::-webkit-scrollbar {
|
||||
width: 10px;
|
||||
@@ -35,3 +34,6 @@ button,
|
||||
background: rgba(0, 0, 0, 0.15);
|
||||
}
|
||||
}
|
||||
.anticon svg{
|
||||
vertical-align: unset;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user