Merge branch 'dev_fjb' of https://gitee.com/qinzhenpen/digital-marketing

src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue

@@ -353,9 +353,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!=="购物车数据表"){
     errorNumber=1
   }
   if(input.value!=="购物车数据"){
@@ -501,6 +506,7 @@ const taskZB = () => {
         prop: key,
       });
     }
+    input3.value=""
     tableData2.value = res.data;
     flag.value = true;
   });

src/views/digitalMarketingAlgorithms/components/clusterAnalysis.vue

@@ -470,6 +470,7 @@ const taskZB = () => {
     tableData2.value = res.data;
     flag.value = true;
     // proxy.$modal.msgSuccess("计算完成!");
+    input3.value=''
     tableData2.value = res.data;
     flag.value = true;
   });

src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue

@@ -356,6 +356,9 @@ const task = () => {
     if(input.value!=="销售预测数据"){
       errorNumber=1
     }
+    if(input.value!=="销售预测数据表"){
+      errorNumber=1
+    }
   }else{
     errorNumber=1
   }
@@ -438,6 +441,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,
@@ -448,6 +453,7 @@ const taskZB = () => {
         prop: key,
       });
     }
+    input3.value=""
     tableData2.value = res.data;
     flag.value = true;
   });