diff --git a/front/package.json b/front/package.json
index 91fd9e6..63e5da2 100644
--- a/front/package.json
+++ b/front/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "1.0.15",
+ "version": "1.0.18",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "lichong",
diff --git a/front/src/renderer/src/assets/json/changci.json b/front/src/renderer/src/assets/json/changci.json
index 8d04b68..662a1a0 100644
--- a/front/src/renderer/src/assets/json/changci.json
+++ b/front/src/renderer/src/assets/json/changci.json
@@ -15,7 +15,7 @@
"formShow": true
},
{
- "label": "第一个数",
+ "label": "百",
"prop": "first",
"type": "number",
"tableShow": true,
@@ -24,7 +24,7 @@
"max": 9
},
{
- "label": "第二个数",
+ "label": "十",
"prop": "second",
"type": "number",
"tableShow": true,
@@ -33,7 +33,7 @@
"max": 9
},
{
- "label": "第三个数",
+ "label": "个",
"prop": "third",
"type": "number",
"tableShow": true,
diff --git a/front/src/renderer/src/assets/json/dailishang.json b/front/src/renderer/src/assets/json/dailishang.json
index fb00003..1a88c8d 100644
--- a/front/src/renderer/src/assets/json/dailishang.json
+++ b/front/src/renderer/src/assets/json/dailishang.json
@@ -25,6 +25,15 @@
"tableShow": true,
"formShow": true
},
+ {
+ "label": "单选(倍率)",
+ "prop": "danxuan",
+ "type": "number",
+ "required": true,
+ "default": 900,
+ "tableShow": true,
+ "formShow": true
+ },
{
"label": "组选(倍率)",
"prop": "zuxuan",
diff --git a/front/src/renderer/src/views/shujufenxi.vue b/front/src/renderer/src/views/shujufenxi.vue
index 58945b8..d8534c3 100644
--- a/front/src/renderer/src/views/shujufenxi.vue
+++ b/front/src/renderer/src/views/shujufenxi.vue
@@ -188,7 +188,7 @@
- {{ selectChangci.jiangxiang }}
+ {{ selectChangci.jiangxiang1 }}
|
体彩
@@ -212,11 +212,11 @@
100).toFixed(2) }}
|
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) -
+ {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) +
Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhong")
- - Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue ||
+ + Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") * (fuwufei.fuwufeiValue ||
0))
/
100).toFixed(2))).toFixed(2)
@@ -225,7 +225,7 @@
|
- {{ selectChangci.jiangxiang }}
+ {{ selectChangci.jiangxiang1 }}
|
福彩
@@ -249,11 +249,11 @@
100).toFixed(2) }}
|
- {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) -
+ {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) +
Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhong")
- - Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue ||
+ + Number(((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") * (fuwufei.fuwufeiValue ||
0))
/
100).toFixed(2))).toFixed(2)
@@ -300,7 +300,7 @@
|
- {{ selectChangci.jiangxiang }}
+ {{ selectChangci.jiangxiang1 }}
|
体彩
@@ -337,7 +337,7 @@
|
- {{ selectChangci.jiangxiang }}
+ {{ selectChangci.jiangxiang1 }}
|
福彩
@@ -549,7 +549,8 @@ export default {
second: element.second,
third: element.third,
title: `${element.xuhao}:${element.first}-${element.second}-${element.third}`,
- jiangxiang: `${element.third}-${element.second}-${element.first}`
+ jiangxiang: `${element.third}-${element.second}-${element.first}`,
+ jiangxiang1: `${element.first}-${element.second}-${element.third}`
})
}
},
@@ -1203,6 +1204,7 @@ export default {
return
}
let formData = { ...this.formLocal, ...checkDailishangRaw }
+ this.checkDailishangRaw=checkDailishangRaw
// 选中的场次
let selectChangci = _.find(this.changciList, { value: this.changciValue })
this.selectChangci = selectChangci
@@ -1424,6 +1426,7 @@ export default {
secondItem.zhu += 1
secondItem.alljine += element.alljine
secondItem.pei += element.pei
+ secondItem.zhong += element.zhong
} else {
secondList.push({
...element,
@@ -1444,6 +1447,7 @@ export default {
return
}
let formData = { ...this.formLocal, ...checkDailishangRaw }
+ this.checkDailishangRaw=checkDailishangRaw
let rightTableDataLocal = _.cloneDeep(this.rightTableData)
if (!rightTableDataLocal.length) {
ElMessage.error({
|