|
@@ -141,9 +141,10 @@ Page({
|
|
|
}
|
|
|
})
|
|
|
const raceList = [];
|
|
|
- for (let i = 0; i < arrangeList.length; i += 2) {
|
|
|
+ for (let i = 0; i < arrangeList.length; i++) {
|
|
|
const d1 = arrangeList[i]
|
|
|
const d2 = arrangeList[i + 1]
|
|
|
+ console.log(d1, d2)
|
|
|
// 前后缺项,没法比赛
|
|
|
if (!(d1 && d2)) continue;
|
|
|
const { pos: d1pos } = d1
|
|
@@ -152,6 +153,8 @@ Page({
|
|
|
if (d1pos[0] !== d2pos[0]) continue
|
|
|
// 前后两项层级一样,但是不是连续的数字,例如:1-1与1-3,不能进行比赛,必须是 前+1=后
|
|
|
if (d1pos[1] + 1 !== d2pos[1]) continue
|
|
|
+ // d2pos[1] 必须是双数,如果不是双数,则不能进行排列
|
|
|
+ if (d2pos[1] % 2 !== 0) continue;
|
|
|
const { player_id: player_one, player_name: player_one_name, node_id: node_id_one } = d1
|
|
|
const { player_id: player_two, player_name: player_two_name, node_id: node_id_two } = d2
|
|
|
raceList.push({ player_one, player_one_name, node_id_one, player_two, player_two_name, node_id_two })
|
|
@@ -159,9 +162,10 @@ Page({
|
|
|
// 因为是数组,所以需要将model特殊处理下,按照一定规则处理可以正常赋值
|
|
|
for (let i = 0; i < raceList.length; i++) {
|
|
|
const d = raceList[i];
|
|
|
- d.groundModelName = `ground_id-${i}`;
|
|
|
- d.refereeModelName = `referee_id-${i}`;
|
|
|
- d.timeModelName = `match_time-${i}`;
|
|
|
+ const { node_id_one, node_id_two } = d
|
|
|
+ d.groundModelName = `ground_id(${node_id_one}-${node_id_two})`;
|
|
|
+ d.refereeModelName = `referee_id(${node_id_one}-${node_id_two})`;
|
|
|
+ d.timeModelName = `match_time(${node_id_one}-${node_id_two})`;
|
|
|
}
|
|
|
const oRaceList = this.data.raceList;
|
|
|
for (const race of raceList) {
|
|
@@ -295,9 +299,10 @@ Page({
|
|
|
const data = event?.detail;
|
|
|
const { value, model } = data;
|
|
|
if (!model) return;
|
|
|
- const arr = model.split('-')
|
|
|
+ const arr = model.split('(')
|
|
|
const modelName = arr[0]
|
|
|
const index = arr[1]
|
|
|
+ console.log(arr[1])
|
|
|
const raceList = this.data.raceList;
|
|
|
raceList[index][modelName] = value;
|
|
|
if (modelName === 'ground_id') {
|