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

@@ -2,11 +2,8 @@
   <header><img src="../../../assets/images/tophead.png"></header>
 
   <div class="center">
-    <div class="laststep" (click)="laststep()">
+    <h3>业务理论考试</h3>
-      上一步
+    <table>
-    </div>
-    <h3  *ngIf="isOne">业务理论考试</h3>
-    <table *ngIf="isOne">
       <tr>
         <th *ngFor="let header of headersZero">{{header}}</th>
       </tr>

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

@@ -17,26 +17,12 @@
 }
 
 .center {
-  position: relative;
   width: 80%;
   max-height: 90%;
   margin: 0 auto;
   overflow-x: hidden;
   overflow-y: auto;
   text-align: center;
-  .laststep{
-    position: absolute;
-    width: 85px;
-    height:36px;
-    line-height:36px;
-    color: white;
-    font-size: 18px;
-    right: 0;
-    top: 18px;
-    border: 1px solid white;
-    border-radius: 6px;
-    cursor: pointer;
-  }
   h3 {
     font-size: 26px;
     color: #fff;

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

@@ -1,5 +1,4 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
 
 @Component({
   selector: 'app-drawing-result',
@@ -8,14 +7,9 @@ import { Router } from '@angular/router';
 })
 export class DrawingResultComponent implements OnInit {
 
-  constructor(private router: Router) { }
+  constructor() { }
-  isOne = false
+
   ngOnInit(): void {
-    if(this.router.url == '/drawingResult?type=1'){
-      this.isOne = false
-    }else{
-      this.isOne = true
-    }
   }
 
   headersZero:string [] = ['序号','支队名称','抽签顺序', '职级','座位号']
@@ -53,7 +47,5 @@ export class DrawingResultComponent implements OnInit {
     {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号'] },
   ]
-  laststep(){
+
-    window.history.back(); 
-  }
 }

src/app/ui/first-step-copy/first-step-copy.component.html

@@ -13,15 +13,15 @@
                 <img class="ziti" src="../../../assets/images/tophead.png">
             </div>
             <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="tanCenterbtna" id="chooseZhi">
                             <span style="background-color: #ff4d29;color:#FFF;" >序号</span>
-                            <span  *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.id}}</span>
+                            <span  *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.idnum}}</span>
                           </div>
                       </div>
-                </div>
+                </div> -->
-                <div class="colum">
+                <div class="colum" style="margin-left: 150px;">
                     <div class="centerLeft" >
                         <div class="tanCenterbtn" id="chooseZhi10">
                             <span style="background-color: #ff4d29;color:#FFF;" name="zhidui" data-id=`{{chooseid}}`>请选择支队</span>

src/app/ui/first-step-copy/first-step-copy.component.ts

@@ -61,13 +61,7 @@ export class FirstStepCopyComponent implements OnInit {
       this.isDraw = false
     }
   }
-
   nextStep(){
-    if(localStorage.getItem("南宁支队copy") && localStorage.getItem("柳州支队copy") && localStorage.getItem("桂林支队copy") && localStorage.getItem("梧州支队copy") && localStorage.getItem("北海支队copy") && localStorage.getItem("防城港支队copy") && localStorage.getItem("钦州支队copy") && localStorage.getItem("贵港支队copy") && localStorage.getItem("玉林支队copy") && localStorage.getItem("百色支队copy") && localStorage.getItem("贺州支队copy") && localStorage.getItem("河池支队copy") && localStorage.getItem("来宾支队copy") && localStorage.getItem("崇左支队copy")){
     window.location.href="/fourStep2";
-    }else{
-      alert("未全部抽完！")
-    }
-    
   }
 }

src/app/ui/first-step/first-step.component.html

@@ -13,15 +13,15 @@
 			<img class="ziti" src="../../../assets/images/tophead.png">
 		</div>
 		<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="tanCenterbtna" id="chooseZhi">
 						<span style="background-color: #ff4d29;color:#FFF;" >序号</span>
-						<span  *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.id}}</span>
+						<span  *ngFor="let item of choujiang; let key=index" [ngClass]="{'beijicolor': chooseid ==key}" >{{item.idnum}}</span>
 					  </div>
 				  </div>
-			</div>
+			</div> -->
-			<div class="colum">
+			<div class="colum" style="margin-left: 150px;">
 				<div class="centerLeft" >
 					<div class="tanCenterbtn" id="chooseZhishao">
 						<span style="background-color: #ff4d29;color:#FFF;" name="zhidui" data-id=`{{chooseid}}`>请选择支队</span>

src/app/ui/first-step/first-step.component.scss

@@ -136,7 +136,7 @@ font-size: 24px;
 .chongzhi{
 	position: relative;
 	top: 85%;
-	right: 23.5%
+	right: 30%;
 }
 .button {
   height: 48px;

src/app/ui/first-step/first-step.component.ts

@@ -15,7 +15,23 @@ export class FirstStepComponent implements OnInit {
     },0)
     
   }
-  
+  //支队数据和是否抽奖
+  choujiang=[
+    {name:"南宁支队",id:1,result :localStorage.getItem("南宁支队") || ""},
+    {name:"柳州支队",id:2,result :localStorage.getItem("柳州支队") || ""},
+    {name:"桂林支队",id:3,result :localStorage.getItem("桂林支队") || ""},
+    {name:"梧州支队",id:4,result :localStorage.getItem("梧州支队") || ""},
+    {name:"北海支队",id:5,result :localStorage.getItem("北海支队") || ""},
+    {name:"防城港支队",id:6,result :localStorage.getItem("防城港支队") || ""},
+    {name:"钦州支队",id:7,result :localStorage.getItem("钦州支队") || ""},
+    {name:"贵港支队",id:8,result :localStorage.getItem("贵港支队") || ""},
+    {name:"玉林支队",id:9,result :localStorage.getItem("玉林支队") || ""},
+    {name:"百色支队",id:10,result :localStorage.getItem("百色支队") || ""},
+    {name:"贺州支队",id:11,result :localStorage.getItem("贺州支队") || ""},
+    {name:"河池支队",id:12,result :localStorage.getItem("河池支队") || ""},
+    {name:"来宾支队",id:13,result :localStorage.getItem("来宾支队") || ""},
+    {name:"崇左支队",id:14,result :localStorage.getItem("崇左支队") || ""}
+  ]
   numList = [
     {name:"1号",id:1},
     {name:"2号",id:2},
@@ -46,28 +62,6 @@ export class FirstStepComponent implements OnInit {
   }
   //跳转第二个页面
   nextStep(){
-    if(localStorage.getItem("南宁支队") && localStorage.getItem("柳州支队") && localStorage.getItem("桂林支队") && localStorage.getItem("梧州支队") && localStorage.getItem("北海支队") && localStorage.getItem("防城港支队") && localStorage.getItem("钦州支队") && localStorage.getItem("贵港支队") && localStorage.getItem("玉林支队") && localStorage.getItem("百色支队") && localStorage.getItem("贺州支队") && localStorage.getItem("河池支队") && localStorage.getItem("来宾支队") && localStorage.getItem("崇左支队")){
     window.location.href="/twoStep";
-    }else{
-      alert("未全部抽完！")
   }
-    
-  }
-  //支队数据和是否抽奖
-  choujiang=[
-    {name:"南宁支队",id:1,result :localStorage.getItem("南宁支队") || ""},
-    {name:"柳州支队",id:2,result :localStorage.getItem("柳州支队") || ""},
-    {name:"桂林支队",id:3,result :localStorage.getItem("桂林支队") || ""},
-    {name:"梧州支队",id:4,result :localStorage.getItem("梧州支队") || ""},
-    {name:"北海支队",id:5,result :localStorage.getItem("北海支队") || ""},
-    {name:"防城港支队",id:6,result :localStorage.getItem("防城港支队") || ""},
-    {name:"钦州支队",id:7,result :localStorage.getItem("钦州支队") || ""},
-    {name:"贵港支队",id:8,result :localStorage.getItem("贵港支队") || ""},
-    {name:"玉林支队",id:9,result :localStorage.getItem("玉林支队") || ""},
-    {name:"百色支队",id:10,result :localStorage.getItem("百色支队") || ""},
-    {name:"贺州支队",id:11,result :localStorage.getItem("贺州支队") || ""},
-    {name:"河池支队",id:12,result :localStorage.getItem("河池支队") || ""},
-    {name:"来宾支队",id:13,result :localStorage.getItem("来宾支队") || ""},
-    {name:"崇左支队",id:14,result :localStorage.getItem("崇左支队") || ""}
-  ]
 }

src/app/ui/four-step-copy/four-step-copy.component.html

@@ -68,7 +68,7 @@
                     
                 </div>
     
-                <div  class="chongzhi" style="height: 20%;"><button type="button" (click)="lookresult()" class="button">查看结果</button></div>
+                <div  class="chongzhi" style="height: 20%;"><button type="button" (click)="nextStep()"   class="button">下一步</button></div>
             </div>
     </div>
             

src/app/ui/four-step-copy/four-step-copy.component.ts

@@ -84,11 +84,7 @@ export class FourStepCopyComponent implements OnInit {
       this.isDraw = false
     }
   }
-  lookresult(){
+  nextStep(){
-    if(localStorage.getItem("南宁支队seatnumbercopy") && localStorage.getItem("柳州支队seatnumbercopy") && localStorage.getItem("桂林支队seatnumbercopy") && localStorage.getItem("梧州支队seatnumbercopy") && localStorage.getItem("北海支队seatnumbercopy") && localStorage.getItem("防城港支队seatnumbercopy") && localStorage.getItem("钦州支队seatnumbercopy") && localStorage.getItem("贵港支队seatnumbercopy") && localStorage.getItem("玉林支队seatnumbercopy") && localStorage.getItem("百色支队seatnumbercopy") && localStorage.getItem("贺州支队seatnumbercopy") && localStorage.getItem("河池支队seatnumbercopy") && localStorage.getItem("来宾支队seatnumbercopy") && localStorage.getItem("崇左支队seatnumbercopy")){
     window.location.href="/drawingResult";
-    }else{
-      alert("请全部抽完再查看结果！")
-    }
   }
 }

src/app/ui/four-step/four-step.component.html

@@ -68,10 +68,7 @@
                     
                 </div>
     
-                <div  class="chongzhi" style="height: 20%;">
+                <div  class="chongzhi" style="height: 20%;"><button type="button" (click)="nextStep()"   class="button">下一步</button></div>
-                    <button type="button" (click)="lookresult()" class="button">查看结果</button>
-                    <button type="button" (click)="nextStep()" class="button">下一步</button>
-                </div>
             </div>
     </div>
             

src/app/ui/four-step/four-step.component.scss

@@ -43,8 +43,8 @@
   }
   .chongzhi{
     position: relative;
-    top: 80%;
+    top: 85%;
-    right: 23.5%;
+    right: 17%;
   }
   
   .centerLeft{
@@ -153,6 +153,11 @@
     margin: 4px 2px;
     cursor: pointer;
   }
+  .chongzhi{
+    position: relative;
+    top: 85%;
+    right: 17%;
+  }
   
   //选择后加背景色
   .beijicolor{

src/app/ui/four-step/four-step.component.ts

@@ -85,17 +85,7 @@ export class FourStepComponent implements OnInit {
     }
   }
   nextStep(){
-    if(localStorage.getItem("南宁支队seatnumber") && localStorage.getItem("柳州支队seatnumber") && localStorage.getItem("桂林支队seatnumber") && localStorage.getItem("梧州支队seatnumber") && localStorage.getItem("北海支队seatnumber") && localStorage.getItem("防城港支队seatnumber") && localStorage.getItem("钦州支队seatnumber") && localStorage.getItem("贵港支队seatnumber") && localStorage.getItem("玉林支队seatnumber") && localStorage.getItem("百色支队seatnumber") && localStorage.getItem("贺州支队seatnumber") && localStorage.getItem("河池支队seatnumber") && localStorage.getItem("来宾支队seatnumber") && localStorage.getItem("崇左支队seatnumber")){
+    window.location.href="/drawingResult";
-      window.location.href="/firstStep2";
-    }else{
-      alert("未全部抽完！")
-    }
-  }
-  lookresult(){
-    if(localStorage.getItem("南宁支队seatnumber") && localStorage.getItem("柳州支队seatnumber") && localStorage.getItem("桂林支队seatnumber") && localStorage.getItem("梧州支队seatnumber") && localStorage.getItem("北海支队seatnumber") && localStorage.getItem("防城港支队seatnumber") && localStorage.getItem("钦州支队seatnumber") && localStorage.getItem("贵港支队seatnumber") && localStorage.getItem("玉林支队seatnumber") && localStorage.getItem("百色支队seatnumber") && localStorage.getItem("贺州支队seatnumber") && localStorage.getItem("河池支队seatnumber") && localStorage.getItem("来宾支队seatnumber") && localStorage.getItem("崇左支队seatnumber")){
-      window.location.href="/drawingResult?type=1";
-    }else{
-      alert("请全部抽完再查看结果！")
-    }
   }
+
 }