11.22

front/package.json

@@ -1,12 +1,12 @@
 {
   "name": "electron",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "lichong",
   "homepage": "https://www.electronjs.org",
   "scripts": {
-    "npmi": "npm i",
+    "npmi": "npm i -d",
     "dev": "electron-vite dev",
     "build": "electron-vite build",
     "build:win": "npm run build && electron-builder --win --config",

front/src/renderer/src/views/shujufenxi.vue

@@ -208,10 +208,10 @@
                   体彩
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhu") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "zhu") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
                   {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
@@ -248,10 +248,10 @@
                   福彩
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhu") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "zhu") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
                   {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
@@ -379,10 +379,10 @@
                   体彩
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "alljine") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "zhu") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "体彩" }), "zhu") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
                   {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "体彩" }), "alljine") || 0) *
@@ -419,10 +419,10 @@
                   福彩
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "alljine") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
-                  {{ _.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "zhu") }}
+                  {{ _.sumBy(_.filter(dialogDataLocal, { caipiaotype: "福彩" }), "zhu") }}
                 </td>
                 <td class="el-descriptions__cell el-descriptions__content is-bordered-content is-vertical-content">
                   {{ (((_.sumBy(_.filter(dialogData, { caipiaotype: "福彩" }), "alljine") || 0) *
@@ -584,6 +584,7 @@ export default {
         title: "开奖前预测",
       },
       dialogData: [],
+      dialogDataLocal: [],
       kaijiangqianlist: [],
       checkDailishangRaw: {},
       allDataList: [],
@@ -1385,12 +1386,12 @@ export default {
         } else {
           continue
         }
-        // 单选
         let item = {
           type: `${element.name}`,
           caipiaotype: element.caipiaotype,
           valuelabel: element.valuelabel,
         }
+        // 单选
         if (["danxuan"].includes(element.type)) {
           item["xiangmu"] = `${element.value}`
           item["alljine"] = Number(element.jine)
@@ -1404,8 +1405,8 @@ export default {
             item["pei"] = 0
           }
         }
-        // 处理一组、组六
+        // 处理一组
-        else if (["zuxuan", "zuliu4", "zuliu5", "zuliu6", "zuliu7"].includes(element.type)) {
+        else if (["zuxuan"].includes(element.type)) {
           item["xiangmu"] = `${element.value}`
           item["alljine"] = Number(element.jine)
           let zhonghaomaArr = `${zhonghaoma}`.split("")
@@ -1420,8 +1421,40 @@ export default {
             item["pei"] = 0
           }
         }
-        // 处理组三、双飞
+        // 处理组六
-        else if (["zusan4", "zusan5", "zusan6", "zusan7", "shuangfei"].includes(element.type)) {
+        else if (["zuliu4", "zuliu5", "zuliu6", "zuliu7"].includes(element.type)) {
+          item["xiangmu"] = `${element.value}`
+          item["alljine"] = Number(element.jine)
+          let zhonghaomaArr = `${zhonghaoma}`.split("")
+          let xiangmuArr = `${element.value}`.split("")
+          if (_.uniq(zhonghaomaArr).length === 3 && _.difference(zhonghaomaArr, xiangmuArr).length === 0) {
+            item["zhong"] = Number(element.jine) * Number(formData[element.type])
+            item["zhongzhu"] = 1
+            item["pei"] = Number(element.jine) * Number(formData[element.type])
+          } else {
+            item["zhong"] = 0
+            item["zhongzhu"] = 0
+            item["pei"] = 0
+          }
+        }
+        // 处理组三
+        else if (["zusan4", "zusan5", "zusan6", "zusan7"].includes(element.type)) {
+          item["xiangmu"] = `${element.value}`
+          item["alljine"] = Number(element.jine)
+          let zhonghaomaArr = `${zhonghaoma}`.split("")
+          let xiangmuArr = `${element.value}`.split("")
+          if (_.uniq(zhonghaomaArr).length < 3 && _.difference(zhonghaomaArr, xiangmuArr).length === 0) {
+            item["zhong"] = Number(element.jine) * Number(formData[element.type])
+            item["zhongzhu"] = 1
+            item["pei"] = Number(element.jine) * Number(formData[element.type])
+          } else {
+            item["zhong"] = 0
+            item["zhongzhu"] = 0
+            item["pei"] = 0
+          }
+        }
+        // 处理双飞
+        else if (["shuangfei"].includes(element.type)) {
           item["xiangmu"] = `${element.value}`
           item["alljine"] = Number(element.jine)
           let zhonghaomaArr = `${zhonghaoma}`.split("")
@@ -1580,10 +1613,12 @@ export default {
         }
       }
       let thirdData = []
+      let thirdDataLocal = []
       console.log(1512, firstList, secondList);
       for (let index = 0; index < secondList.length; index++) {
         let element = secondList[index];
         if (element.caipiaotype === "体彩") {
+          thirdDataLocal.push({ ...element })
           if (element.zhongzhu) {
             thirdData.push({ ...element })
           }
@@ -1592,11 +1627,13 @@ export default {
       for (let index = 0; index < secondList.length; index++) {
         let element = secondList[index];
         if (element.caipiaotype === "福彩") {
+          thirdDataLocal.push({ ...element })
           if (element.zhongzhu) {
             thirdData.push({ ...element })
           }
         }
       }
+      this.dialogDataLocal = _.cloneDeep(thirdDataLocal)
       this.dialogData = _.cloneDeep(thirdData)
       this.dialogForm.visible = true
     },

jihuoqi/package.json

@@ -6,7 +6,7 @@
   "author": "lichong",
   "homepage": "https://www.electronjs.org",
   "scripts": {
-    "npmi": "npm i",
+    "npmi": "npm i -d",
     "dev": "electron-vite dev",
     "build": "electron-vite build",
     "build:win": "npm run build && electron-builder --win --config",