From 7ac3af1866339c3ee58aa45c477616eefb5e022e Mon Sep 17 00:00:00 2001
From: qq55341701 <55341701@qq.com>
Date: Sun, 18 Oct 2020 19:03:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9=E6=8A=BD?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=BA=E4=B8=A4=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 46 ++++++++++++++-----
 .../drawing-result.component.html             |  4 +-
 .../drawing-result.component.scss             |  2 +-
 .../first-step-copy.component.scss            |  6 +--
 .../first-step-copy.component.ts              | 24 +++++++++-
 .../ui/first-step/first-step.component.scss   |  6 +--
 src/app/ui/first-step/first-step.component.ts | 29 +++---------
 .../four-step-copy.component.html             |  2 +-
 .../four-step-copy.component.scss             |  6 +--
 src/app/ui/four-step/four-step.component.scss |  8 ++--
 src/app/ui/luck-draw/luck-draw.component.scss |  6 +--
 11 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d275bfc..5b2bab3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16640,7 +16640,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -16683,7 +16684,8 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
@@ -16694,7 +16696,8 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -16811,7 +16814,8 @@
             "inherits": {
               "version": "2.0.4",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -16823,6 +16827,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -16852,6 +16857,7 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -16870,6 +16876,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -16972,6 +16979,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -17057,7 +17065,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -17093,6 +17102,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -17112,6 +17122,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -17155,12 +17166,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -17598,7 +17611,8 @@
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -17715,7 +17729,8 @@
             "inherits": {
               "version": "2.0.4",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -17757,6 +17772,7 @@
               "version": "2.9.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -17775,6 +17791,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -17877,6 +17894,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -17962,7 +17980,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -17998,6 +18017,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -18061,12 +18081,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
diff --git a/src/app/ui/drawing-result/drawing-result.component.html b/src/app/ui/drawing-result/drawing-result.component.html
index f5a4ab2..6782094 100644
--- a/src/app/ui/drawing-result/drawing-result.component.html
+++ b/src/app/ui/drawing-result/drawing-result.component.html
@@ -5,7 +5,7 @@
     <div class="laststep" (click)="laststep()">
       上一步
     </div>
-    <h3 *ngIf="isOne">业务理论考试</h3>
+    <h3 *ngIf="isOne">业务理论考试结果</h3>
     <table *ngIf="isOne">
       <tr>
         <th *ngFor="let header of headersZero">{{header}}</th>
@@ -22,7 +22,7 @@
         </td>
       </tr>
     </table>
-    <h3 *ngIf="isTwo">指挥能力考评</h3>
+    <h3 *ngIf="isTwo">指挥能力考评结果</h3>
     <table *ngIf="isTwo">
       <tr>
         <th *ngFor="let header of headers">{{header}}</th>
diff --git a/src/app/ui/drawing-result/drawing-result.component.scss b/src/app/ui/drawing-result/drawing-result.component.scss
index b367903..35e61b6 100644
--- a/src/app/ui/drawing-result/drawing-result.component.scss
+++ b/src/app/ui/drawing-result/drawing-result.component.scss
@@ -38,7 +38,7 @@
     cursor: pointer;
   }
   h3 {
-    font-size: 26px;
+    font-size: 33px;
     color: #fff;
     margin: 30px 0;
   }
diff --git a/src/app/ui/first-step-copy/first-step-copy.component.scss b/src/app/ui/first-step-copy/first-step-copy.component.scss
index f33532b..7bb9109 100644
--- a/src/app/ui/first-step-copy/first-step-copy.component.scss
+++ b/src/app/ui/first-step-copy/first-step-copy.component.scss
@@ -42,10 +42,10 @@
     display: flex;
     .title{
       position: absolute;
-      left: 28%;
-      top: 80px;
+      left: 27%;
+      top: 75px;
       color: white;
-      font-size: 22px;
+      font-size: 30px;
     }
   }
   .chongzhi{
diff --git a/src/app/ui/first-step-copy/first-step-copy.component.ts b/src/app/ui/first-step-copy/first-step-copy.component.ts
index 3f9c168..92d50d5 100644
--- a/src/app/ui/first-step-copy/first-step-copy.component.ts
+++ b/src/app/ui/first-step-copy/first-step-copy.component.ts
@@ -11,7 +11,29 @@ export class FirstStepCopyComponent implements OnInit {
   constructor(private router: Router) { }
 
   ngOnInit(){
-    
+    var arr2 = [1,2,3,4,5,6,7,8,9,10,11,12,13,14]
+    let p = arr2.sort(() => {
+      return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
+    })
+    var arrSeatcopy = [1,2,3,4,5,6,7,8,9,10,11,12,13,14]
+    var arrSeat2copy = [15,16,17,18,19,20,21,22,23,24,25,26,27,28]
+    let s = arrSeatcopy.sort(() => {
+      return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
+    })
+    let j = arrSeat2copy.sort(() => {
+      return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
+    }) 
+    if(!localStorage.getItem("arr2")){
+      localStorage.setItem("arr2",JSON.stringify(p))
+    }
+    if(!localStorage.getItem("arrSeatcopy")){
+      localStorage.setItem("arrSeatcopy",JSON.stringify(s))
+    }
+    if(!localStorage.getItem("arrSeat2copy")){
+      localStorage.setItem("arrSeat2copy",JSON.stringify(j))
+    }
+    let orgArr = ['南宁支队','柳州支队','桂林支队','梧州支队','北海支队','防城港支队','钦州支队','贵港支队','玉林支队','百色支队','贺州支队','河池支队','来宾支队','崇左支队',]
+    localStorage.setItem("orgArr",JSON.stringify(orgArr))
   }
   //支队数据和是否抽奖
   choujiang=[
diff --git a/src/app/ui/first-step/first-step.component.scss b/src/app/ui/first-step/first-step.component.scss
index 569cf6e..218b8bf 100644
--- a/src/app/ui/first-step/first-step.component.scss
+++ b/src/app/ui/first-step/first-step.component.scss
@@ -43,10 +43,10 @@
   position: relative;
   .title{
     position: absolute;
-    left: 28%;
-    top: 36px;
+    left: 25%;
+    top: 25px;
     color: white;
-    font-size: 22px;
+    font-size: 30px;
   }
 }
 
diff --git a/src/app/ui/first-step/first-step.component.ts b/src/app/ui/first-step/first-step.component.ts
index 73df2a2..881ba41 100644
--- a/src/app/ui/first-step/first-step.component.ts
+++ b/src/app/ui/first-step/first-step.component.ts
@@ -13,51 +13,34 @@ export class FirstStepComponent implements OnInit {
 
   ngOnInit(){
     var arr = [1,2,3,4,5,6,7,8,9,10,11,12,13,14]
-    var arr2 = [1,2,3,4,5,6,7,8,9,10,11,12,13,14]
+    
     var arrSeat = [1,2,3,4,5,6,7,8,9,10,11,12,13,14]
     var arrSeat2 = [15,16,17,18,19,20,21,22,23,24,25,26,27,28]
-    var arrSeatcopy = [1,2,3,4,5,6,7,8,9,10,11,12,13,14]
-    var arrSeat2copy = [15,16,17,18,19,20,21,22,23,24,25,26,27,28]
+    
     let x = arr.sort(() => {
       return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
     })
-    let p = arr2.sort(() => {
-      return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
-    })
+    
     let y = arrSeat.sort(() => {
       return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
     })
     let z = arrSeat2.sort(() => {
       return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
     }) 
-    let s = arrSeatcopy.sort(() => {
-      return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
-    })
-    let j = arrSeat2copy.sort(() => {
-      return Math.round(Math.random()) - 0.5;    //返回随机值（大于0|小于0）
-    }) 
+    
     if(!localStorage.getItem("arr")){
       localStorage.setItem("arr",JSON.stringify(x))
     }
-    if(!localStorage.getItem("arr2")){
-      localStorage.setItem("arr2",JSON.stringify(p))
-    }
+    
     if(!localStorage.getItem("arrSeat")){
       localStorage.setItem("arrSeat",JSON.stringify(y))
     }
     if(!localStorage.getItem("arrSeat2")){
       localStorage.setItem("arrSeat2",JSON.stringify(z))
     }
-    if(!localStorage.getItem("arrSeatcopy")){
-      localStorage.setItem("arrSeatcopy",JSON.stringify(s))
-    }
-    if(!localStorage.getItem("arrSeat2copy")){
-      localStorage.setItem("arrSeat2copy",JSON.stringify(j))
-    }
-    
     let orgArr = ['南宁支队','柳州支队','桂林支队','梧州支队','北海支队','防城港支队','钦州支队','贵港支队','玉林支队','百色支队','贺州支队','河池支队','来宾支队','崇左支队',]
     localStorage.setItem("orgArr",JSON.stringify(orgArr))
-    localStorage.setItem("pagetype",'true')
+    
   }
   
   numList = [
diff --git a/src/app/ui/four-step-copy/four-step-copy.component.html b/src/app/ui/four-step-copy/four-step-copy.component.html
index b3f7e56..a0d7f27 100644
--- a/src/app/ui/four-step-copy/four-step-copy.component.html
+++ b/src/app/ui/four-step-copy/four-step-copy.component.html
@@ -13,7 +13,7 @@
                 <img class="ziti" src="../../../assets/images/tophead.png">
             </div>
             <div class="mainbox">
-                <span class="title">业务理论考试座位号抽签</span>
+                <span class="title">业务理论考试座位号</span>
                 <div class="colum" style="margin-left: 13%;width: 100px;">
                     <div class="centerLefta" >
                         <div class="tanCenterbtna" id="chooseZhi">
diff --git a/src/app/ui/four-step-copy/four-step-copy.component.scss b/src/app/ui/four-step-copy/four-step-copy.component.scss
index 5f125c4..6ec6d71 100644
--- a/src/app/ui/four-step-copy/four-step-copy.component.scss
+++ b/src/app/ui/four-step-copy/four-step-copy.component.scss
@@ -42,10 +42,10 @@
     display: flex;
     .title{
       position: absolute;
-      left: 28%;
-      top: 80px;
+      left: 27%;
+      top: 75px;
       color: white;
-      font-size: 22px;
+      font-size: 30px;
     }
   }
   
diff --git a/src/app/ui/four-step/four-step.component.scss b/src/app/ui/four-step/four-step.component.scss
index b24785b..0100ec6 100644
--- a/src/app/ui/four-step/four-step.component.scss
+++ b/src/app/ui/four-step/four-step.component.scss
@@ -42,16 +42,16 @@
     display: flex;
     .title{
       position: absolute;
-      left: 28%;
-      top: 80px;
+      left: 27%;
+      top: 75px;
       color: white;
-      font-size: 22px;
+      font-size: 30px;
     }
   }
   .chongzhi{
     position: relative;
     top: 75%;
-    right: 23%;
+    right: 23.4%;
   }
   
   .centerLeft{
diff --git a/src/app/ui/luck-draw/luck-draw.component.scss b/src/app/ui/luck-draw/luck-draw.component.scss
index 66c3316..97d0d1d 100644
--- a/src/app/ui/luck-draw/luck-draw.component.scss
+++ b/src/app/ui/luck-draw/luck-draw.component.scss
@@ -41,10 +41,10 @@
 	display: flex;
 	.title{
 		position: absolute;
-		left: 28%;
-		top: 80px;
+		left: 24%;
+		top: 75px;
 		color: white;
-		font-size: 22px;
+		font-size: 30px;
 	  }
 	/* background-attachment: fixed;
 	background-repeat:no-repeat; */