diff --git a/front/src/renderer/src/views/shujufenxi.vue b/front/src/renderer/src/views/shujufenxi.vue index aa8f955..b7935ee 100644 --- a/front/src/renderer/src/views/shujufenxi.vue +++ b/front/src/renderer/src/views/shujufenxi.vue @@ -78,13 +78,13 @@ - + - + @@ -647,6 +647,7 @@ export default { haomaList.push({ type: "danxuan", name: "单选", + valuelabel: `${numberItem}`, value: `${numberItem}`, jine: (jine / 2) / (haoma.length), caipiaotype: type @@ -654,6 +655,7 @@ export default { haomaList.push({ type: "zuxuan", name: "组选", + valuelabel: `${numberItem}`, value: `${numberItem}`, jine: (jine / 2) / (haoma.length), caipiaotype: type @@ -677,8 +679,9 @@ export default { haomaList.push({ type: "danxuan", name: "单选", + valuelabel: `${numberItem}`, value: `${numberItem}`, - jine: (jine - (haoma.length) * numbers2 * 2) / numbers1/(haoma.length), + jine: (jine - (haoma.length) * numbers2 * 2) / numbers1 / (haoma.length), caipiaotype: type }) } @@ -686,8 +689,9 @@ export default { haomaList.push({ type: "zuxuan", name: "组选", + valuelabel: `${numberItem}`, value: `${numberItem}`, - jine: (jine - (haoma.length) * numbers1 * 2) / numbers2/(haoma.length), + jine: (jine - (haoma.length) * numbers1 * 2) / numbers2 / (haoma.length), caipiaotype: type }) } @@ -709,6 +713,7 @@ export default { haomaList.push({ type: `zuliu${key}`, name: "组六", + valuelabel: `${numberItem}`, value: numberItem, jine: (jine / haoma.length), caipiaotype: type @@ -732,6 +737,7 @@ export default { haomaList.push({ type: `zusan${key}`, name: "组三", + valuelabel: `${numberItem}`, value: numberItem, jine: (jine / haoma.length), caipiaotype: type @@ -753,6 +759,7 @@ export default { haomaList.push({ type: `dudan`, name: "毒", + valuelabel: `${numberItem}`, value: numberItem, jine: jine / (haoma.length), caipiaotype: type @@ -773,6 +780,7 @@ export default { haomaList.push({ type: `shuangfei`, name: "双飞", + valuelabel: `${numberItem}`, value: numberItem, jine: jine / (haoma.length), caipiaotype: type @@ -801,6 +809,7 @@ export default { type: `yimadingwei`, typePos: "百", name: "一码定位", + valuelabel: `百${item}`, value: item, jine: jine / length, caipiaotype: type @@ -812,6 +821,7 @@ export default { type: `yimadingwei`, typePos: "十", name: "一码定位", + valuelabel: `十${item}`, value: item, jine: jine / length, caipiaotype: type @@ -823,6 +833,7 @@ export default { type: `yimadingwei`, typePos: "个", name: "一码定位", + valuelabel: `个${item}`, value: item, jine: jine / length, caipiaotype: type @@ -851,6 +862,7 @@ export default { type: `liangmadingwei`, typePos: "百十", name: "两码定位", + valuelabel: `百十${item}`, value: item, jine: jine / length, caipiaotype: type @@ -862,6 +874,7 @@ export default { type: `liangmadingwei`, typePos: "十个", name: "两码定位", + valuelabel: `十个${item}`, value: item, jine: jine / length, caipiaotype: type @@ -873,6 +886,7 @@ export default { type: `liangmadingwei`, typePos: "百个", name: "两码定位", + valuelabel: `百个${item}`, value: item, jine: jine / length, caipiaotype: type @@ -894,6 +908,7 @@ export default { haomaList.push({ type: `fushi`, name: "复式", + valuelabel: `${numberItem}`, value: numberItem, jine: jine / (haoma.length), caipiaotype: type @@ -909,6 +924,7 @@ export default { haomaList.push({ type: `quanbaoduizi`, name: "全包对子", + valuelabel: ``, value: "", jine: jine, caipiaotype: type @@ -928,6 +944,7 @@ export default { haomaList.push({ type: `baozi`, name: "豹子", + valuelabel: `${numberItem}`, value: numberItem, jine: jine / (haoma.length), caipiaotype: type @@ -948,6 +965,7 @@ export default { haomaList.push({ type: `danxuan`, name: "单选", + valuelabel: `${numberItem}`, value: numberItem, jine: jine / (haoma.length), caipiaotype: type @@ -968,6 +986,7 @@ export default { haomaList.push({ type: `zuxuan`, name: "组选", + valuelabel: `${numberItem}`, value: numberItem, jine: jine / (haoma.length), caipiaotype: type @@ -1020,53 +1039,59 @@ export default { let children = [] for (let i = 0; i < value.length; i++) { let element = value[i]; - let findItem = _.find(children, { str: `${element.name}${element.value}` }) + let findItem = _.find(children, { str: `${element.name}${element.valuelabel}` }) if (findItem) { findItem.jine += element.jine } else { children.push({ name: element.name, id: element.id, + valuelabel: `${element.valuelabel}`, value: `${element.value}`, jine: element.jine, - str: `${element.name}${element.value}` + str: `${element.name}${element.valuelabel}` }) } } ticaiList.push({ name: key, id: `ti${key}`, + valuelabel: ``, value: "", jine: _.sumBy(children, 'jine'), children: children }) } + console.log(1065, fucaiGroupy); for (let key in fucaiGroupy) { let value = fucaiGroupy[key] let children = [] for (let i = 0; i < value.length; i++) { let element = value[i]; - let findItem = _.find(children, { str: `${element.name}${element.value}` }) + let findItem = _.find(children, { str: `${element.name}${element.valuelabel}` }) if (findItem) { findItem.jine += element.jine } else { children.push({ name: element.name, id: element.id, + valuelabel: `${element.valuelabel}`, value: `${element.value}`, jine: element.jine, - str: `${element.name}${element.value}` + str: `${element.name}${element.valuelabel}` }) } } fucaiList.push({ name: key, id: `fu${key}`, + valuelabel: ``, value: "", jine: _.sumBy(children, 'jine'), children: children }) } + console.log(1094, ticaiList,fucaiList); this.rightTableDataTi = ticaiList this.rightTableDataFu = fucaiList },