lichong
/
jihuo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11.18

master
lichong 5 months ago
parent
c151bad344
commit
4c197777c0
3 changed files with 138 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      front/package.json
  2. 2
      front/src/renderer/src/assets/js/db.js
  3. 146
      front/src/renderer/src/views/shujufenxi.vue

2
front/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "electron", "name": "electron",
"version": "1.0.18", "version": "1.0.19",
"description": "An Electron application with Vue", "description": "An Electron application with Vue",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "lichong", "author": "lichong",

2
front/src/renderer/src/assets/js/db.js
View File

@ -4,7 +4,7 @@ export const myDatabase = new Dexie('myDatabase');
// 定义数据库版本 // 定义数据库版本
myDatabase.version(1).stores({ myDatabase.version(1).stores({
changci: '++id, changciid, xuhao, &time, first, second, third, note, create_at, update_at', changci: '++id, changciid, xuhao, &time, first, second, third, type, note, create_at, update_at',
dailishang: '++id, dailishangid, xuhao, name, phone, dailifei, note, create_at, update_at', dailishang: '++id, dailishangid, xuhao, name, phone, dailifei, note, create_at, update_at',
jihuoshijian: '++id, jihuoma, isVip, zhucema, startTime, endTime,create_at, update_at' jihuoshijian: '++id, jihuoma, isVip, zhucema, startTime, endTime,create_at, update_at'
}); });

146
front/src/renderer/src/views/shujufenxi.vue
View File

@ -212,11 +212,11 @@
100).toFixed(2) }} 100).toFixed(2) }}
</td> </td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content"> <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) + {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) -
Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) * Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) / ((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhong") 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)) 0))
/ /
100).toFixed(2))).toFixed(2) 100).toFixed(2))).toFixed(2)
@ -249,11 +249,11 @@
100).toFixed(2) }} 100).toFixed(2) }}
</td> </td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content"> <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) + {{ ((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) -
Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) * Number((((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
((checkDailishangRaw.dailifei || 0))) / ((checkDailishangRaw.dailifei || 0))) /
100).toFixed(2)) - _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhong") 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)) 0))
/ /
100).toFixed(2))).toFixed(2) 100).toFixed(2))).toFixed(2)
@ -264,6 +264,56 @@
</table> </table>
</div> </div>
</div> </div>
<div class="el-descriptions el-descriptions--large">
<div class="el-descriptions__body">
<table class="el-descriptions__table is-bordered">
<thead>
<tr>
<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>
<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>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in dialogData" :key="index">
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.type }}-{{ item.valuelabel }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.caipiaotype }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.zhu }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.zhongzhu }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.alljine }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.zhong }}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div> </div>
<div id="screenshot1" v-show="false" style="padding: 12px;"> <div id="screenshot1" v-show="false" style="padding: 12px;">
<div class="el-descriptions el-descriptions--large"> <div class="el-descriptions el-descriptions--large">
@ -376,6 +426,56 @@
</table> </table>
</div> </div>
</div> </div>
<div class="el-descriptions el-descriptions--large">
<div class="el-descriptions__body">
<table class="el-descriptions__table is-bordered">
<thead>
<tr>
<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>
<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>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in dialogData" :key="index">
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.type }}-{{ item.valuelabel }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.caipiaotype }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.zhu }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.zhongzhu }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.alljine }}
</td>
<td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
{{ item.zhong }}
</td>
</tr>
</tbody>
</table>
</div>
</div>
</div> </div>
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
@ -545,6 +645,7 @@ export default {
label: element.xuhao, label: element.xuhao,
xuhao: element.xuhao, xuhao: element.xuhao,
value: element.id, value: element.id,
type: element.type,
first: element.first, first: element.first,
second: element.second, second: element.second,
third: element.third, third: element.third,
@ -1204,10 +1305,11 @@ export default {
return return
} }
let formData = { ...this.formLocal, ...checkDailishangRaw } let formData = { ...this.formLocal, ...checkDailishangRaw }
this.checkDailishangRaw=checkDailishangRaw this.checkDailishangRaw = checkDailishangRaw
// 选中的场次 // 选中的场次
let selectChangci = _.find(this.changciList, { value: this.changciValue }) let selectChangci = _.find(this.changciList, { value: this.changciValue })
this.selectChangci = selectChangci this.selectChangci = selectChangci
console.log(1281, selectChangci, this.changciList);
// 中奖号码 // 中奖号码
let zhonghaoma = `${selectChangci.first}${selectChangci.second}${selectChangci.third}` let zhonghaoma = `${selectChangci.first}${selectChangci.second}${selectChangci.third}`
let rightTableDataLocal = _.cloneDeep(this.rightTableData) let rightTableDataLocal = _.cloneDeep(this.rightTableData)
@ -1220,6 +1322,7 @@ export default {
return return
} }
let haomaList = [] let haomaList = []
console.log(1293, rightTableDataLocal);
for (let i = 0; i < rightTableDataLocal.length; i++) { for (let i = 0; i < rightTableDataLocal.length; i++) {
let item = rightTableDataLocal[i]; let item = rightTableDataLocal[i];
for (let j = 0; j < item.caipiaotype.length; j++) { for (let j = 0; j < item.caipiaotype.length; j++) {
@ -1239,13 +1342,22 @@ export default {
} }
} }
} }
console.log(1313, haomaList);
let firstList = [] let firstList = []
for (let i = 0; i < haomaList.length; i++) { for (let i = 0; i < haomaList.length; i++) {
let element = haomaList[i] let element = haomaList[i]
if (selectChangci.type === "1" && element.caipiaotype === "体彩") {
} else if (selectChangci.type === "2" && element.caipiaotype === "福彩") {
} else {
continue
}
// 单选 // 单选
let item = { let item = {
type: `${element.name}`, type: `${element.name}`,
caipiaotype: element.caipiaotype, caipiaotype: element.caipiaotype,
valuelabel: element.valuelabel,
} }
if (["danxuan"].includes(element.type)) { if (["danxuan"].includes(element.type)) {
item["xiangmu"] = `${element.value}` item["xiangmu"] = `${element.value}`
@ -1415,27 +1527,41 @@ export default {
item["pei"] = 0 item["pei"] = 0
} }
} }
firstList.push(item) firstList.push(item)
} }
let secondList = [] let secondList = []
for (let i = 0; i < firstList.length; i++) { for (let i = 0; i < firstList.length; i++) {
let element = firstList[i]; let element = firstList[i];
let secondItem = _.find(secondList, { xiangmutype: `${element.xiangmu}${element.type}` }) let secondItem = _.find(secondList, { xiangmutype: `${element.xiangmu}${element.type}${element.caipiaotype}` })
if (secondItem) { if (secondItem) {
secondItem.zhu += 1 secondItem.zhu += 1
secondItem.alljine += element.alljine secondItem.alljine += element.alljine
secondItem.pei += element.pei secondItem.pei += element.pei
secondItem.zhong += element.zhong secondItem.zhong += element.zhong
secondItem.zhongzhu += element.zhongzhu
} else { } else {
secondList.push({ secondList.push({
...element, ...element,
xiangmutype: `${element.xiangmu}${element.type}`, xiangmutype: `${element.xiangmu}${element.type}${element.caipiaotype}`,
zhu: 1 zhu: 1
}) })
} }
} }
this.dialogData = _.cloneDeep(secondList) let thirdData = []
console.log(1512, firstList, secondList);
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "体彩") {
thirdData.push({ ...element })
}
}
for (let index = 0; index < secondList.length; index++) {
let element = secondList[index];
if (element.caipiaotype === "福彩") {
thirdData.push({ ...element })
}
}
this.dialogData = _.cloneDeep(thirdData)
this.dialogForm.visible = true this.dialogForm.visible = true
}, },
// 开奖前预测 // 开奖前预测
@ -1447,7 +1573,7 @@ export default {
return return
} }
let formData = { ...this.formLocal, ...checkDailishangRaw } let formData = { ...this.formLocal, ...checkDailishangRaw }
this.checkDailishangRaw=checkDailishangRaw this.checkDailishangRaw = checkDailishangRaw
let rightTableDataLocal = _.cloneDeep(this.rightTableData) let rightTableDataLocal = _.cloneDeep(this.rightTableData)
if (!rightTableDataLocal.length) { if (!rightTableDataLocal.length) {
ElMessage.error({ ElMessage.error({

Write Preview
Loading…
Cancel
Save