From 2ea05513d514370672f2124ac8c730ca76f2c016 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sun, 18 Oct 2020 12:27:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9=E5=BA=A7?= =?UTF-8?q?=E4=BD=8D=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawing-result/drawing-result.component.ts | 4 ++-- .../first-step-copy.component.html | 1 - .../first-step-copy.component.scss | 2 +- src/app/ui/first-step/first-step.component.ts | 4 +--- src/assets/js/fourstep.js | 16 ++++++++-------- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/app/ui/drawing-result/drawing-result.component.ts b/src/app/ui/drawing-result/drawing-result.component.ts index 3a6fc59..d375e83 100644 --- a/src/app/ui/drawing-result/drawing-result.component.ts +++ b/src/app/ui/drawing-result/drawing-result.component.ts @@ -40,9 +40,9 @@ export class DrawingResultComponent implements OnInit { 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: 3, fireName: '桂林支队', drawLotsOrder: '14', num: localStorage.getItem('14') || '', name: ['支队长','副支队长'], seatNum: ['14号','22号'] }, {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: 5, fireName: '北海支队', drawLotsOrder: '08', num: localStorage.getItem('8') || '', name: ['支队长','副支队长'], seatNum: ['4号','15号'] }, {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号'] }, 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 index b467f2c..48434de 100644 --- a/src/app/ui/first-step-copy/first-step-copy.component.html +++ b/src/app/ui/first-step-copy/first-step-copy.component.html @@ -60,7 +60,6 @@
开始抽签
-
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 dcc44ad..efffef6 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 @@ -44,7 +44,7 @@ .chongzhi{ position: relative; top: 85%; - right: 29%; + right: 23.5%; } .centerLeft{ background-color: #FFF; diff --git a/src/app/ui/first-step/first-step.component.ts b/src/app/ui/first-step/first-step.component.ts index 0c3ae00..2670c7a 100644 --- a/src/app/ui/first-step/first-step.component.ts +++ b/src/app/ui/first-step/first-step.component.ts @@ -10,9 +10,7 @@ export class FirstStepComponent implements OnInit { constructor() { } ngOnInit(){ - window.setTimeout(()=>{ - //zhuan.drawRouletteWheel() - },0) + } diff --git a/src/assets/js/fourstep.js b/src/assets/js/fourstep.js index 61bad39..e2877f8 100644 --- a/src/assets/js/fourstep.js +++ b/src/assets/js/fourstep.js @@ -14,13 +14,13 @@ $(document).ready(function(){ localStorage.setItem(selectedtime,JSON.stringify({zhi:"12号",fuzhi:"26号"})) return 11; }else if(selected == "桂林支队"){ - localStorage.setItem(selectedtime,JSON.stringify({zhi:"14号",fuzhi:"15号"})) + localStorage.setItem(selectedtime,JSON.stringify({zhi:"14号",fuzhi:"22号"})) return 13; }else if(selected == "梧州支队"){ localStorage.setItem(selectedtime,JSON.stringify({zhi:"13号",fuzhi:"28号"})) return 12; }else if(selected == "北海支队"){ - localStorage.setItem(selectedtime,JSON.stringify({zhi:"4号",fuzhi:"22号"})) + localStorage.setItem(selectedtime,JSON.stringify({zhi:"4号",fuzhi:"15号"})) return 3; }else if(selected == "防城港支队"){ localStorage.setItem(selectedtime,JSON.stringify({zhi:"1号",fuzhi:"16号"})) @@ -63,14 +63,14 @@ $(document).ready(function(){ localStorage.setItem(selectedtime,JSON.stringify({zhi:"12号",fuzhi:"26号"})) return 11; }else if(selected == "桂林支队"){ - localStorage.setItem(selectedtime,JSON.stringify({zhi:"14号",fuzhi:"15号"})) - return 0; + localStorage.setItem(selectedtime,JSON.stringify({zhi:"14号",fuzhi:"22号"})) + return 7; }else if(selected == "梧州支队"){ localStorage.setItem(selectedtime,JSON.stringify({zhi:"13号",fuzhi:"28号"})) return 13; }else if(selected == "北海支队"){ - localStorage.setItem(selectedtime,JSON.stringify({zhi:"4号",fuzhi:"22号"})) - return 7; + localStorage.setItem(selectedtime,JSON.stringify({zhi:"4号",fuzhi:"15号"})) + return 0; }else if(selected == "防城港支队"){ localStorage.setItem(selectedtime,JSON.stringify({zhi:"1号",fuzhi:"16号"})) return 1; @@ -104,9 +104,9 @@ $(document).ready(function(){ var data = [ {'南宁支队':'8号21号'}, {'柳州支队':'12号26号'}, - {'桂林支队':'14号15号'}, + {'桂林支队':'14号22号'}, {'梧州支队':'13号28号'}, - {'北海支队':'4号22号'}, + {'北海支队':'4号15号'}, {'防城港支队':'1号16号'}, {'钦州支队':'10号25号'}, {'贵港支队':'11号19号'},