提交

2 years ago · 2e7bdce5ca
parent 11237c66c3
commit 2e7bdce5ca
3 changed files with 108 additions and 111 deletions
--- a/src/utils/request.js
+++ b/src/utils/request.js
@ -16,7 +16,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 const service = axios.create({
  // axios中请求配置有baseURL选项，表示请求URL公共部分
  // baseURL: import.meta.env.VITE_APP_BASE_API,
-  baseURL:'http://118.31.7.2:9868/',
+  baseURL: "http://118.31.7.2:9868/",
  // baseURL:'http://192.168.2.16:9868/',
  // 超时
  timeout: 100000,
--- a/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
+++ b/src/views/digitalMarketingAlgorithms/components/associationRuleMining.vue
@ -69,16 +69,16 @@
            <el-button @click="computation">计算</el-button>
          </div>
        </div>
-        </el-scrollbar>
-        <div style="margin-top: auto">
-          <div class="startOver" @click="startOver()">
-            <img src="../../../assets/images/重新开始.png" alt="" />
-            <span>重新开始</span>
-          </div>
+      </el-scrollbar>
+      <div style="margin-top: auto">
+        <div class="startOver" @click="startOver()">
+          <img src="../../../assets/images/重新开始.png" alt="" />
+          <span>重新开始</span>
        </div>
      </div>
-      <div class="main-right">
-        <el-scrollbar height="550px" ref="scrollbar" style="padding: 20px">
+    </div>
+    <div class="main-right">
+      <el-scrollbar height="550px" ref="scrollbar" style="padding: 20px">
        <div>
          <span style="font-weight: bold; font-size: 18px; color: #3596eb">分析数据：</span>
          <el-table :data="tableData2" style="width: 100%; margin-top: 10px" :header-cell-style="headerCellStyle" height="350">
@ -330,7 +330,7 @@ import { MdEditor, MdPreview } from "md-editor-v3";
 import "md-editor-v3/lib/style.css";
 import * as API from "@/api/AI.js";
 import { getUserInfo } from "@/utils/auth";
-import { onMounted, reactive } from "vue";
+import { onMounted, reactive, ref } from "vue";
 import popModel from "@/views/components/popModal.vue";
 const { proxy } = getCurrentInstance();
 const formData = reactive({
@ -340,6 +340,8 @@ const formData = reactive({
  value4: "",
  value5: "",
 });
+const scrollbar=ref(null)
+const loading1 =ref(false)
 const task = () => {
  if (Object.values(formData).every((item) => item == "")) {
    proxy.$modal.msgWarning("请填写完整");
@ -562,42 +564,44 @@ const computation = () => {
    return;
  }
  if (input5.value && input6.value && input4.value) {
-    loading1.value=true
+    loading1.value = true;
    const sendData = {
      confidence: parseFloat(input5.value) / 100,
      support: parseFloat(input6.value) / 100,
      userId: JSON.parse(getUserInfo()).userId,
      deduplicatedDataList: resTable2.value,
    };
-    API.associationRuleMining(sendData).then((res) => {
-      uplodFlag.value = true;
-      tableData3.value = [];
-      tableLabel2.length = 0;
-      for (const key in res.data[0]) {
-        tableLabel2.push({
-          label: key,
-          prop: key,
-        });
-      }
-      tableData3.value = res.data;
-      //一秒后执行
-      setTimeout(() => {
-        loading1.value=false
-      },500)
-      nextTick(() => {
-      setTimeout(() => {
-        const scrollContainer = scrollbar.value?.$el.querySelector(".el-scrollbar__wrap");
-        if (scrollContainer) {
-          scrollContainer.scrollTo({
-            top: scrollContainer.scrollHeight,
-            behavior: "smooth", // 平滑滚动
+    API.associationRuleMining(sendData)
+      .then((res) => {
+        uplodFlag.value = true;
+        tableData3.value = [];
+        tableLabel2.length = 0;
+        for (const key in res.data[0]) {
+          tableLabel2.push({
+            label: key,
+            prop: key,
          });
        }
-      }, 500);
-    });
-    }).catch(()=>{
-      loading1.value=false
-    });
+        tableData3.value = res.data;
+        //一秒后执行
+        setTimeout(() => {
+          loading1.value = false;
+        }, 500);
+        nextTick(() => {
+          setTimeout(() => {
+            const scrollContainer = scrollbar.value?.$el.querySelector(".el-scrollbar__wrap");
+            if (scrollContainer) {
+              scrollContainer.scrollTo({
+                top: scrollContainer.scrollHeight,
+                behavior: "smooth", // 平滑滚动
+              });
+            }
+          }, 500);
+        });
+      })
+      .catch(() => {
+        loading1.value = false;
+      });
  } else {
    proxy.$modal.msgWarning("请模型参数进行设置！");
  }
--- a/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
+++ b/src/views/digitalMarketingAlgorithms/components/regressionAnalysis.vue
@ -1,22 +1,22 @@
 <template>
  <!-- <el-scrollbar ref="scrollbar" height="800px"> -->
-    <div class="main-top">
-      <span style="font-weight: bold; font-size: 18px; color: #3596eb">任务描述</span>
-      <p style="font-weight: 400; font-size: 12px; color: #e6e6e6">（给出任务清单参考，做哪些数据的统计分析）Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.</p>
-    </div>
-    <div class="main-but">
-      <el-button @click="runResultShow = true">
-        <img src="../../../assets/images/导入.png" alt="" />
-        算法知识导入
-      </el-button>
-      <el-button @click="taskSubmit">
-        <img src="../../../assets/images/提交.png" alt="" />
-        实训任务提交
-      </el-button>
-    </div>
-    <div class="app-main">
-      <div class="main-left">
-        <el-scrollbar height="560px" style="padding: 0 10px" min-size="5">
+  <div class="main-top">
+    <span style="font-weight: bold; font-size: 18px; color: #3596eb">任务描述</span>
+    <p style="font-weight: 400; font-size: 12px; color: #e6e6e6">（给出任务清单参考，做哪些数据的统计分析）Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.</p>
+  </div>
+  <div class="main-but">
+    <el-button @click="runResultShow = true">
+      <img src="../../../assets/images/导入.png" alt="" />
+      算法知识导入
+    </el-button>
+    <el-button @click="taskSubmit">
+      <img src="../../../assets/images/提交.png" alt="" />
+      实训任务提交
+    </el-button>
+  </div>
+  <div class="app-main">
+    <div class="main-left">
+      <el-scrollbar height="560px" style="padding: 0 10px" min-size="5">
        <div>
          <div class="left-top">
            <span>一、选择指标</span>
@ -73,49 +73,42 @@
            <el-button @click="computation">计算</el-button>
          </div>
        </div>
-        </el-scrollbar>
-        <div style="margin-top: auto">
-          <div class="startOver" @click="startOver()">
-            <img src="../../../assets/images/重新开始.png" alt="" />
-            <span>重新开始</span>
-          </div>
-  </div>
-         
-        </div>
-        <div class="main-right">
-          <el-scrollbar height="500px" ref="scrollbar" style="padding: 20px;">
-          <div>
-              <span style="font-weight: bold;font-size: 18px;color: #3596EB;">分析数据：</span>
-              <el-table :data="tableData2"  style="width: 98%;margin-top:10px" :header-cell-style="headerCellStyle" height="350">
-                  <el-table-column v-for="column in tableLabel" :key="column.prop" :prop="column.prop" :label="column.label" align="center"/>
-              </el-table>
-              <!-- <el-pagination style="margin-top:10px" background layout="prev, pager, next" :total="1000" /> -->
-          </div>
-          <div class="analysisResults" style="margin-top: 20px">
-              <span style="font-weight: bold;font-size: 18px;color: #3596EB;display: block;">分析结果：</span>
-              <el-button class="imgBtn" v-if="flagUP" @click="upLoad">下载</el-button>
-              <el-table :data="tableData3" v-loading="loading1" ref="exportTableRef" row-key="TSuid" style="width: 98%;margin-top:10px" :header-cell-style="headerCellStyle" height="350">
-                  <el-table-column v-for="column in tableLabel2" :key="column.prop" :prop="column.prop" :label="column.label" align="center"/>
-                  <el-table-column v-if="flagColumn" label="预测" align="center">
-                      <template #default="scope">
-                          <el-button type="primary" link @click="handleClick(scope.row)" v-if="predictionResults===''">预测</el-button>
-                          <span v-else>{{predictionResults}}</span>
-                      </template>
-                  </el-table-column>
-              </el-table>
-          </div>
-          </el-scrollbar>
+      </el-scrollbar>
+      <div style="margin-top: auto">
+        <div class="startOver" @click="startOver()">
+          <img src="../../../assets/images/重新开始.png" alt="" />
+          <span>重新开始</span>
        </div>
      </div>
-    <!-- </el-scrollbar> -->
+    </div>
+    <div class="main-right">
+      <el-scrollbar height="500px" ref="scrollbar" style="padding: 20px">
+        <div>
+          <span style="font-weight: bold; font-size: 18px; color: #3596eb">分析数据：</span>
+          <el-table :data="tableData2" style="width: 98%; margin-top: 10px" :header-cell-style="headerCellStyle" height="350">
+            <el-table-column v-for="column in tableLabel" :key="column.prop" :prop="column.prop" :label="column.label" align="center" />
+          </el-table>
+          <!-- <el-pagination style="margin-top:10px" background layout="prev, pager, next" :total="1000" /> -->
+        </div>
+        <div class="analysisResults" style="margin-top: 20px">
+          <span style="font-weight: bold; font-size: 18px; color: #3596eb; display: block">分析结果：</span>
+          <el-button class="imgBtn" v-if="flagUP" @click="upLoad">下载</el-button>
+          <el-table :data="tableData3" v-loading="loading1" ref="exportTableRef" row-key="TSuid" style="width: 98%; margin-top: 10px" :header-cell-style="headerCellStyle" height="350">
+            <el-table-column v-for="column in tableLabel2" :key="column.prop" :prop="column.prop" :label="column.label" align="center" />
+            <el-table-column v-if="flagColumn" label="预测" align="center">
+              <template #default="scope">
+                <el-button type="primary" link @click="handleClick(scope.row)" v-if="predictionResults === ''">预测</el-button>
+                <span v-else>{{ predictionResults }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-scrollbar>
+    </div>
+  </div>
+  <!-- </el-scrollbar> -->

-    <el-dialog
-      v-model="dialogVisible"
-      title="实训任务提交"
-      width="600"
-      custom-class="dialogClass"
-      :show-close="false"
-    >
+  <el-dialog v-model="dialogVisible" title="实训任务提交" width="600" custom-class="dialogClass" :show-close="false">
    <template #header="{ close, titleId, titleClass }">
      <div class="my-header">
        <span :id="titleId" :class="titleClass">实训任务提交</span>
@ -329,6 +322,7 @@ const formInline3 = reactive({
  value2: "",
  value3: "",
 });
+const loading1 = ref(false);
 const task = () => {
  for (let key in formInline3) {
    if (formInline3[key] == "") {
@ -493,7 +487,6 @@ const optionData2 = () => {
    });
  }
 };
-
 //生产表格
 const computation = () => {
  if (tableData.value.length === 0 || input2.value == "" || input3.value == "") {
@ -506,7 +499,7 @@ const computation = () => {
      x: [],
      userId: JSON.parse(getUserInfo()).userId,
    };
-    loading1.value=true
+    loading1.value = true;
    if (input4.value === "线性回归") {
      if (input5.value.length > 1) {
        proxy.$modal.msgError("y变量数量有误！");
@ -533,7 +526,7 @@ const computation = () => {
        data.slopes = data.slopes.join(",");
        tableData3.value = [data];
        predictionResults.value = "";
-        loading1.value=false
+        loading1.value = false;
      });
    } else {
      if (input5.value.length > 1) {
@ -569,24 +562,24 @@ const computation = () => {
        data.slope = data.slope;
        tableData3.value = [data];
        predictionResults.value = "";
-        loading1.value=true
+        loading1.value = true;
      });
    }
  } else {
    proxy.$modal.msgWarning("请模型参数进行设置！");
  }
  nextTick(() => {
-      setTimeout(() => {
-        loading1.value=false
-        const scrollContainer = scrollbar.value?.$el.querySelector(".el-scrollbar__wrap");
-        if (scrollContainer) {
-          scrollContainer.scrollTo({
-            top: scrollContainer.scrollHeight,
-            behavior: "smooth", // 平滑滚动
-          });
-        }
-      }, 500);
-    });
+    setTimeout(() => {
+      loading1.value = false;
+      const scrollContainer = scrollbar.value?.$el.querySelector(".el-scrollbar__wrap");
+      if (scrollContainer) {
+        scrollContainer.scrollTo({
+          top: scrollContainer.scrollHeight,
+          behavior: "smooth", // 平滑滚动
+        });
+      }
+    }, 500);
+  });
  flagUP.value = true;
 };
 const nowData = ref([]);