Просмотр исходного кода

feat: 数据分析流水线对接完成

icenaked 3 лет назад
Родитель
Сommit
979770f2d1

+ 7 - 9
src/api/analysisPipeline.js

@@ -9,7 +9,7 @@ import {MOCK} from "./_prefix";
  */
 export const addAnalysisPipeline = async payload => {
     const {userId, pipelineName, analysisFunction, chosenColumns } = payload;
-    const res = await axios.post(`${MOCK}/analysis/pipelines`, {
+    const res = await axios.post(`${ANALYSIS_PIPELINE_MODULE}`, {
         userId,
         pipelineName,
         analysisFunction,
@@ -25,9 +25,8 @@ export const addAnalysisPipeline = async payload => {
  */
 export const getAllAnalysisPipeline = payload => {
     const {userId} = payload;
-    // return axios.get(`${CONFIG_MODULE}/get/all?userId=${uid}`).then(res => {
-    //   return res;
-    return axios.get(`${MOCK}/analysis/pipelines/all/:userId`).then(res => {
+    return axios.get(`${ANALYSIS_PIPELINE_MODULE}/all/${userId}`).then(res => {
+    // return axios.get(`${MOCK}/analysis/pipelines/all/:userId`).then(res => {
         return res;
     });
 }
@@ -38,9 +37,8 @@ export const getAllAnalysisPipeline = payload => {
  */
 export const useAnalysisPipeline = payload => {
     const {pipelineId, fileId} = payload;
-    // return axios.get(`${CONFIG_MODULE}/get/all?userId=${uid}`).then(res => {
-    //   return res;
-    return axios.post(`${MOCK}/analysis/pipelines/:pipelineId`).then(res => {
+    return axios.post(`${ANALYSIS_PIPELINE_MODULE}/${pipelineId}?fileId=${fileId}`).then(res => {
+    // return axios.post(`${MOCK}/analysis/pipelines/:pipelineId`).then(res => {
         return res;
     });
 }
@@ -52,8 +50,8 @@ export const useAnalysisPipeline = payload => {
  */
 export const deleteAnalysisPipeline = payload => {
     const {pipelineId} = payload;
-    // return axios.get(`${CONFIG_MODULE}/delete?configId=${configId}`).then(res => {
-    return axios.delete(`${MOCK}/ml/pipelines/:pipelineId`).then(res => {
+    return axios.delete(`${ANALYSIS_PIPELINE_MODULE}/${pipelineId}`).then(res => {
+    // return axios.delete(`${MOCK}/ml/pipelines/:pipelineId`).then(res => {
         return res;
     });
 }

+ 1 - 1
src/views/analysis/AnalysisHistory.vue

@@ -92,7 +92,7 @@ export default {
         getAnalysisByConfig(payload).then(res => {
           tableData.value = res.result;
           for (let i=0;i<tableData.value.length;i++){
-            tableData.value[i].analysisResult=tableData.value[i].analysisResult
+            //tableData.value[i].analysisResult=tableData.value[i].analysisResult
             console.log(tableData.value[i].analysisResult)
           }
           configId.value=route.query.configId

+ 10 - 16
src/views/analysis/AnalysisPipeline.vue

@@ -116,12 +116,12 @@ export default {
     const echartsScatter = inject('echarts')
 
     const getPage = () => {
-      const uid=1;
-      GetAllFile(uid).then(res=>{
-        fileList.value=res.result.fileInfoVOList;
+      const userId=1;
+      GetAllFile(userId).then(res=>{
+        fileList.value=res.result;
       })
-      getAllAnalysisPipeline({uid}).then(res =>{
-        tableData.value = res.result.analysisPipelineVOList
+      getAllAnalysisPipeline({userId}).then(res =>{
+        tableData.value = res.result
         pageTotal.value = tableData.value.length
       })
     }
@@ -148,20 +148,13 @@ export default {
             instance.confirmButtonText = '分析中...'
             useAnalysisPipeline(data).then(res=>{
               instance.confirmButtonLoading = false
-              console.log("predic_res: ",res);
               if (res.msg === '成功')
               {
-                // ElMessageBox({
-                //   title: '流水线使用',
-                //   message: `流水线使用成功`,
-                //   confirmButtonText: '确定',
-                // })
                 done()
                 handleVisualize(res.result)
               }
               else
               {
-                console.log(res);
                 ElMessage.error("分析失败!失败码:"+res.msg);
                 done()
               }
@@ -175,13 +168,14 @@ export default {
       })
     }
 
-    const handleDelete = (pid) => {
+    const handleDelete = (pipelineId) => {
       ElMessageBox.confirm("确定要删除此流水线吗?", "提示", {
         type: "warning",
       }).then(()=>{
-        deleteAnalysisPipeline({pid}).then(res=>{
+        deleteAnalysisPipeline({pipelineId}).then(res=>{
           if(res.msg === '成功'){
             ElMessage.success("删除成功");
+            getPage()
           }
           else{
             ElMessage.error("删除失败");
@@ -191,9 +185,8 @@ export default {
     }
     const handleVisualize = (result) => {
       chart.analysisFunction = result.analysisFunction
-
       if(chart.analysisFunction === 'SCATTER_PLOT'){
-        let tempArr= result.analysisResult
+        let tempArr= JSON.parse(result.analysisResult)
         let tempObj = tempArr[0]
         let out_arr = []
         for(let key in tempObj){
@@ -226,6 +219,7 @@ export default {
           out_arr.push(temp);
         }
         chart.pieResult = out_arr
+        console.log(chart.pieResult)
       }
 
     }