icenaked 3 лет назад
Родитель
Сommit
1646032ed2

+ 7 - 7
src/api/analysisConfig.js

@@ -7,10 +7,10 @@ import {axios} from '../utils/request'
  * @returns
  */
 export const addAnalysisConfig = payload => {
-    const { fileId, userId, configName, chosenColumns} = payload;
-    // return axios.post(`${MOCK}/ml/configs`, {
-    return axios.post(`${MOCK}/analysis/configs`, {
-        fileId, userId, configName, chosenColumns
+    const { fileInfoId, userId, configName, chosenColumns} = payload;
+    return axios.post(`${ANALYSIS_CONFIG_MODULE}`, {
+    // return axios.post(`${MOCK}/analysis/configs`, {
+        fileInfoId, userId, configName, chosenColumns
     }).then(res => {
         return res;
     });
@@ -22,9 +22,9 @@ export const addAnalysisConfig = payload => {
  * @returns
  */
 export const getAnalysisConfig = payload => {
-    const {uid} = payload;
-    // return axios.get(`${ANALYSIS_CONFIG_MODULE}?userId=${uid}`).then(res => {
-        return axios.get(`${MOCK}/analysis/configs/all/:userId`).then(res => {
+    const {userId} = payload;
+    return axios.get(`${ANALYSIS_CONFIG_MODULE}/all/${userId}`).then(res => {
+        // return axios.get(`${MOCK}/analysis/configs/all/:userId`).then(res => {
         return res;
     });
 }

+ 5 - 3
src/views/analysis/Analysis.vue

@@ -14,7 +14,7 @@
         header-cell-class-name="table-header"
     >
       <el-table-column prop="configName" label="配置名"></el-table-column>
-      <el-table-column prop="fileId" label="文件id"></el-table-column>
+      <el-table-column prop="fileInfoId" label="文件id"></el-table-column>
       <el-table-column label="查看历史分析">
         <template #default="scope">
           <el-button type="text" icon="el-icon-circle-check" class="yellow"
@@ -195,9 +195,11 @@ export default {
 
     const getPage=()=> {
       getAnalysisConfig({
-        uid: 1
+        userId: 1
       }).then(res => {
-        tableData.value = res.result.configVOList;
+        console.log(res.result)
+        tableData.value = res.result;
+        console.log(tableData.value)
         pageTotal.value = tableData.value.length
       })
     };

+ 3 - 3
src/views/analysis/AnalysisConfig.vue

@@ -14,7 +14,7 @@
           header-cell-class-name="table-header"
       >
         <el-table-column prop="configName" label="配置名"></el-table-column>
-        <el-table-column prop="fileId" label="文件id"></el-table-column>
+        <el-table-column prop="fileInfoId" label="文件id"></el-table-column>
         <el-table-column prop="chosenColumns" label="选中字段"></el-table-column>
         <el-table-column label="操作" width="180" align="center">
           <template #default="scope">
@@ -57,9 +57,9 @@ export default {
 
     const getPage=()=> {
       getAnalysisConfig({
-        uid: 1
+        userId: 1
       }).then(res => {
-        tableData.value = res.result.configVOList;
+        tableData.value = res.result;
         pageTotal.value = tableData.value.length
       })
     };

+ 4 - 3
src/views/file/FileDetail.vue

@@ -191,16 +191,17 @@ export default {
     };
     const createAnalysisConfig = () => {
       const payload={
-        fileId:selectData.value[0].fileInfoId,
+        fileInfoId:selectData.value[0].fileInfoId,
         userId:1,
-        configName:analysisConfName,
+        configName:analysisConfName.value,
         chosenColumns:[],
       }
         for(let i=0;i<selectData.value.length;i++){
           payload.chosenColumns.push(selectData.value[i].fieldName);
         }
-        console.log(payload)
+        console.log("p"+JSON.stringify(payload))
       addAnalysisConfig(payload).then(res=>{
+        console.log("r"+JSON.stringify(res))
         if(res.msg === '成功') {
           ElMessage.success(`已成功生成配置`);
           analysisVisible.value = false;