From b84f3f35ffc6775761b6b7b37bcd133b8817d069 Mon Sep 17 00:00:00 2001 From: lichong <18518571399@163.com> Date: Mon, 4 Nov 2024 19:30:45 +0800 Subject: [PATCH] 11.4 --- front/package.json | 2 +- front/src/renderer/src/views/shujufenxi.vue | 42 ++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/front/package.json b/front/package.json index 49860e7..91fd9e6 100644 --- a/front/package.json +++ b/front/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "1.0.14", + "version": "1.0.15", "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 fcb5036..2a1b8ba 100644 --- a/front/src/renderer/src/views/shujufenxi.vue +++ b/front/src/renderer/src/views/shujufenxi.vue @@ -419,7 +419,20 @@ export default { dayjs: dayjs, leftText: "", typeObj: { "1": "体彩", "2": "福彩" }, - placeholderLeftText: "", + placeholderLeftText: `一单一组:034,036合计8 +7单5组:034,687合计48 +单:034,036合计4 +组:084,756合计4 +组六:012345,12356合计20 +组三:1234,2345合计20 +毒:1合计10 +双飞:58合计20 +一码定位:百1,十4,个8合计30 +两码定位:百十85合计30元 +复式:112,223合计60 +全包对子:合计20 +豹子:1合计2 + `, rightTableData: [], rightTableDataTi: [], rightTableDataFu: [], @@ -546,10 +559,10 @@ export default { } this.dailishangList = dailishangListTemp let selectItem = _.find(this.dailishangList, { check: true }) - if (!selectItem) { + if (!selectItem && this.dailishangList.length) { this.dailishangList[0].check = true this.rightTableData = [] - } else { + } else if (selectItem) { this.rightTableData = JSON.parse(selectItem.rightTableData || "[]") } }, @@ -589,6 +602,10 @@ export default { }, // 左侧统计数据 async leftTongji() { + if (!this.dailishangList.length) { + ElMessage.error("请先添加代理人") + return + } let leftTextArr = this.leftText.split("\n") // 将分割后的每个字符串剔除含有日期的字符串和带退的行 leftTextArr = leftTextArr.filter(item => { return !(item.match(/\d{2}:\d{2}:\d{2}/g) || item.includes("退")) }) @@ -767,9 +784,12 @@ export default { let baiReg = /百(\d+)/ let shiReg = /十(\d+)/ let geReg = /个(\d+)/ - let baiList = item.match(baiReg)[1].split("") - let shiList = item.match(shiReg)[1].split("") - let geList = item.match(geReg)[1].split("") + let baiArr = item.match(baiReg) || ["", ""] + let shiArr = item.match(shiReg) || ["", ""] + let geArr = item.match(geReg) || ["", ""] + let baiList = baiArr[1].split("") + let shiList = shiArr[1].split("") + let geList = geArr[1].split("") let length = baiList.length + shiList.length + geList.length if (jine % (length * 10) !== 0) { errorText.push(itemTemp) @@ -814,9 +834,12 @@ export default { let baishiReg = /百十(\d+(?:[,,]\d+)*)/ let shigeReg = /十个(\d+(?:[,,]\d+)*)/ let baigeReg = /百个(\d+(?:[,,]\d+)*)/ - let baishiList = item.match(baishiReg)[1].split(/[,,]/) - let shigeList = item.match(shigeReg)[1].split(/[,,]/) - let baigeList = item.match(baigeReg)[1].split(/[,,]/) + 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 length = baishiList.length + shigeList.length + baigeList.length if (jine % (length * 10) !== 0) { errorText.push(itemTemp) @@ -861,6 +884,7 @@ export default { let match = item.match(this.fushi) let numbers = match[1].replace(/\s+/g, '').replace(/[,,\.]+/g, ','); haoma = _.compact(_.split(numbers, ",")) + console.log(887, haoma); if (jine % (haoma.length * 6) !== 0) { errorText.push(itemTemp) continue