From b4b5139f5b5761e71df49dc97d2d4b07633bfda8 Mon Sep 17 00:00:00 2001
From: lichong <18518571399@163.com>
Date: Thu, 17 Oct 2024 20:24:15 +0800
Subject: [PATCH] 10.17

---
 front/package.json                          |   2 +-
 front/src/renderer/src/assets/css/base.css  |   3 +
 front/src/renderer/src/views/shujufenxi.vue | 113 ++++++++++++++++++--
 3 files changed, 110 insertions(+), 8 deletions(-)

diff --git a/front/package.json b/front/package.json
index cf18872..ef4ebbb 100644
--- a/front/package.json
+++ b/front/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "lichong",
diff --git a/front/src/renderer/src/assets/css/base.css b/front/src/renderer/src/assets/css/base.css
index 416d18d..aa1aaa1 100644
--- a/front/src/renderer/src/assets/css/base.css
+++ b/front/src/renderer/src/assets/css/base.css
@@ -7,4 +7,7 @@ body {
 .el-table-v2__header-wrapper {
   height: 0px !important;
   visibility: hidden !important;
+}
+.cell{
+  padding: 0 !important;
 }
\ No newline at end of file
diff --git a/front/src/renderer/src/views/shujufenxi.vue b/front/src/renderer/src/views/shujufenxi.vue
index 54fa279..d731659 100644
--- a/front/src/renderer/src/views/shujufenxi.vue
+++ b/front/src/renderer/src/views/shujufenxi.vue
@@ -55,15 +55,29 @@
       <el-col :span="9">
         <el-card style="height: 100%;">
           <template #header>
-            <span>{{ resultTitle ? resultTitle + "元" : "" }}&nbsp;</span>
+            <el-row>
+              <el-col :span="12">
+                <span>{{ resultTitleti ? `体：${resultTitleti}元` : "" }}&nbsp;</span>
+              </el-col>
+              <el-col :span="12">
+                <span>{{ resultTitlefu ? `福：${resultTitlefu}元` : "" }}&nbsp;</span>
+              </el-col>
+            </el-row>
           </template>
           <div>
             <!-- <el-input  v-model="rightText" :rows="rowLines" type="textarea" disabled placeholder="请点击左侧的统计数据" /> -->
-            <el-table :data="rightTableData" style="width: 100%" height="calc(100vh - 184px)" border>
-              <el-table-column prop="haoma" label="号码" width="60" />
-              <el-table-column prop="wanfa" label="玩法" />
+            <el-table :data="rightTableDataTempti" style="width: 100%" row-key="id" height="calc(50vh - 92px)"
+              default-expand-all>
+              <el-table-column prop="name" label="玩法(体彩)" width="116" />
+              <el-table-column prop="value" label="号码" min-width="60" />
               <el-table-column prop="jine" label="金额" width="60" />
             </el-table>
+            <el-table :data="rightTableDataTempfu" style="width: 100%" row-key="id" height="calc(50vh - 92px)"
+              default-expand-all>
+              <el-table-column prop="name" label="玩法(福彩)" width="120" />
+              <el-table-column prop="value" label="号码" />
+              <el-table-column prop="jine" label="金额" />
+            </el-table>
           </div>
           <template #footer>
             <div style="text-align: center;">
@@ -243,7 +257,7 @@ export default {
       _: _,
       dayjs: dayjs,
       leftText: ``,
-      //       leftText: `一单一组：684,784,876共12
+      // leftText: `一单一组：684,784,876共12
       // 单：784，961，637共6元
       // 组：214，315共4元
       // 组六：1269共10元
@@ -281,7 +295,11 @@ export default {
       // 全包对子：共10元`,
       rightText: "",
       rightTableData: [],
+      rightTableDataTempti: [],
+      rightTableDataTempfu: [],
       resultTitle: 0,
+      resultTitleti: 0,
+      resultTitlefu: 0,
       changciList: [],
       changciValue: "",
       headerList: [],
@@ -676,6 +694,8 @@ export default {
 
 
       let rightDataList = []
+      let rightTableDataTemptiTemp = []
+      let rightTableDataTempfuTemp = []
       for (let i = 0; i < haomaList.length; i++) {
         let element = haomaList[i];
         for (let j = 0; j < element.numbers.length; j++) {
@@ -689,6 +709,22 @@ export default {
                 value: valueItem,
                 jine: numberItem.jine
               })
+              if (element.type === "体彩") {
+                rightTableDataTemptiTemp.push({
+                  name: `${element.name.slice(1, 9)}`,
+                  type: element.type,
+                  value: valueItem,
+                  jine: numberItem.jine
+                })
+              } else {
+                rightTableDataTempfuTemp.push({
+                  name: `${element.name.slice(1, 9)}`,
+                  type: element.type,
+                  value: valueItem,
+                  jine: numberItem.jine
+                })
+              }
+
             }
           } else if (numberItem.type === "quanbaoduizi") {
             rightDataList.push({
@@ -697,15 +733,76 @@ export default {
               value: "全包对子",
               jine: numberItem.jine
             })
+            if (element.type === "体彩") {
+              rightTableDataTemptiTemp.push({
+                name: `${element.name.slice(1, 9)}`,
+                type: element.type,
+                value: "全包对子",
+                jine: numberItem.jine
+              })
+            } else {
+              rightTableDataTempfuTemp.push({
+                name: `${element.name.slice(1, 9)}`,
+                type: element.type,
+                value: "全包对子",
+                jine: numberItem.jine
+              })
+            }
           }
         }
       }
-      let rightDataObj = _.groupBy(rightDataList, 'value')
-      console.log(777, rightDataObj)
+      this.resultTitleti = 0
+      this.resultTitlefu = 0
+      let rightTableDataTemptiTempObj = _.groupBy(rightTableDataTemptiTemp, 'name')
+      console.log(99777, rightTableDataTemptiTempObj)
+      let rightTableDataTemptiTempLocal = []
+      for (let key in rightTableDataTemptiTempObj) {
+        let value = rightTableDataTemptiTempObj[key];
+        let textTemp = []
+        for (let i = 0; i < value.length; i++) {
+          let element = value[i];
+          textTemp.push({
+            id: _.uniqueId(),
+            ...element
+          })
+        }
+        rightTableDataTemptiTempLocal.push({
+          id: _.uniqueId(),
+          name: key,
+          jine: _.sumBy(value, 'jine'),
+          children: textTemp
+        })
+      }
+      this.rightTableDataTempti = rightTableDataTemptiTempLocal
+      this.resultTitleti = _.sumBy(rightTableDataTemptiTempLocal, 'jine')
+      let rightTableDataTempfuTempObj = _.groupBy(rightTableDataTempfuTemp, 'name')
+      let rightTableDataTempfuTempLocal = []
+      for (let key in rightTableDataTempfuTempObj) {
+        let value = rightTableDataTempfuTempObj[key];
+        let textTemp = []
+        for (let i = 0; i < value.length; i++) {
+          let element = value[i];
+          textTemp.push({
+            id: _.uniqueId(),
+            ...element
+          })
+        }
+        rightTableDataTempfuTempLocal.push({
+          id: _.uniqueId(),
+          name: key,
+          jine: _.sumBy(value, 'jine'),
+          children: textTemp
+        })
+      }
+      this.resultTitlefu = _.sumBy(rightTableDataTempfuTempLocal, 'jine')
+      this.rightTableDataTempfu = rightTableDataTempfuTempLocal
+      let rightDataObj = _.groupBy(rightDataList, 'name')
+      this.rightTableDataTemp = rightDataList
       let rightObj = {}
       let rightTextTemp = `号码---------玩法---------金额\n`
       this.rightTableData = []
       this.resultTitle = 0
+
       for (let key in rightDataObj) {
         let value = rightDataObj[key]
         let textTemp = []
@@ -865,6 +962,8 @@ export default {
       this.rightText = ""
       this.rightTableData = []
       this.resultTitle = 0
+      this.resultTitleti = 0
+      this.resultTitlefu = 0
     },
     // 提取数字
     extractNumbers(key1, key2, key3, str) {