From db8ac38e435505d8a580b0164055c2c59149cce5 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Sun, 18 Oct 2020 15:20:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawing-result.component.ts | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/app/ui/drawing-result/drawing-result.component.ts b/src/app/ui/drawing-result/drawing-result.component.ts index 234fc7e..53b3415 100644 --- a/src/app/ui/drawing-result/drawing-result.component.ts +++ b/src/app/ui/drawing-result/drawing-result.component.ts @@ -15,25 +15,28 @@ export class DrawingResultComponent implements OnInit { this.isOne = false }else{ this.isOne = true + this.tableDataZero = [ + {order: 1, fireName: '南宁支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[0] , name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("南宁支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("南宁支队seatnumbercopy")).fuzhi || ''] }, + {order: 2, fireName: '柳州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[1], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("柳州支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("柳州支队seatnumbercopy")).fuzhi || ''] }, + {order: 3, fireName: '桂林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[2], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("桂林支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("桂林支队seatnumbercopy")).fuzhi || ''] }, + {order: 4, fireName: '梧州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[3], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("梧州支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("梧州支队seatnumbercopy")).fuzhi || ''] }, + {order: 5, fireName: '北海支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[4], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("北海支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("北海支队seatnumbercopy")).fuzhi || ''] }, + {order: 6, fireName: '防城港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[5], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("防城港支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("防城港支队seatnumbercopy")).fuzhi || ''] }, + {order: 7, fireName: '钦州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[6], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("钦州支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("钦州支队seatnumbercopy")).fuzhi || ''] }, + {order: 8, fireName: '贵港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[7], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贵港支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("贵港支队seatnumbercopy")).fuzhi || ''] }, + {order: 9, fireName: '玉林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[8], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("玉林支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("玉林支队seatnumbercopy")).fuzhi || ''] }, + {order: 10, fireName: '百色支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[9], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("百色支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("百色支队seatnumbercopy")).fuzhi || ''] }, + {order: 11, fireName: '贺州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[10], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贺州支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("贺州支队seatnumbercopy")).fuzhi || ''] }, + {order: 12, fireName: '河池支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[11], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("河池支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("河池支队seatnumbercopy")).fuzhi || '']}, + {order: 13, fireName: '来宾支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[12], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("来宾支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("来宾支队seatnumbercopy")).fuzhi || ''] }, + {order: 14, fireName: '崇左支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[13], name: ['支队长','副支队长'], seatNum:[JSON.parse(localStorage.getItem("崇左支队seatnumbercopy")).zhi || '',JSON.parse(localStorage.getItem("崇左支队seatnumbercopy")).fuzhi || '']}, + ] } } headersZero:string [] = ['序号','支队名称','抽签顺序', '职级','座位号'] tableDataZero = [ - {order: 1, fireName: '南宁支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[0] , name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("南宁支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("南宁支队seatnumbercopy")).fuzhi] }, - {order: 2, fireName: '柳州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[1], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("柳州支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("柳州支队seatnumbercopy")).fuzhi] }, - {order: 3, fireName: '桂林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[2], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("桂林支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("桂林支队seatnumbercopy")).fuzhi] }, - {order: 4, fireName: '梧州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[3], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("梧州支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("梧州支队seatnumbercopy")).fuzhi] }, - {order: 5, fireName: '北海支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[4], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("北海支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("北海支队seatnumbercopy")).fuzhi] }, - {order: 6, fireName: '防城港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[5], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("防城港支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("防城港支队seatnumbercopy")).fuzhi] }, - {order: 7, fireName: '钦州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[6], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("钦州支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("钦州支队seatnumbercopy")).fuzhi] }, - {order: 8, fireName: '贵港支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[7], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贵港支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("贵港支队seatnumbercopy")).fuzhi] }, - {order: 9, fireName: '玉林支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[8], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("玉林支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("玉林支队seatnumbercopy")).fuzhi] }, - {order: 10, fireName: '百色支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[9], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("百色支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("百色支队seatnumbercopy")).fuzhi] }, - {order: 11, fireName: '贺州支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[10], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("贺州支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("贺州支队seatnumbercopy")).fuzhi] }, - {order: 12, fireName: '河池支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[11], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("河池支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("河池支队seatnumbercopy")).fuzhi]}, - {order: 13, fireName: '来宾支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[12], name: ['支队长','副支队长'], seatNum: [JSON.parse(localStorage.getItem("来宾支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("来宾支队seatnumbercopy")).fuzhi] }, - {order: 14, fireName: '崇左支队', drawLotsOrder: JSON.parse(localStorage.getItem("arr2"))[13], name: ['支队长','副支队长'], seatNum:[JSON.parse(localStorage.getItem("崇左支队seatnumbercopy")).zhi,JSON.parse(localStorage.getItem("崇左支队seatnumbercopy")).fuzhi]}, + ] headers:string [] = ['序号','支队名称','抽签顺序','场景类型', '职级','座位号']