diff --git a/front/package.json b/front/package.json
index d01e83c..989f719 100644
--- a/front/package.json
+++ b/front/package.json
@@ -1,6 +1,6 @@
{
"name": "electron",
- "version": "1.0.19",
+ "version": "1.0.20",
"description": "An Electron application with Vue",
"main": "./out/main/index.js",
"author": "lichong",
diff --git a/front/src/renderer/src/views/shujufenxi.vue b/front/src/renderer/src/views/shujufenxi.vue
index 6d84223..c1d89dc 100644
--- a/front/src/renderer/src/views/shujufenxi.vue
+++ b/front/src/renderer/src/views/shujufenxi.vue
@@ -90,7 +90,8 @@
</div>
<template #footer>
<div style="text-align: center;">
- <el-button text type="danger" @click="kaijiangqianyuce" style="padding-left: 0">输赢计算</el-button>
+ <el-button text type="danger" @click="kaijiangqianyuce(['ti'])" style="padding-left: 0">体彩</el-button>
+ <el-button text type="danger" @click="kaijiangqianyuce(['fu'])" style="padding-left: 0">福彩</el-button>
<el-button text type="danger" @click="rightClear" style="padding-left: 0">清空</el-button>
<el-button text type="danger" @click="allRightClear" style="padding-left: 0">全部清空</el-button>
</div>
@@ -108,6 +109,11 @@
</div>
</template>
<div id="screenkaijiangqian">
+ <el-row>
+ <el-col :span="8">总押注：{{ _.sumBy(kaijiangqianlist, "zhu") }}</el-col>
+ <el-col :span="8">总金额：{{ _.sumBy(kaijiangqianlist, "alljine") }}</el-col>
+ <el-col :span="8">总赔付：{{ _.sumBy(kaijiangqianlist, "pei") }}</el-col>
+ </el-row>
<el-table :data="kaijiangqianlist" style="margin-top: 8px" border>
<el-table-column prop="valuelabel" label="号码" align="center" width="93">
</el-table-column>
@@ -124,6 +130,11 @@
</el-table>
</div>
<div id="screenkaijiangqian1" v-show="false" style="padding: 12px;">
+ <el-row>
+ <el-col :span="8">总押注：{{ _.sumBy(kaijiangqianlist, "zhu") }}</el-col>
+ <el-col :span="8">总金额：{{ _.sumBy(kaijiangqianlist, "alljine") }}</el-col>
+ <el-col :span="8">总赔付：{{ _.sumBy(kaijiangqianlist, "pei") }}</el-col>
+ </el-row>
<el-table :data="kaijiangqianlist" style="margin-top: 8px" border>
<el-table-column prop="valuelabel" label="号码" align="center" width="88">
</el-table-column>
@@ -165,6 +176,9 @@
<th class="el-descriptions__cell el-descriptions__label is-bordered-label is-vertical-label">
类型
</th>
+ <th class="el-descriptions__cell el-descriptions__label is-bordered-label is-vertical-label">
+ 总金额
+ </th>
<th class="el-descriptions__cell el-descriptions__label is-bordered-label is-vertical-label">
总押注
</th>
@@ -193,6 +207,9 @@
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
体彩
</td>
+ <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
+ {{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") }}
+ </td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhu") }}
</td>
@@ -230,6 +247,9 @@
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
福彩
</td>
+ <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
+ {{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") }}
+ </td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhu") }}
</td>
@@ -264,7 +284,7 @@
</table>
</div>
</div>
- <div class="el-descriptions el-descriptions--large">
+ <div class="el-descriptions el-descriptions--large" v-if="dialogData.length">
<div class="el-descriptions__body">
<table class="el-descriptions__table is-bordered">
<thead>
@@ -426,7 +446,7 @@
</table>
</div>
</div>
- <div class="el-descriptions el-descriptions--large">
+ <div class="el-descriptions el-descriptions--large" v-if="dialogData.length">
<div class="el-descriptions__body">
<table class="el-descriptions__table is-bordered">
<thead>
@@ -962,9 +982,9 @@ export default {
let baishiArr = item.match(baishiReg) || ["", ""]
let shigeArr = item.match(shigeReg) || ["", ""]
let baigeArr = item.match(baigeReg) || ["", ""]
- let baishiList = baishiArr[1].split(/[,，]/)
- let shigeList = shigeArr[1].split(/[,，]/)
- let baigeList = baigeArr[1].split(/[,，]/)
+ let baishiList = _.compact(baishiArr[1].split(/[,，]/))
+ let shigeList = _.compact(shigeArr[1].split(/[,，]/))
+ let baigeList = _.compact(baigeArr[1].split(/[,，]/))
let length = baishiList.length + shigeList.length + baigeList.length
if (jine % (length * 10) !== 0) {
errorText.push(itemTemp)
@@ -1236,7 +1256,10 @@ export default {
},
// 开奖前预测弹窗关闭
closeDialog1() {
- this.kaijiangqian.visible = false
+ this.kaijiangqian = {
+ visible: false,
+ title: "开奖前预测",
+ }
},
// 中间清空数据
midClear() {
@@ -1552,20 +1575,24 @@ export default {
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "体彩") {
- thirdData.push({ ...element })
+ if (element.zhongzhu) {
+ thirdData.push({ ...element })
+ }
}
}
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "福彩") {
- thirdData.push({ ...element })
+ if (element.zhongzhu) {
+ thirdData.push({ ...element })
+ }
}
}
this.dialogData = _.cloneDeep(thirdData)
this.dialogForm.visible = true
},
// 开奖前预测
- kaijiangqianyuce() {
+ kaijiangqianyuce(type = []) {
// 选中的代理商
let checkDailishangRaw = _.find(this.dailishangList, { check: true })
if (!checkDailishangRaw) {
@@ -1588,13 +1615,13 @@ export default {
let item = rightTableDataLocal[i];
for (let j = 0; j < item.caipiaotype.length; j++) {
let element = item.caipiaotype[j];
- if (element == "体彩") {
+ if (element == "体彩" && type.includes("ti")) {
haomaList.push({
...item,
id: `ti${j}`,
caipiaotype: element
})
- } else if (element == "福彩") {
+ } else if (element == "福彩" && type.includes("fu")) {
haomaList.push({
...item,
id: `fu${j}`,
@@ -1674,7 +1701,11 @@ export default {
}
}
this.kaijiangqianlist = _.cloneDeep(thirdData)
- this.kaijiangqian.visible = true
+ let typeObj = { ti: "体彩", fu: "福彩", all: "体彩、福彩" }
+ this.kaijiangqian = {
+ visible: true,
+ title: `开奖前预测(${typeObj[type]})`,
+ }
},
},