@@ -304,10 +305,10 @@ const task = () => {
return;
}
}
- if(formInline2.value1!=='3'){
+ if(parseFloat(formInline2.value1)!==parseFloat(input5.value)){
errorNumber=1
}
- if(formInline2.value2!==input6.value){
+ if(parseFloat(formInline2.value2)!==parseFloat(iterations.value)){
errorNumber=1
}
portraitModel
@@ -533,6 +534,7 @@ const optionData2 = () => {
};
const showChart = ref(false);
//生产表格
+const iterations=ref(0)
const nowData = ref([]);
const clusterAnalysisCalculation = () => {
if (tableData2.value.length === 0 || input2.value == "" || input3.value == "") {
@@ -552,8 +554,8 @@ const clusterAnalysisCalculation = () => {
showChart.value = true;
let sex = 1;
tableData3.value = [];
- nowData.value = res.data;
- res.data.forEach((item, index) => {
+ nowData.value = res.data.clusters;
+ res.data.clusters.forEach((item, index) => {
const newItem = {};
tableLabel.forEach((label, index) => {
if (index === 0) {
@@ -566,6 +568,7 @@ const clusterAnalysisCalculation = () => {
sex++;
tableData3.value.push(newItem);
tableData3.value[index].children = [];
+ iterations.value=res.data.iterations
const children = ref([]);
item.forEach((item2, sexx) => {
const newItem2 = {};
From 1052fd1765ee3e74c666870b40727b33fd0d50c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BD=B3=20=E5=8D=9A?=
<12742597+fang-jiabo@user.noreply.gitee.com>
Date: Wed, 28 Aug 2024 10:17:36 +0800
Subject: [PATCH 3/5] 'tj'
---
.../components/associationRuleMining.vue | 3 +++
.../digitalMarketingAlgorithms/components/clusterAnalysis.vue | 3 +++
.../components/regressionAnalysis.vue | 3 +++
3 files changed, 9 insertions(+)
diff --git a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
index 14d44e8..9ef628b 100644
--- a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
+++ b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
@@ -355,6 +355,9 @@ const task = () => {
if(formData.value1||formData.value4||formData.value5){
errorNumber=1
}
+ if(input.value!=="购物车数据"){
+ errorNumber=1
+ }
portraitModel
.submit({
userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
index fa21c13..5aa164a 100644
--- a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
+++ b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
@@ -311,6 +311,9 @@ const task = () => {
if(parseFloat(formInline2.value2)!==parseFloat(iterations.value)){
errorNumber=1
}
+ if(input.value!=="客户细分数据"){
+ errorNumber=1
+ }
portraitModel
.submit({
userId: JSON.parse(getUserInfo()).userId,
diff --git a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
index 865365a..ae6d178 100644
--- a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
+++ b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
@@ -352,6 +352,9 @@ const task = () => {
if(parseFloat(formInline3.value3)!==parseFloat(predictionResults.value)){
errorNumber=1
}
+ if(input.value!=="销售预测数据"){
+ errorNumber=1
+ }
}else{
errorNumber=1
}
From 11661cb4d746dde79f02a937f83de97981dccf33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BD=B3=20=E5=8D=9A?=
<12742597+fang-jiabo@user.noreply.gitee.com>
Date: Wed, 28 Aug 2024 14:00:53 +0800
Subject: [PATCH 4/5] 'tj'
---
.../components/associationRuleMining.vue | 4 +++-
.../digitalMarketingAlgorithms/components/clusterAnalysis.vue | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
index 9ef628b..048619b 100644
--- a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
+++ b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
@@ -575,7 +575,6 @@ const computation = () => {
return;
}
if (input5.value && input6.value && input4.value) {
- loading1.value = true;
const sendData = {
confidence: parseFloat(input5.value) / 100,
support: parseFloat(input6.value) / 100,
@@ -584,6 +583,7 @@ const computation = () => {
};
API.associationRuleMining(sendData)
.then((res) => {
+ loading1.value = true;
uplodFlag.value = true;
tableData3.value = [];
tableLabel2.length = 0;
@@ -615,6 +615,7 @@ const computation = () => {
});
} else {
proxy.$modal.msgWarning("请模型参数进行设置！");
+ loading1.value = false;
}
};
const upload = () => {
@@ -639,6 +640,7 @@ const startOver = () => {
tableLabel.length = 0;
tableLabel2.length = 0;
uplodFlag.value = false;
+ loading1.value = false;
};
diff --git a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
index 5aa164a..ca8ab68 100644
--- a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
+++ b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
@@ -311,7 +311,7 @@ const task = () => {
if(parseFloat(formInline2.value2)!==parseFloat(iterations.value)){
errorNumber=1
}
- if(input.value!=="客户细分数据"){
+ if(input.value!=="客户细分数据表"){
errorNumber=1
}
portraitModel
From e049a5d734d62ba5c9d1a35d5e43272d2731b55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BD=B3=20=E5=8D=9A?=
<12742597+fang-jiabo@user.noreply.gitee.com>
Date: Wed, 28 Aug 2024 15:26:36 +0800
Subject: [PATCH 5/5] 'tj'
---
.../components/associationRuleMining.vue | 7 +++++--
.../components/clusterAnalysis.vue | 1 +
.../components/regressionAnalysis.vue | 5 ++++-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
index 048619b..72cca50 100644
--- a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
+++ b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
@@ -350,12 +350,14 @@ const task = () => {
return;
}
if(!formData.value3||!formData.value2){
+ console.log(1);
errorNumber=1
- }else
+ }
if(formData.value1||formData.value4||formData.value5){
+ console.log(2);
errorNumber=1
}
- if(input.value!=="购物车数据"){
+ if(input.value!=="购物车数据表"){
errorNumber=1
}
portraitModel
@@ -497,6 +499,7 @@ const taskZB = () => {
prop: key,
});
}
+ input3.value=""
tableData2.value = res.data;
flag.value = true;
});
diff --git a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
index ca8ab68..793a0db 100644
--- a/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
+++ b/src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue
@@ -461,6 +461,7 @@ const resTable2=ref()
tableData2.value=res.data
flag.value=true
// proxy.$modal.msgSuccess("计算完成!");
+ input3.value=''
tableData2.value = res.data;
flag.value = true;
});
diff --git a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
index ae6d178..8bf604e 100644
--- a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
+++ b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
@@ -352,7 +352,7 @@ const task = () => {
if(parseFloat(formInline3.value3)!==parseFloat(predictionResults.value)){
errorNumber=1
}
- if(input.value!=="销售预测数据"){
+ if(input.value!=="销售预测数据表"){
errorNumber=1
}
}else{
@@ -436,6 +436,8 @@ const taskZB = () => {
API.analysisDataDisplay(sendData).then((res) => {
tableLabel.length = 0;
option5.value.length = 0;
+ input5.value = [];
+ input6.value = [];
for (const key in res.data[0]) {
option5.value.push({
value: key,
@@ -446,6 +448,7 @@ const taskZB = () => {
prop: key,
});
}
+ input3.value=""
tableData2.value = res.data;
flag.value = true;
});