config√

src/api/config.js

@@ -1,6 +1,8 @@
 import request from '../utils/request';
-import axios from 'axios';
+//import axios from 'axios';
 import {CONFIG_MODULE} from "./_prefix";
+import {axios} from '../utils/request'
+
 
 /**
  *  添加模型配置信息 POST /add
@@ -15,7 +17,7 @@ export const addConfig = payload => {
   return axios.post(`${CONFIG_MODULE}/add`, {
     fileInfoId, userId,modelTypeId,confName ,fieldIds
   }).then(res => {
-    return res.data;
+    return res;
   });
 }
 
@@ -31,207 +33,12 @@ export const getAllConfig = payload => {
   const {uid} = payload;
   console.log("payload",payload);
   console.log("uid",uid);
-  // return axios.get(`${CONFIG_MODULE}/get/all?userId=${uid}`).then(res => {
-  //
-  //   return res.data;
-  // });
-  return Promise.resolve({
-    "timestamp": 1649419361037,
-    "status": 200,
-    "data": [
-      {
-        "fileId": "1",
-        "fileName": "event_data",
-        "configId": "1",
-        "modelTypeId": "2",
-        "modelTypeName": "决策树",
-        "confName": "config1",
-        "featureList": [
-          {
-            "id": 105,
-            "fileInfoId": 1,
-            "fieldName": "road",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"R\",\"L\"]"
-          },
-          {
-            "id": 106,
-            "fileInfoId": 1,
-            "fieldName": "lane",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"r\",\"m\",\"l\"]"
-          },
-          {
-            "id": 107,
-            "fileInfoId": 1,
-            "fieldName": "vehicle_class",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"car\",\"truck\",\"bus\"]"
-          },
-          {
-            "id": 110,
-            "fileInfoId": 1,
-            "fieldName": "duration",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"48,60\",\"24,36\",\"36,48\",\"12,24\",\"0,12\"]"
-          },
-          {
-            "id": 109,
-            "fileInfoId": 1,
-            "fieldName": "event_type",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"cruise\",\"overdrive\"]"
-          }
-        ]
-      },
-      {
-        "fileId": "1",
-        "fileName": "event_data",
-        "configId": "3",
-        "modelTypeId": "9",
-        "modelTypeName": "K-均值",
-        "confName": "Kmeans-Test",
-        "featureList": [
-          {
-            "id": 105,
-            "fileInfoId": 1,
-            "fieldName": "road",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"R\",\"L\"]"
-          },
-          {
-            "id": 106,
-            "fileInfoId": 1,
-            "fieldName": "lane",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"r\",\"m\",\"l\"]"
-          },
-          {
-            "id": 107,
-            "fileInfoId": 1,
-            "fieldName": "vehicle_class",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"car\",\"truck\",\"bus\"]"
-          },
-          {
-            "id": 110,
-            "fileInfoId": 1,
-            "fieldName": "duration",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"48,60\",\"24,36\",\"36,48\",\"12,24\",\"0,12\"]"
-          },
-          {
-            "id": 109,
-            "fileInfoId": 1,
-            "fieldName": "event_type",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"cruise\",\"overdrive\"]"
-          }
-        ]
-      }
-    ]
-  })
-}
+  return axios.get(`${CONFIG_MODULE}/get/all?userId=${uid}`).then(res => {
 
-//   console.log("uid",uid);
-//   return[
-//     {
-//       "id": 1,
-//       "configName": "gg",
-//       "modelType": "gg",
-//       "feature": "gg",
-//       "time": 1}];
-//
-//     },{
-//       "id": 1,
-//       "configName": "gg",
-//       "modelType": "gg",
-//       "feature": "gg",
-//       "time": 1
-//
-//     },
-//     {
-//       "id": 1,
-//       "configName": "gg",
-//       "modelType": "gg",
-//       "feature": "gg",
-//       "time": 1
-//
-//     }];
-//
-//
-// }
+    return res;
+  });
+}
 
-// let mock=(userId)=>{
-//   // console.log("mock");
-//   if(userId===1){
-//     return [
-//     {
-//       "id": 1,
-//         "configName": "gg",
-//         "modelType": "gg",
-//         "feature": "gg",
-//         "time": 1
-//
-//     },{
-//       "id": 1,
-//         "configName": "gg",
-//         "modelType": "gg",
-//         "feature": "gg",
-//         "time": 1
-//
-//     },
-//     {
-//       "id": 1,
-//         "configName": "gg",
-//         "modelType": "gg",
-//         "feature": "gg",
-//         "time": 1
-//
-//     }]
-//
-//   }
-// }
 
 /**
  * 获取所有新配置 GET /get/all_new/{userId}
@@ -243,7 +50,7 @@ export const getAllNew = payload => {
   const { uid } = payload;
   return axios.get(`${CONFIG_MODULE}/get/all_new/${uid}`).then(res => {
 
-    return res.data;
+    return res;
   });
 }
 
@@ -257,94 +64,9 @@ export const getOneConfig = payload => {
   const { configId } = payload;
   console.log("configId",configId);
   console.log("payload",payload);
-  // return axios.get(`${CONFIG_MODULE}/get/one/config?configId=${configId}`).then(res => {
-  //
-  //   return res.data;});
-    return Promise.resolve({
-      "timestamp": 1649473724362,
-      "status": 200,
-      "data": {
-        "configId": "1",
-        "modelTypeId": "6",
-        "modelTypeName": "决策树",
-        "modelDes": "决策树是一个预测模型；他代表的是对象属性与对象值之间的一种映射关系。树中每个节点表示某个对象，而每个分叉路径则代表的某个可能的属性值，而每个叶结点则对应从根节点到该叶节点所经历的路径所表示的对象的值。",
-        "modelDetileDes": "通过分析交通数据中的road、lane、vehicle_class、duration字段来预测事故类别。",
-        "featureList": [
-          {
-            "id": 105,
-            "fileInfoId": 1,
-            "fieldName": "road",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"R\",\"L\"]"
-          },
-          {
-            "id": 106,
-            "fileInfoId": 1,
-            "fieldName": "lane",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"r\",\"m\",\"l\"]"
-          },
-          {
-            "id": 107,
-            "fileInfoId": 1,
-            "fieldName": "vehicle_class",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"car\",\"truck\",\"bus\"]"
-          },
-          {
-            "id": 110,
-            "fileInfoId": 1,
-            "fieldName": "duration",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"48,60\",\"24,36\",\"36,48\",\"12,24\",\"0,12\"]"
-          },
-          {
-            "id": 109,
-            "fileInfoId": 1,
-            "fieldName": "event_type",
-            "aliasName": "",
-            "fieldDes": "",
-            "nullsRatio": 0.0,
-            "conOrDis": 0,
-            "fieldType": "string",
-            "valueInfo": "[\"cruise\",\"overdrive\"]"
-          }
-        ],
-        "modelInfos": [
-          {
-            "modelName": "event_data",
-            "modelDetailName": "DecisionTree",
-            "trainedStatus": 1
-          },
-          {
-            "modelName": "event_data2",
-            "modelDetailName": "DecisionTree",
-            "trainedStatus": -1
-          },
-          {
-            "modelName": "event_data3",
-            "modelDetailName": "DecisionTree",
-            "trainedStatus": -1
-          }
-        ]
-      }
-    });
+  return axios.get(`${CONFIG_MODULE}/get/one/config?configId=${configId}`).then(res => {
+
+    return res;});
 
 }
 
@@ -359,7 +81,7 @@ export const changeConfig = payload => {
   const { configId,confName,tranFeatureList } = payload;
   return axios.get(`${CONFIG_MODULE}/change/${configId}?confName=${confName}&trainFeatureList={trainFeatureList}`).then(res => {
 
-    return res.data;
+    return res;
   });
 }
 
@@ -374,7 +96,7 @@ export const deleteModelByModelId = configId => {
   //const { configId } = payload;
   return axios.get(`${CONFIG_MODULE}/delete?configId=${configId}`).then(res => {
 
-    return res.data;
+    return res;
   });
 }
 
@@ -387,6 +109,6 @@ export const getFeatureSelection = payload => {
   const { fileId,fieldName } = payload;
   return axios.get(`${CONFIG_MODULE}/get/features?fileId=${fileId}&fieldName=${fieldName}`).then(res => {
 
-    return res.data;
+    return res;
   });
 }

src/api/model.js

@@ -1,4 +1,4 @@
-import axios from "axios"
+import {axios} from '../utils/request'
 import {MODEL_MODULE} from "./_prefix";
 
 /**