Skip to content

公瑾 / lucky-draw

Go to a project
Toggle navigation
Toggle navigation pinning
59660f44 by zhangyongfeng
Options

删除默认配置

1 parent cd7de73b
Inline Side-by-side
Showing 4 changed files with 13 additions and 101 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <el-dialog 2 <el-dialog
3 :visible="visible" 3 :visible="visible"
4 :append-to-body="true" 4 :append-to-body="true"
5 width="400px" 5 width="390px"
6 @close="$emit('update:visible', false)" 6 @close="$emit('update:visible', false)"
7 class="c-LotteryConfig" 7 class="c-LotteryConfig"
8 > 8 >
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
19 > 19 >
20 </div> 20 </div>
21 <div class="container"> 21 <div class="container">
22 <el-form ref="form" :model="form" label-width="90px" size="mini"> 22 <el-form ref="form" :model="form" size="mini">
23 <el-form-item label="抽奖标题"> 23 <el-form-item label="抽奖标题">
24 <el-input v-model="form.name"></el-input> 24 <el-input v-model="form.name"></el-input>
25 </el-form-item> 25 </el-form-item>
...@@ -31,14 +31,6 @@ ...@@ -31,14 +31,6 @@
31 :step="1" 31 :step="1"
32 ></el-input> 32 ></el-input>
33 </el-form-item> 33 </el-form-item>
34 <el-form-item label="特等奖">
35 <el-input
36 type="number"
37 v-model="form.specialAward"
38 :min="0"
39 :step="1"
40 ></el-input>
41 </el-form-item>
42 <el-form-item label="一等奖"> 34 <el-form-item label="一等奖">
43 <el-input 35 <el-input
44 type="number" 36 type="number"
...@@ -47,39 +39,6 @@ ...@@ -47,39 +39,6 @@
47 :step="1" 39 :step="1"
48 ></el-input> 40 ></el-input>
49 </el-form-item> 41 </el-form-item>
50 <el-form-item label="二等奖">
51 <el-input
52 type="number"
53 v-model="form.secondPrize"
54 :min="0"
55 :step="1"
56 ></el-input>
57 </el-form-item>
58 <el-form-item label="三等奖">
59 <el-input
60 type="number"
61 v-model="form.thirdPrize"
62 :min="0"
63 :step="1"
64 ></el-input>
65 </el-form-item>
66 <el-form-item label="四等奖">
67 <el-input
68 type="number"
69 v-model="form.fourthPrize"
70 :min="0"
71 :step="1"
72 ></el-input>
73 </el-form-item>
74 <el-form-item label="五等奖">
75 <el-input
76 type="number"
77 v-model="form.fifthPrize"
78 :min="0"
79 :step="1"
80 ></el-input>
81 </el-form-item>
82
83 <el-form-item 42 <el-form-item
84 :label="newitem.name" 43 :label="newitem.name"
85 v-for="newitem in storeNewLottery" 44 v-for="newitem in storeNewLottery"
......
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
15 } 15 }
16 */ 16 */
17 17
18 export function generateArray(start, end) {
19 return Array.from(new Array(end + 1).keys()).slice(start);
20 }
21
18 /** 22 /**
19 * 取范围内随机整数 23 * 取范围内随机整数
20 * @param {number} minNum 24 * @param {number} minNum
...@@ -30,13 +34,8 @@ export function randomNum(minNum = 1, maxNum) { ...@@ -30,13 +34,8 @@ export function randomNum(minNum = 1, maxNum) {
30 * @param {number} num 本次抽取人数 34 * @param {number} num 本次抽取人数
31 */ 35 */
32 export function luckydrawHandler(total, won = [], num) { 36 export function luckydrawHandler(total, won = [], num) {
33 const peolist = []; 37 const peolist = generateArray(1, Number(total));
34 for (let i = 1; i <= total; i++) {
35 peolist.push(i);
36 }
37
38 const wons = won; 38 const wons = won;
39
40 const res = []; 39 const res = [];
41 for (let j = 0; j < num; j++) { 40 for (let j = 0; j < num; j++) {
42 const nodraws = peolist.filter(item => !wons.includes(item)); 41 const nodraws = peolist.filter(item => !wons.includes(item));
......
...@@ -40,25 +40,9 @@ export const listField = 'list'; // 名单 ...@@ -40,25 +40,9 @@ export const listField = 'list'; // 名单
40 export function conversionCategoryName(key) { 40 export function conversionCategoryName(key) {
41 let name = ''; 41 let name = '';
42 switch (key) { 42 switch (key) {
43 case 'specialAward':
44 name = '特等奖';
45 break;
46 case 'firstPrize': 43 case 'firstPrize':
47 name = '一等奖'; 44 name = '一等奖';
48 break; 45 break;
49 case 'secondPrize':
50 name = '二等奖';
51 break;
52 case 'thirdPrize':
53 name = '三等奖';
54 break;
55 case 'fourthPrize':
56 name = '四等奖';
57 break;
58 case 'fifthPrize':
59 name = '五等奖';
60 break;
61
62 default: 46 default:
63 break; 47 break;
64 } 48 }
......
...@@ -14,20 +14,10 @@ export default new Vuex.Store({ ...@@ -14,20 +14,10 @@ export default new Vuex.Store({
14 config: { 14 config: {
15 name: '年会抽奖', 15 name: '年会抽奖',
16 number: 70, 16 number: 70,
17 specialAward: 0, 17 firstPrize: 1
18 firstPrize: 1,
19 secondPrize: 5,
20 thirdPrize: 8,
21 fourthPrize: 10,
22 fifthPrize: 20
23 }, 18 },
24 result: { 19 result: {
25 specialAward: [], 20 firstPrize: []
26 firstPrize: [],
27 secondPrize: [],
28 thirdPrize: [],
29 fourthPrize: [],
30 fifthPrize: []
31 }, 21 },
32 newLottery: [], 22 newLottery: [],
33 list: [], 23 list: [],
...@@ -38,12 +28,7 @@ export default new Vuex.Store({ ...@@ -38,12 +28,7 @@ export default new Vuex.Store({
38 state.config = { 28 state.config = {
39 name: '年会抽奖', 29 name: '年会抽奖',
40 number: 70, 30 number: 70,
41 specialAward: 0, 31 firstPrize: 1
42 firstPrize: 1,
43 secondPrize: 5,
44 thirdPrize: 8,
45 fourthPrize: 10,
46 fifthPrize: 20
47 }; 32 };
48 state.newLottery = []; 33 state.newLottery = [];
49 }, 34 },
...@@ -55,32 +40,17 @@ export default new Vuex.Store({ ...@@ -55,32 +40,17 @@ export default new Vuex.Store({
55 }, 40 },
56 setClearResult(state) { 41 setClearResult(state) {
57 state.result = { 42 state.result = {
58 specialAward: [], 43 firstPrize: []
59 firstPrize: [],
60 secondPrize: [],
61 thirdPrize: [],
62 fourthPrize: [],
63 fifthPrize: []
64 }; 44 };
65 }, 45 },
66 setClearStore(state) { 46 setClearStore(state) {
67 state.config = { 47 state.config = {
68 name: '年会抽奖', 48 name: '年会抽奖',
69 number: 70, 49 number: 70,
70 specialAward: 0, 50 firstPrize: 1
71 firstPrize: 1,
72 secondPrize: 5,
73 thirdPrize: 8,
74 fourthPrize: 10,
75 fifthPrize: 20
76 }; 51 };
77 state.result = { 52 state.result = {
78 specialAward: [], 53 firstPrize: []
79 firstPrize: [],
80 secondPrize: [],
81 thirdPrize: [],
82 fourthPrize: [],
83 fifthPrize: []
84 }; 54 };
85 state.newLottery = []; 55 state.newLottery = [];
86 state.list = []; 56 state.list = [];
......