From 898397d80bb4be9c9165e0409ad74132306ecd6b Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sun, 18 Oct 2020 10:11:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E4=BB=BD=E8=80=81=E8=99=8E=E6=9C=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 6 +- .../drawing-result.component.ts | 28 +-- .../first-step-copy.component.html | 74 +++++++ .../first-step-copy.component.scss | 183 ++++++++++++++++++ .../first-step-copy.component.spec.ts | 25 +++ .../first-step-copy.component.ts | 67 +++++++ .../four-step-copy.component.html | 77 ++++++++ .../four-step-copy.component.scss | 183 ++++++++++++++++++ .../four-step-copy.component.spec.ts | 25 +++ .../four-step-copy.component.ts | 80 ++++++++ src/app/ui/four-step/four-step.component.html | 12 +- src/app/ui/four-step/four-step.component.ts | 30 +-- src/app/ui/ui.module.ts | 4 +- src/assets/js/firststepcopy.js | 85 ++++++++ src/assets/js/{firststep2.js => fourstep.js} | 0 src/assets/js/fourstepcopy.js | 151 +++++++++++++++ 16 files changed, 993 insertions(+), 37 deletions(-) create mode 100644 src/app/ui/first-step-copy/first-step-copy.component.html create mode 100644 src/app/ui/first-step-copy/first-step-copy.component.scss create mode 100644 src/app/ui/first-step-copy/first-step-copy.component.spec.ts create mode 100644 src/app/ui/first-step-copy/first-step-copy.component.ts create mode 100644 src/app/ui/four-step-copy/four-step-copy.component.html create mode 100644 src/app/ui/four-step-copy/four-step-copy.component.scss create mode 100644 src/app/ui/four-step-copy/four-step-copy.component.spec.ts create mode 100644 src/app/ui/four-step-copy/four-step-copy.component.ts create mode 100644 src/assets/js/firststepcopy.js rename src/assets/js/{firststep2.js => fourstep.js} (100%) create mode 100644 src/assets/js/fourstepcopy.js diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4e54bcf..2e1e2bd 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -21,14 +21,18 @@ import {ResetComponent} from './ui/reset/reset.component' import { FirstStepComponent } from './ui/first-step/first-step.component'; import { FourStepComponent } from './ui/four-step/four-step.component'; import { DrawingResultComponent } from './ui/drawing-result/drawing-result.component'; +import { FirstStepCopyComponent } from './ui/first-step-copy/first-step-copy.component'; +import { FourStepCopyComponent } from './ui/four-step-copy/four-step-copy.component'; const routes: Routes = [ {path:'',component:LuckDrawComponent}, {path:'firstStep',component:FirstStepComponent}, + {path:'firstStep2',component:FirstStepCopyComponent}, {path:'Reset',component:ResetComponent}, {path:'fourStep',component:FourStepComponent}, - {path: 'drawingResult', component:DrawingResultComponent} + {path:'fourStep2',component:FourStepCopyComponent}, + {path:'drawingResult', component:DrawingResultComponent} // {path:'login', // component:LoginComponent}, diff --git a/src/app/ui/drawing-result/drawing-result.component.ts b/src/app/ui/drawing-result/drawing-result.component.ts index 3c35d99..c5ed57e 100644 --- a/src/app/ui/drawing-result/drawing-result.component.ts +++ b/src/app/ui/drawing-result/drawing-result.component.ts @@ -14,20 +14,20 @@ export class DrawingResultComponent implements OnInit { 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'] }, + {order: 1, fireName: '南宁支队', drawLotsOrder: '12', name: ['支队长','副支队长'], seatNum: ['11号','17号'] }, + {order: 2, fireName: '柳州支队', drawLotsOrder: '07', name: ['支队长','副支队长'], seatNum: ['08号','15号'] }, + {order: 3, fireName: '桂林支队', drawLotsOrder: '01', name: ['支队长','副支队长'], seatNum: ['04号','21号'] }, + {order: 4, fireName: '梧州支队', drawLotsOrder: '06', name: ['支队长','副支队长'], seatNum: ['02号','26号'] }, + {order: 5, fireName: '北海支队', drawLotsOrder: '11', name: ['支队长','副支队长'], seatNum: ['07号','27号'] }, + {order: 6, fireName: '防城港支队', drawLotsOrder: '02', name: ['支队长','副支队长'], seatNum: ['12号','22号'] }, + {order: 7, fireName: '钦州支队', drawLotsOrder: '05', name: ['支队长','副支队长'], seatNum: ['03号','25号'] }, + {order: 8, fireName: '贵港支队', drawLotsOrder: '08', name: ['支队长','副支队长'], seatNum: ['01号','16号'] }, + {order: 9, fireName: '玉林支队', drawLotsOrder: '14', name: ['支队长','副支队长'], seatNum: ['09号','20号'] }, + {order: 10, fireName: '百色支队', drawLotsOrder: '3', name: ['支队长','副支队长'], seatNum: ['06号','18号'] }, + {order: 11, fireName: '贺州支队', drawLotsOrder: '9', name: ['支队长','副支队长'], seatNum: ['05号','23号'] }, + {order: 12, fireName: '河池支队', drawLotsOrder: '4', name: ['支队长','副支队长'], seatNum: ['14号','19号'] }, + {order: 13, fireName: '来宾支队', drawLotsOrder: '10', name: ['支队长','副支队长'], seatNum: ['10号','24号'] }, + {order: 14, fireName: '崇左支队', drawLotsOrder: '13', name: ['支队长','副支队长'], seatNum: ['13号','28号'] }, ] headers:string [] = ['序号','支队名称','抽签顺序','场景类型', '职级','座位号'] diff --git a/src/app/ui/first-step-copy/first-step-copy.component.html b/src/app/ui/first-step-copy/first-step-copy.component.html new file mode 100644 index 0000000..f71eebd --- /dev/null +++ b/src/app/ui/first-step-copy/first-step-copy.component.html @@ -0,0 +1,74 @@ + +