nzdrtrt
/
Luck-Draw
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[修改]路由配置

master
chenjingyu 4 years ago
parent
4cee9f06e9
commit
84c75f5b6e
10 changed files with 1282 additions and 1267 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      angular.json
  2. 6
      src/app/app-routing.module.ts
  3. 9
      src/app/app.module.ts
  4. 4
      src/app/ui/first-step/first-step.component.html
  5. 11
      src/app/ui/first-step/first-step.component.scss
  6. 14
      src/app/ui/luck-draw/luck-draw.component.html
  7. 5
      src/app/ui/luck-draw/luck-draw.component.ts
  8. 6
      src/app/ui/ui-routing.module.ts
  9. 2488
      src/assets/js/zhuanpan.js
  10. 2
      src/index.html

4
angular.json
Unescape View File

@ -106,8 +106,8 @@
"src/styles.scss" "src/styles.scss"
], ],
"scripts": [ "scripts": [
"src/assets/js/zhuanpan.js",
"src/assets/js/zhuanpanpici.js"
] ]
} }
}, },

6
src/app/app-routing.module.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-10-07 15:00:15 * @Date: 2020-10-07 15:00:15
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 08:45:09 * @LastEditTime: 2020-10-18 08:53:00
*/ */
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
@ -26,8 +26,8 @@ import { DrawingResultComponent } from './ui/drawing-result/drawing-result.compo
const routes: Routes = [ const routes: Routes = [
{path:'',component:LuckDrawComponent}, {path:'',component:FirstStepComponent},//LuckDrawComponent
{path:'firstStep',component:FirstStepComponent}, {path:'twoStep',component:LuckDrawComponent},
{path:'Reset',component:ResetComponent}, {path:'Reset',component:ResetComponent},
//{path:'LuckDrawBatch',component:LuckDrawBatchComponent} //{path:'LuckDrawBatch',component:LuckDrawBatchComponent}
{path:'fourStep',component:FourStepComponent}, {path:'fourStep',component:FourStepComponent},

9
src/app/app.module.ts
Unescape View File

@ -1,3 +1,11 @@
/*
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2020-10-07 15:00:15
* @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 10:22:35
*/
import { BrowserModule } from '@angular/platform-browser'; import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
@ -20,6 +28,7 @@ import { TreeService } from'./http-interceptors/tree.service';
import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥 import { MTokenK1Component } from './m-token-k1/m-token-k1.component' //K1秘钥
import { CountdownModule } from 'ngx-countdown'; //倒计时插件 import { CountdownModule } from 'ngx-countdown'; //倒计时插件
import { GISManagementModule } from './gis-management/gis-management.module'; import { GISManagementModule } from './gis-management/gis-management.module';
//import {LuckDrawComponent}
@NgModule({ @NgModule({
declarations: [ declarations: [

4
src/app/ui/first-step/first-step.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-25 08:48:50 * @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-10-14 09:08:17 * @LastEditTime: 2020-10-18 10:19:02
--> -->
<div class="box"> <div class="box">
<div class="head"> <div class="head">
@ -65,7 +65,7 @@
</div> </div>
<div class="chongzhi" style="height: 20%;"><button type="button" [routerLink]="['/twoStep/']" class="button">下一步</button></div>
</div> </div>
</div> </div>

11
src/app/ui/first-step/first-step.component.scss
Unescape View File

@ -133,6 +133,11 @@ font-size: 24px;
.stop{ .stop{
pointer-events: none; pointer-events: none;
} }
.chongzhi{
position: relative;
top: 85%;
right: 30%;
}
.button { .button {
height: 48px; height: 48px;
width: 130px; width: 130px;
@ -148,11 +153,7 @@ font-size: 24px;
margin: 4px 2px; margin: 4px 2px;
cursor: pointer; cursor: pointer;
} }
.chongzhi{
position: relative;
top: 85%;
right: 17%;
}
//选择后加背景色 //选择后加背景色
.beijicolor{ .beijicolor{

14
src/app/ui/luck-draw/luck-draw.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-25 08:48:50 * @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-10-17 11:06:52 * @LastEditTime: 2020-10-18 10:15:32
--> -->
<html> <html>
@ -18,7 +18,7 @@
<div class="mainbox"> <div class="mainbox">
<div class="colum" style="margin-left: 13%;width: 100px;"> <div class="colum" style="margin-left: 13%;width: 100px;">
<div class="centerLefta" > <div class="centerLefta" >
<div class="tanCenterbtna" id="chooseZhi"> <div class="tanCenterbtna" >
<span style="background-color: #ff4d29;color:#FFF;" >序号</span> <span style="background-color: #ff4d29;color:#FFF;" >序号</span>
<span *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.idnum}}</span> <span *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.idnum}}</span>
</div> </div>
@ -26,15 +26,15 @@
</div> </div>
<div class="colum" > <div class="colum" >
<div class="centerLeft" > <div class="centerLeft" >
<div class="tanCenterbtn" id="chooseZhi"> <div class="tanCenterbtn" id="chooseZhichen">
<span style="background-color: #ff4d29;color:#FFF;" name="zhidui" data-id=`{{chooseid}}`>请选择支队</span> <span style="background-color: #ff4d29;color:#FFF;" name="zhidui" data-id=`{{chooseid}}`>请选择支队</span>
<span name="aaa" *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" (click)="chosseZhidui(key)">{{item.name}}<img style="margin-left: 8px;display: none;" src="../../../assets/images/dui.png"></span> <span name="aaachen" *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" (click)="chosseZhidui(key)">{{item.name}}<img style="margin-left: 8px;display: none;" src="../../../assets/images/dui.png"></span>
</div> </div>
</div> </div>
</div> </div>
<div class="colum"> <div class="colum">
<div class="centerLeft"> <div class="centerLeft">
<div class="tanCenterbtn" id="endjieguo"> <div class="tanCenterbtn" id="endjieguochen">
<span style="text-align: center;background-color: #ff4d29;color:#FFF;">抽签结果:</span> <span style="text-align: center;background-color: #ff4d29;color:#FFF;">抽签结果:</span>
<span *ngFor="let item of choujiang; let key=index" ></span> <span *ngFor="let item of choujiang; let key=index" ></span>
</div> </div>
@ -42,7 +42,7 @@
</div> </div>
<div id="con1" class="zhuan" > <div id="con1" class="zhuan" >
<div class="banner" name="banner" id="zhuanpan"> <div class="banner" name="banner" id="zhuanpanchen">
<div class="turnplate" style="background-image:url(../../../assets/images/turnplate-bg.png);background-size:100% 100%;"> <div class="turnplate" style="background-image:url(../../../assets/images/turnplate-bg.png);background-size:100% 100%;">
<canvas class="item" id="wheelcanvas" width="422px" height="422px" ></canvas> <canvas class="item" id="wheelcanvas" width="422px" height="422px" ></canvas>
<img class="pointer" src="../../../assets/images/turnplate-pointer.png" id="clickButton" disabled/> <img class="pointer" src="../../../assets/images/turnplate-pointer.png" id="clickButton" disabled/>
@ -50,7 +50,7 @@
</div> </div>
</div> </div>
<div class="chongzhi" style="height: 20%;"><button class="button">下一步</button></div> <div class="chongzhi" style="height: 20%;"><button type="button" [routerLink]="['/fourStep/']" class="button">下一步</button></div>
</div> </div>

5
src/app/ui/luck-draw/luck-draw.component.ts
Unescape View File

@ -4,10 +4,11 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-25 08:48:50 * @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-10-18 08:36:27 * @LastEditTime: 2020-10-18 10:02:26
*/ */
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { from } from 'rxjs'; import { from } from 'rxjs';
//import '../../../assets/js/awardRotate'
import '../../../assets/js/zhuanpan' import '../../../assets/js/zhuanpan'
//import * from '../../../assets/js/awardRotate' //import * from '../../../assets/js/awardRotate'
//import *as '../../../assets/js/zhuanpan'; //import *as '../../../assets/js/zhuanpan';
@ -26,7 +27,7 @@ export class LuckDrawComponent implements OnInit {
ngOnInit(){ ngOnInit(){
window.setTimeout(()=>{ window.setTimeout(()=>{
//zhuan() //window.location.reload()
},0) },0)
} }

6
src/app/ui/ui-routing.module.ts
Unescape View File

@ -4,18 +4,18 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-25 08:48:50 * @Date: 2020-09-25 08:48:50
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-10-07 15:41:56 * @LastEditTime: 2020-10-18 09:07:04
*/ */
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { ResetComponent} from '../../app/ui/reset/reset.component' import { ResetComponent} from '../../app/ui/reset/reset.component'
import { from } from 'rxjs'; import { from } from 'rxjs';
const routes: Routes = [ const routes: Routes = [
{ path: 'Reset', component:ResetComponent} //{ path: 'Reset', component:ResetComponent}
] ]
@NgModule({ @NgModule({

2488
src/assets/js/zhuanpan.js
View File

File diff suppressed because it is too large Load Diff

2
src/index.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-09-25 08:48:54 * @Date: 2020-09-25 08:48:54
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-10-17 11:00:47 * @LastEditTime: 2020-10-18 09:05:19
--> -->
<!doctype html> <!doctype html>
<html lang="zh-CN"> <html lang="zh-CN">

Write Preview
Loading…
Cancel
Save