From 35d86212ee012015b74a95be13f11d35ca481310 Mon Sep 17 00:00:00 2001
From: HeHaonan <1822907900@qq.com>
Date: Thu, 29 Aug 2024 11:33:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portraitModel/components/abcAnalysis.vue  | 75 +++++++++++++------
 1 file changed, 52 insertions(+), 23 deletions(-)

diff --git a/src/views/portraitModel/components/abcAnalysis.vue b/src/views/portraitModel/components/abcAnalysis.vue
index 37c03ff..ca6ef16 100644
--- a/src/views/portraitModel/components/abcAnalysis.vue
+++ b/src/views/portraitModel/components/abcAnalysis.vue
@@ -224,7 +224,7 @@
         </div>
         <div class="chartXData" v-if="step3AnswerFlag">
           <div style="display: flex; align-items: center; justify-content: center">
-            <el-select v-model="chartParam1" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 4)">
+            <el-select v-model="chartParam1" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 0)">
               <el-option :label="'男士配饰'" :value="'男士配饰'" />
               <el-option :label="'床上用品'" :value="'床上用品'" />
               <el-option :label="'婴儿用品'" :value="'婴儿用品'" />
@@ -236,7 +236,7 @@
             </div>
           </div>
           <div style="display: flex; align-items: center; justify-content: center">
-            <el-select v-model="chartParam2" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 4)">
+            <el-select v-model="chartParam2" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 1)">
               <el-option :label="'男士配饰'" :value="'男士配饰'" />
               <el-option :label="'床上用品'" :value="'床上用品'" />
               <el-option :label="'婴儿用品'" :value="'婴儿用品'" />
@@ -248,7 +248,7 @@
             </div>
           </div>
           <div style="display: flex; align-items: center; justify-content: center">
-            <el-select v-model="chartParam3" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 4)">
+            <el-select v-model="chartParam3" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 2)">
               <el-option :label="'男士配饰'" :value="'男士配饰'" />
               <el-option :label="'床上用品'" :value="'床上用品'" />
               <el-option :label="'婴儿用品'" :value="'婴儿用品'" />
@@ -260,7 +260,7 @@
             </div>
           </div>
           <div style="display: flex; align-items: center; justify-content: center">
-            <el-select v-model="chartParam4" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 4)">
+            <el-select v-model="chartParam4" placeholder="请选择" style="width: 85px" class="XdataItem" size="small" @change="selectData($event, 3)">
               <el-option :label="'男士配饰'" :value="'男士配饰'" />
               <el-option :label="'床上用品'" :value="'床上用品'" />
               <el-option :label="'婴儿用品'" :value="'婴儿用品'" />
@@ -328,6 +328,8 @@ import * as portraitModel from "@/api/portraitModel";
 import { downBlobFile } from "@/utils/index.js";
 const { proxy } = getCurrentInstance();
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const barData = ref(["", "", "", ""]);
+const lineData = ref(["", "", "", ""]);
 const showAnswerFlag = ref(false);
 const dialogVisible = ref(false);
 const knowledgeFlag = ref(false);
@@ -639,7 +641,8 @@ const initCharts = () => {
           },
         },
         // data: [5900, 2400, 1100, 600],
-        data: [step3Data.value[0].data2, step3Data.value[1].data2, step3Data.value[2].data2, step3Data.value[3].data2],
+        // data: [step3Data.value[0].data2, step3Data.value[1].data2, step3Data.value[2].data2, step3Data.value[3].data2],
+        data: barData.value,
       },
 
       {
@@ -652,7 +655,8 @@ const initCharts = () => {
           },
         },
         // data: [59, 83, 94, 100],
-        data: [step3Data.value[0].params2, step3Data.value[1].params2, step3Data.value[2].params2, step3Data.value[3].params2],
+        // data: [step3Data.value[0].params2, step3Data.value[1].params2, step3Data.value[2].params2, step3Data.value[3].params2],
+        data: lineData.value,
       },
     ],
   };
@@ -900,14 +904,14 @@ const saveData = () => {
     stepNineB: chartParam2.value,
     stepNineC: chartParam3.value,
     stepNineD: chartParam4.value,
-    // stepTenA: step4Data.value[1].params2,
-    // stepTenB: step4Data.value[1].params3,
-    // stepTenC: step4Data.value[2].params1,
-    // stepTenD: step4Data.value[2].params2,
-    // stepElevenA: step4Data.value[2].params3,
-    // stepOneA: step5Data.value[0].params1,
-    // stepOneB: step5Data.value[0].params2,
-    // stepOneC: step5Data.value[0].params3,
+    stepTenA: barData.value[0],
+    stepTenB: barData.value[1],
+    stepTenC: barData.value[2],
+    stepTenD: barData.value[3],
+    stepElevenA: lineData.value[0],
+    stepOneA: lineData.value[1],
+    stepOneB: lineData.value[2],
+    stepOneC: lineData.value[3],
     // stepOneD: step6Data.value[0].params1,
     // stepTwoA: step6Data.value[0].params2,
     // stepTwoB: step6Data.value[0].params3,
@@ -1026,16 +1030,21 @@ const getData = () => {
         step4Data.value[3].data3 = step3Data.value[3].params2;
         step2AnswerFlag.value = true;
         step3AnswerFlag.value = true;
+        // initCharts();
+      }
+      barData.value[0] = res.data.stepTenA;
+      barData.value[1] = res.data.stepTenB;
+      barData.value[2] = res.data.stepTenC;
+      barData.value[3] = res.data.stepTenD;
+      lineData.value[0] = res.data.stepElevenA;
+      lineData.value[1] = res.data.stepOneA;
+      lineData.value[2] = res.data.stepOneB;
+      lineData.value[3] = res.data.stepOneC;
+      if (res.data.stepTenA || res.data.stepTenB || res.data.stepTenC || res.data.stepTenD || res.data.stepElevenA || res.data.stepOneA || res.data.stepOneB || res.data.stepOneC) {
         initCharts();
+        step2AnswerFlag.value = true;
+        step3AnswerFlag.value = true;
       }
-      // step4Data.value[1].params2 = res.data.stepTenA;
-      // step4Data.value[1].params3 = res.data.stepTenB;
-      // step4Data.value[2].params1 = res.data.stepTenC;
-      // step4Data.value[2].params2 = res.data.stepTenD;
-      // step4Data.value[2].params3 = res.data.stepElevenA;
-      // step5Data.value[0].params1 = res.data.stepOneA;
-      // step5Data.value[0].params2 = res.data.stepOneB;
-      // step5Data.value[0].params3 = res.data.stepOneC;
       // step6Data.value[0].params1 = res.data.stepOneD;
       // step6Data.value[0].params2 = res.data.stepTwoA;
       // step6Data.value[0].params3 = res.data.stepTwoB;
@@ -1137,9 +1146,26 @@ const getData = () => {
     })
     .catch((error) => {});
 };
-const selectData = (item,index) => {
+const selectData = (item, index) => {
   console.log(index);
   // initCharts();
+  if (item == "男士配饰") {
+    barData.value[index] = 5900;
+    lineData.value[index] = 59;
+  }
+  if (item == "床上用品") {
+    barData.value[index] = 2400;
+    lineData.value[index] = 83;
+  }
+  if (item == "婴儿用品") {
+    barData.value[index] = 1100;
+    lineData.value[index] = 94;
+  }
+  if (item == "儿童服装") {
+    barData.value[index] = 600;
+    lineData.value[index] = 100;
+  }
+  initCharts();
 };
 const submitData = () => {
   console.log("tj");
@@ -1191,6 +1217,9 @@ const retrain = () => {
   chartParam2.value = "";
   chartParam3.value = "";
   chartParam4.value = "";
+  barData.value = ["", "", "", "", ""];
+  lineData.value = ["", "", "", "", ""];
+   initCharts();
   // })
   // .catch((error) => {});
 };

From 6563ecd045db71a23b17864bae3ab50a72ac0043 Mon Sep 17 00:00:00 2001
From: HeHaonan <1822907900@qq.com>
Date: Thu, 29 Aug 2024 11:46:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portraitModel/components/abcAnalysis.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/portraitModel/components/abcAnalysis.vue b/src/views/portraitModel/components/abcAnalysis.vue
index ca6ef16..ee48eb1 100644
--- a/src/views/portraitModel/components/abcAnalysis.vue
+++ b/src/views/portraitModel/components/abcAnalysis.vue
@@ -1060,6 +1060,7 @@ const getData = () => {
       //回显答案
       if (res.data.subState & (res.data.subState == 1)) {
         showAnswerFlag.value = true;
+        initCharts();
         if (step1Data.value[0].params && step1Data.value[0].params !== "5900") {
           step1Data.value[0].isError = true;
         } else {

From 72dc8060de29ce3efcf9f153991e1144aaea5da0 Mon Sep 17 00:00:00 2001
From: HeHaonan <1822907900@qq.com>
Date: Fri, 30 Aug 2024 09:45:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=95=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portraitModel/components/AARRRAnalysis.vue      | 3 +++
 src/views/portraitModel/components/abcAnalysis.vue        | 3 +++
 src/views/portraitModel/components/basketAnalysis.vue     | 3 +++
 src/views/portraitModel/components/bostonAnalysis.vue     | 3 +++
 src/views/portraitModel/components/funnelAnalysis.vue     | 3 +++
 src/views/portraitModel/components/portraitAnalysis.vue   | 3 +++
 src/views/portraitModel/components/repurchaseAnalysis.vue | 3 +++
 src/views/portraitModel/components/retainAnalysis.vue     | 3 +++
 src/views/portraitModel/components/rfmAnalysis.vue        | 3 +++
 src/views/portraitModel/components/viscosityAnalysis.vue  | 3 +++
 10 files changed, 30 insertions(+)

diff --git a/src/views/portraitModel/components/AARRRAnalysis.vue b/src/views/portraitModel/components/AARRRAnalysis.vue
index c9344e4..934180f 100644
--- a/src/views/portraitModel/components/AARRRAnalysis.vue
+++ b/src/views/portraitModel/components/AARRRAnalysis.vue
@@ -1222,6 +1222,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value + step4Error.value + step5Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/abcAnalysis.vue b/src/views/portraitModel/components/abcAnalysis.vue
index ee48eb1..f879024 100644
--- a/src/views/portraitModel/components/abcAnalysis.vue
+++ b/src/views/portraitModel/components/abcAnalysis.vue
@@ -1176,6 +1176,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value + step4Error.value + step5Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/basketAnalysis.vue b/src/views/portraitModel/components/basketAnalysis.vue
index dd432ce..a2ff120 100644
--- a/src/views/portraitModel/components/basketAnalysis.vue
+++ b/src/views/portraitModel/components/basketAnalysis.vue
@@ -1087,6 +1087,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value + step4Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/bostonAnalysis.vue b/src/views/portraitModel/components/bostonAnalysis.vue
index c2a6a01..3286f61 100644
--- a/src/views/portraitModel/components/bostonAnalysis.vue
+++ b/src/views/portraitModel/components/bostonAnalysis.vue
@@ -1516,6 +1516,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value + step4Error.value + step5Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/funnelAnalysis.vue b/src/views/portraitModel/components/funnelAnalysis.vue
index 0e733bb..0b0f1fe 100644
--- a/src/views/portraitModel/components/funnelAnalysis.vue
+++ b/src/views/portraitModel/components/funnelAnalysis.vue
@@ -1100,6 +1100,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/portraitAnalysis.vue b/src/views/portraitModel/components/portraitAnalysis.vue
index c89175f..f255e64 100644
--- a/src/views/portraitModel/components/portraitAnalysis.vue
+++ b/src/views/portraitModel/components/portraitAnalysis.vue
@@ -1185,6 +1185,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/repurchaseAnalysis.vue b/src/views/portraitModel/components/repurchaseAnalysis.vue
index f2de3e5..ccf0403 100644
--- a/src/views/portraitModel/components/repurchaseAnalysis.vue
+++ b/src/views/portraitModel/components/repurchaseAnalysis.vue
@@ -2178,6 +2178,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step4Error.value + step5Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/retainAnalysis.vue b/src/views/portraitModel/components/retainAnalysis.vue
index fbcdbb8..323124c 100644
--- a/src/views/portraitModel/components/retainAnalysis.vue
+++ b/src/views/portraitModel/components/retainAnalysis.vue
@@ -1713,6 +1713,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/rfmAnalysis.vue b/src/views/portraitModel/components/rfmAnalysis.vue
index 4ae2b23..79d2d88 100644
--- a/src/views/portraitModel/components/rfmAnalysis.vue
+++ b/src/views/portraitModel/components/rfmAnalysis.vue
@@ -1108,6 +1108,9 @@ const submitData = () => {
   }
   errorNum.value = stepError1.value + stepError2.value + step4Error.value + step5Error.value + step6Error.value + step7Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/portraitModel/components/viscosityAnalysis.vue b/src/views/portraitModel/components/viscosityAnalysis.vue
index 191667e..115d53c 100644
--- a/src/views/portraitModel/components/viscosityAnalysis.vue
+++ b/src/views/portraitModel/components/viscosityAnalysis.vue
@@ -1874,6 +1874,9 @@ const submitData = () => {
   }
   errorNum.value = step1Error.value + step2Error.value + step3Error.value + step4Error.value;
   console.log(errorNum.value, "总错误次数");
+  if(errorNum.value > 5){
+    errorNum.value = 5
+  }
   portraitModel
     .submit({
       userId: JSON.parse(getUserInfo()).userId,