Browse Source

[合并]合并代码

master
邵佳豪 4 years ago
parent
commit
0340514703
  1. 4
      README.md
  2. 46
      package-lock.json
  3. 11
      src/app/app-routing.module.ts
  4. 14
      src/app/app.component.ts
  5. 19
      src/app/http-interceptors/base-interceptor.ts
  6. 42
      src/app/ui/drawing-result/drawing-result.component.html
  7. 67
      src/app/ui/drawing-result/drawing-result.component.scss
  8. 25
      src/app/ui/drawing-result/drawing-result.component.spec.ts
  9. 51
      src/app/ui/drawing-result/drawing-result.component.ts
  10. 4
      src/app/ui/ui.module.ts

4
README.md

@ -1,6 +1,4 @@
智能实战指挥平台-前端项目 指挥员指挥能力考评抽签-前端项目
---广西 演示
项目初始化:npm install 项目初始化:npm install

46
package-lock.json generated

@ -16640,8 +16640,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@ -16684,8 +16683,7 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
@ -16696,8 +16694,7 @@
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -16814,8 +16811,7 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -16827,7 +16823,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@ -16857,7 +16852,6 @@
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -16876,7 +16870,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -16979,7 +16972,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -17065,8 +17057,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -17102,7 +17093,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -17122,7 +17112,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@ -17166,14 +17155,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },
@ -17611,8 +17598,7 @@
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@ -17729,8 +17715,7 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@ -17772,7 +17757,6 @@
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@ -17791,7 +17775,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@ -17894,7 +17877,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@ -17980,8 +17962,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@ -18017,7 +17998,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@ -18081,14 +18061,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },

11
src/app/app-routing.module.ts

@ -20,6 +20,7 @@ import { LuckDrawComponent } from './ui/luck-draw/luck-draw.component';
import {ResetComponent} from './ui/reset/reset.component' import {ResetComponent} from './ui/reset/reset.component'
import { FirstStepComponent } from './ui/first-step/first-step.component'; import { FirstStepComponent } from './ui/first-step/first-step.component';
import { FourStepComponent } from './ui/four-step/four-step.component'; import { FourStepComponent } from './ui/four-step/four-step.component';
import { DrawingResultComponent } from './ui/drawing-result/drawing-result.component';
const routes: Routes = [ const routes: Routes = [
@ -27,6 +28,16 @@ const routes: Routes = [
{path:'firstStep',component:FirstStepComponent}, {path:'firstStep',component:FirstStepComponent},
{path:'Reset',component:ResetComponent}, {path:'Reset',component:ResetComponent},
{path:'fourStep',component:FourStepComponent}, {path:'fourStep',component:FourStepComponent},
{path: 'drawingResult', component:DrawingResultComponent}
// {path:'login',
// component:LoginComponent},
// {path:'getNoMToken',
// component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
// {path:'lockscreen',
// component:LockscreenComponent,
// canActivate: [AuthGuard]}//守卫验证
]; ];
@NgModule({ @NgModule({

14
src/app/app.component.ts

@ -16,20 +16,6 @@ export class AppComponent {
constructor(private http:HttpClient,private router:Router,public token:CacheTokenService) { } constructor(private http:HttpClient,private router:Router,public token:CacheTokenService) { }
ngOnInit(): void { ngOnInit(): void {
var token = sessionStorage.getItem("token");
var refreshToken = sessionStorage.getItem("refreshToken");
if(token && refreshToken) {
this.http.post('/api/Account/RefreshToken', {
token: token,
refreshToken: refreshToken
}).subscribe((data: Data) => {
sessionStorage.setItem("level",data.level);
sessionStorage.setItem("token",data.token);
sessionStorage.setItem("refreshToken",data.refreshToken);
this.token.startUp()
})
}
} }

19
src/app/http-interceptors/base-interceptor.ts

@ -44,26 +44,13 @@ export class BaseInterceptor implements HttpInterceptor {
private handleError(error: HttpErrorResponse) { private handleError(error: HttpErrorResponse) {
// 用户认证失败返回登录页 // 用户认证失败返回登录页
if (error.status === 401||error.status === 614) { if (error.status === 401||error.status === 614) {
this.token.delete()
sessionStorage.clear()
window.localStorage.clear()
this.router.navigate(['ui/plan'])
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('用户认证信息过期,请重新登录','确定',config);
} }
if (error.status === 403) { if (error.status === 403) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('对不起,您无此权限','确定',config);
} }
if (error.status === 400) { if (error.status === 400) {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请核对您的输入格式是否正确','确定',config);
} }
if (error.error instanceof ErrorEvent) { if (error.error instanceof ErrorEvent) {

42
src/app/ui/drawing-result/drawing-result.component.html

@ -0,0 +1,42 @@
<div class="content">
<header><img src="../../../assets/images/tophead.png"></header>
<div class="center">
<h3>业务理论考试</h3>
<table>
<tr>
<th *ngFor="let header of headersZero">{{header}}</th>
</tr>
<tr *ngFor="let item of tableDataZero">
<td>{{item.order}}</td>
<td>{{item.fireName}}</td>
<td>{{item.drawLotsOrder}}</td>
<td>
<p *ngFor="let items of item.name" class="bottomBorder">{{items}}</p>
</td>
<td>
<p *ngFor="let items of item.seatNum" class="bottomBorder">{{items}}</p>
</td>
</tr>
</table>
<h3>指挥能力考评</h3>
<table>
<tr>
<th *ngFor="let header of headers">{{header}}</th>
</tr>
<tr *ngFor="let item of tableData">
<td>{{item.order}}</td>
<td>{{item.fireName}}</td>
<td>{{item.drawLotsOrder}}</td>
<td>{{item.num}}</td>
<td>
<p *ngFor="let items of item.name" class="bottomBorder">{{items}}</p>
</td>
<td>
<p *ngFor="let items of item.seatNum" class="bottomBorder">{{items}}</p>
</td>
</tr>
</table>
</div>
</div>

67
src/app/ui/drawing-result/drawing-result.component.scss

@ -0,0 +1,67 @@
.content {
width: 100%;
height: 100%;
overflow: hidden;
box-sizing: border-box;
padding: 1px;
background: url('../../../assets/images/backgroud.png');
background-size: 100% 100%;
header {
width: 100%;
height: 50px;
text-align: center;
background: url('../../../assets/images/head.png');
background-size: 100% 100%;
img { margin: 11px 0; }
}
}
.center {
width: 80%;
max-height: 90%;
margin: 0 auto;
overflow-x: hidden;
overflow-y: auto;
text-align: center;
h3 {
font-size: 26px;
color: #fff;
margin: 30px 0;
}
}
.center::-webkit-scrollbar {
display: none;
}
table {
width: 100%;
box-sizing: border-box;
background-color: #fff;
text-align: center;
border-collapse:collapse;
word-break:break-all;
word-wrap:break-all;
table-layout:fixed;
th {
box-sizing: border-box;
height: 50px;
font-size: 24px;
color: #fff;
font-weight: 400;
border: 1px solid #fff;
background-color: #ff4d29;
}
td {
box-sizing: border-box;
height: 60px;
color: #000;
font-weight: 400;
border: 1px solid #ECEDEE;
}
p { height: 30px; line-height: 30px; box-sizing: border-box; }
.bottomBorder:not(:last-child) {
border-bottom: 1px solid #ECEDEE;
}
}
th,td,p { cursor: default; }

25
src/app/ui/drawing-result/drawing-result.component.spec.ts

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { DrawingResultComponent } from './drawing-result.component';
describe('DrawingResultComponent', () => {
let component: DrawingResultComponent;
let fixture: ComponentFixture<DrawingResultComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ DrawingResultComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DrawingResultComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

51
src/app/ui/drawing-result/drawing-result.component.ts

@ -0,0 +1,51 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-drawing-result',
templateUrl: './drawing-result.component.html',
styleUrls: ['./drawing-result.component.scss']
})
export class DrawingResultComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
headersZero:string [] = ['序号','支队名称','抽签顺序', '职级','座位号']
tableDataZero = [
{order: 1, fireName: '南宁支队', drawLotsOrder: '01', name: ['支队长','副支队长'], seatNum: ['01','02'] },
{order: 2, fireName: '柳州支队', drawLotsOrder: '02', name: ['支队长','副支队长'], seatNum: ['03','04'] },
{order: 3, fireName: '桂林支队', drawLotsOrder: '03', name: ['支队长','副支队长'], seatNum: ['05','06'] },
{order: 4, fireName: '梧州支队', drawLotsOrder: '04', name: ['支队长','副支队长'], seatNum: ['01','02'] },
{order: 5, fireName: '北海支队', drawLotsOrder: '05', name: ['支队长','副支队长'], seatNum: ['03','04'] },
{order: 6, fireName: '防城港支队', drawLotsOrder: '06', name: ['支队长','副支队长'], seatNum: ['05','06'] },
{order: 7, fireName: '钦州支队', drawLotsOrder: '07', name: ['支队长','副支队长'], seatNum: ['01','02'] },
{order: 8, fireName: '贵港支队', drawLotsOrder: '08', name: ['支队长','副支队长'], seatNum: ['03','04'] },
{order: 9, fireName: '玉林支队', drawLotsOrder: '09', name: ['支队长','副支队长'], seatNum: ['05','06'] },
{order: 10, fireName: '百色支队', drawLotsOrder: '10', name: ['支队长','副支队长'], seatNum: ['01','02'] },
{order: 11, fireName: '贺州支队', drawLotsOrder: '11', name: ['支队长','副支队长'], seatNum: ['03','04'] },
{order: 12, fireName: '河池支队', drawLotsOrder: '12', name: ['支队长','副支队长'], seatNum: ['05','06'] },
{order: 13, fireName: '来宾支队', drawLotsOrder: '13', name: ['支队长','副支队长'], seatNum: ['03','04'] },
{order: 14, fireName: '崇左支队', drawLotsOrder: '14', name: ['支队长','副支队长'], seatNum: ['05','06'] },
]
headers:string [] = ['序号','支队名称','抽签顺序','场景类型', '职级','座位号']
tableData = [
{order: 1, fireName: '南宁支队', drawLotsOrder: '05', num: localStorage.getItem('5') || '', name: ['支队长','副支队长'], seatNum: ['8号','21号'] },
{order: 2, fireName: '柳州支队', drawLotsOrder: '10', num: localStorage.getItem('10') || '', name: ['支队长','副支队长'], seatNum: ['12号','26号'] },
{order: 3, fireName: '桂林支队', drawLotsOrder: '14', num: localStorage.getItem('14') || '', name: ['支队长','副支队长'], seatNum: ['14号','15号'] },
{order: 4, fireName: '梧州支队', drawLotsOrder: '03', num: localStorage.getItem('3') || '', name: ['支队长','副支队长'], seatNum: ['13号','28号'] },
{order: 5, fireName: '北海支队', drawLotsOrder: '08', num: localStorage.getItem('8') || '', name: ['支队长','副支队长'], seatNum: ['4号','22号'] },
{order: 6, fireName: '防城港支队', drawLotsOrder: '13', num: localStorage.getItem('13') || '', name: ['支队长','副支队长'], seatNum: ['1号','16号'] },
{order: 7, fireName: '钦州支队', drawLotsOrder: '06', num: localStorage.getItem('6') || '', name: ['支队长','副支队长'], seatNum: ['10号','25号'] },
{order: 8, fireName: '贵港支队', drawLotsOrder: '01', num: localStorage.getItem('1') || '', name: ['支队长','副支队长'], seatNum: ['11号','19号'] },
{order: 9, fireName: '玉林支队', drawLotsOrder: '07', num: localStorage.getItem('7') || '', name: ['支队长','副支队长'], seatNum: ['2号','27号'] },
{order: 10, fireName: '百色支队', drawLotsOrder: '12', num: localStorage.getItem('12') || '', name: ['支队长','副支队长'], seatNum: ['9号','20号'] },
{order: 11, fireName: '贺州支队', drawLotsOrder: '02', num: localStorage.getItem('02') || '', name: ['支队长','副支队长'], seatNum: ['3号','24号'] },
{order: 12, fireName: '河池支队', drawLotsOrder: '04', num: localStorage.getItem('04') || '', name: ['支队长','副支队长'], seatNum: ['6号','18号'] },
{order: 13, fireName: '来宾支队', drawLotsOrder: '09', num: localStorage.getItem('09') || '', name: ['支队长','副支队长'], seatNum: ['7号','23号'] },
{order: 14, fireName: '崇左支队', drawLotsOrder: '11', num: localStorage.getItem('11') || '', name: ['支队长','副支队长'], seatNum: ['5号','17号'] },
]
}

4
src/app/ui/ui.module.ts

@ -63,9 +63,11 @@ import { LuckDrawComponent } from './luck-draw/luck-draw.component';
import { ResetComponent } from './reset/reset.component'; import { ResetComponent } from './reset/reset.component';
import { FirstStepComponent } from './first-step/first-step.component'; import { FirstStepComponent } from './first-step/first-step.component';
import { FourStepComponent } from './four-step/four-step.component'; import { FourStepComponent } from './four-step/four-step.component';
import { DrawingResultComponent } from './drawing-result/drawing-result.component';
@NgModule({ @NgModule({
declarations: [SafeHtmlPipe,UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,WorkingAreaComponent, LuckDrawComponent, ResetComponent, FirstStepComponent, FourStepComponent], declarations: [SafeHtmlPipe,UiComponent,PersonaldataComponent, ChangepasswordComponent,IsnoPipe,ConfirmpswDirective,TimePipe,WorkingAreaComponent, LuckDrawComponent, ResetComponent, DrawingResultComponent, FirstStepComponent, FourStepComponent],
imports: [ imports: [
CommonModule, CommonModule,

Loading…
Cancel
Save