Explorar o código

feat:实现三种数理函数分析呈现

tscRubbish %!s(int64=4) %!d(string=hai) anos
pai
achega
34ea84a44f

+ 76 - 1
src/api/file.js

@@ -163,7 +163,82 @@ export const getFileDetail = payload => {
 export const deleteFile = payload => {
     console.log(payload);
     const {fileId} = payload;
-    return axios.get(`${FILE_MODULE}/delete`, {params:{fileId:fileId}}).then(res => {
+    return axios.get(`${FILE_MODULE}/delete`, {params:{fields:fields}}).then(res => {
         return res.data;
     });
 }
+
+/**
+ *  文件分析 GET /analysis/fields
+ * @param {*} payload
+ * @returns
+ */
+export const analysisFile = (fieldIds,funcId) => {
+    console.log("analysisFile: "+fieldIds+"  "+funcId);
+    // return axios.get(`${FILE_MODULE}//analysis/fields`, {params:{fieldIds:fieldIds,funcId:funcId}}).then(res => {
+    //     return res.data;
+    // });
+    if (funcId==1){
+        return Promise.resolve({
+            "timestamp": 1649561125585,
+            "status": 200,
+            "data": {
+                "105_statistical": {
+                    "R": 330.0,
+                    "L": 424.0
+                },
+                "105_distribution": {
+                    "R": 0.4376657824933687,
+                    "L": 0.5623342175066314
+                }
+            }
+        });
+    }
+    if (funcId==2){
+        return Promise.resolve({
+            "timestamp": 1649561125585,
+            "status": 400,
+            "data":""
+        });
+    }
+    if (funcId==3){
+        return Promise.resolve({
+            "timestamp": 1649561321298,
+            "status": 200,
+            "data": {
+                "frame_index": {
+                    "max": 89992.0,
+                    "variance": 6.474726567563616E8,
+                    "mean": 45439.82360742705,
+                    "stddev": 25445.484014975264
+                }
+            }
+        })
+    }
+    if (funcId==4){
+        return Promise.resolve({
+            "timestamp": 1649561409955,
+            "status": 200,
+            "data": {
+                "103": {
+                    "skewness": -0.010820149962232854,
+                    "kurtosis": -1.0998405481091291
+                }
+            }
+        })
+    }
+    if (funcId==5){
+        return Promise.resolve({
+            "timestamp": 1649561470265,
+            "status": 200,
+            "data": {
+                "Corr": 0.9999999999999994
+            }
+        })
+    }
+    return Promise.resolve({
+        "timestamp": 1649561470265,
+        "status": 400,
+        "data": ""
+    })
+}

+ 1 - 1
src/components/Sidebar.vue

@@ -61,7 +61,7 @@ export default {
             {
                 icon: "el-icon-lx-cascades",
                 index: "/config",
-                title: "配置",
+                title: "模型配置",
             },
             {
               icon: "el-icon-lx-redpacket_fill",

+ 151 - 40
src/views/FileDetail.vue

@@ -12,7 +12,7 @@
         <router-link to="/fileList">
         <el-button type="primary" plain icon="el-icon-lx-file" >选择文件</el-button>
         </router-link>
-        <el-button type="primary" icon="el-icon-thumb" @click="handleEdit">数理分析</el-button>
+        <el-button type="primary" icon="el-icon-thumb" @click="handleAnalysis">数理分析</el-button>
         <el-button type="primary" icon="el-icon-thumb" @click="createConfig">生成配置文件</el-button>
 
 
@@ -49,27 +49,67 @@
       </div>
     </div>
 
-    <!-- 编辑弹出框 -->
-    <el-dialog title="选择字段" v-model="editVisible" width="30%">
+    <el-dialog title="选择字段" v-model="analysisVisible" width="30%">
       <el-form label-width="120px">
-        <el-form-item label="统计分析" required>
-          <el-input v-model="form.name"></el-input>
+        <el-form-item label="分析方法" required>
+          <el-select v-model="form.type" placeholder="分析方法" class="handle-select mr10" >
+            <el-option key="1" label="数据分布" value="1"></el-option>
+            <el-option key="2" label="散点图" value="2"></el-option>
+            <el-option key="3" label="数据统计" value="3"></el-option>
+            <el-option key="4" label="偏度-峰度" value="4"></el-option>
+            <el-option key="5" label="皮尔森相关系数" value="5"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="所选方法简介" required>
-          <el-input v-model="form.address"></el-input>
+        <el-form-item label="方法和字段要求" required>
+          <text>皮尔森相关系数需要两个int/double字段,其他的方法只需一个字段。除了数据分布外可以传入string字段,其他方法请传入int/double字段</text>
         </el-form-item>
-        <el-form-item label="可选择字段" required>
-
+        <el-form-item label="已选择字段" required>
+          <el-table :data="selectData" border class="table"  header-cell-class-name="table-header" >
+            <el-table-column label="字段名">
+              <template #default="scope"><span>{{ scope.row.fieldName }}</span></template>
+            </el-table-column>
+          </el-table>
         </el-form-item>
+      </el-form>
+      <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="analysisVisible = false">取 消</el-button>
+                    <el-button type="primary" @click="startAnalysis">确 定</el-button>
+                </span>
+      </template>
+    </el-dialog>
 
+    <!--数理函数分析结果-->
+    <el-dialog title="分析结果" v-model="resultVisible" width="50%">
+      <el-form label-width="120px">
+        <el-form-item label="分析方法" required>
+            {{ AnalysisMethodName[parseInt(form.type)-1] }}
+        </el-form-item>
+        <el-form-item label="已选择字段" required>
+          <el-table :data="selectData" border class="table"  header-cell-class-name="table-header" >
+            <el-table-column label="字段名">
+              <template #default="scope"><span>{{ scope.row.fieldName }}</span></template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
+        <el-form-item label="分析结果" required>
+          <el-table :data="analysisData" border class="table"  header-cell-class-name="table-header" >
+            <el-table-column label="分析指标" prop="attribute">
+              <template #default="scope"><span>{{ scope.row.attribute }}</span></template>
+            </el-table-column>
+            <el-table-column label="指标数值" prop="value">
+              <template #default="scope"><span>{{ scope.row.value }}</span></template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
       </el-form>
       <template #footer>
                 <span class="dialog-footer">
-                    <el-button @click="editVisible = false">取 消</el-button>
-                    <el-button type="primary" @click="saveEdit">确 定</el-button>
+                    <el-button @click="resultVisible = false">取 消</el-button>
                 </span>
       </template>
     </el-dialog>
+
     <el-dialog title="新建配置" v-model="configCreate" width="30%">
       <el-form label-width="120px">
         <el-form-item label="配置名" required>
@@ -99,7 +139,7 @@
       </el-form>
       <template #footer>
                 <span class="dialog-footer">
-                    <el-button @click="editVisible = false">取 消</el-button>
+                    <el-button @click="configCreate = false">取 消</el-button>
                     <el-button type="primary" @click="saveConfig">确 定</el-button>
                 </span>
       </template>
@@ -111,8 +151,9 @@
 import {ref, reactive, getCurrentInstance, onMounted} from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { fetchData } from "../api/index";
-import {getFileDetail} from "../api/file";
+import {getFileDetail,analysisFile} from "../api/file";
 import {useRoute}from "vue-router";
+import { toRaw } from '@vue/reactivity'
 export default {
   name: "config",
   //训练特征
@@ -123,21 +164,24 @@ export default {
       pageIndex: 1,
       pageSize: 10,
     });
-    const fileId=1;
-    //new TODO
+    let fileId;
+    let AnalysisMethodName=["数据分布","散点图","数据统计","偏度-峰度","皮尔森相关系数"];
+
     //TODO
-    const fieldNameList=[]; //字段名
-    const aliasList=[];   //别名
-    const descList=[];      //描述
-    const aList=[];   //取值类型
-    const bList=[];   //分布类型
-    const cList=[];   //空值率
-    const dList=[];
+    let fieldNameList=[]; //字段名
+    let aliasList=[];   //别名
+    let descList=[];      //描述
+    let aList=[];   //取值类型
+    let bList=[];   //分布类型
+    let cList=[];   //空值率
+    let dList=[];
 
 
     const tableData = ref([]);
     const selectData = ref([]);
+    let analysisData=reactive([])
     const pageTotal = ref(0);
+
     // 获取表格数据
     const getData = () => {
       const route=useRoute()
@@ -153,7 +197,8 @@ export default {
             }
           }
           //console.log(tableData)
-          console.log(route.query.fileId)
+          console.log("fileId="+route.query.fileId)
+          fileId=route.query.fileId
         })
       }
 
@@ -180,23 +225,92 @@ export default {
           .then(() => {
             ElMessage.success("删除成功");
             tableData.value.splice(index, 1);
+            //todo:
           })
           .catch(() => {});
     };
 
     // 表格编辑时弹窗和保存
-    const editVisible = ref(false);
+    let analysisVisible = ref(false);
     let form = reactive({
       name: "",
       type: "",
       // classification:"",
       // feature:"",
     });
+
     let idx = -1;
-    const handleEdit = () => {
-      editVisible.value = true;
+    const handleAnalysis = () => {
+      analysisVisible.value = true;
     };
 
+    const startAnalysis = () => {
+      analysisVisible.value = false;
+      //todo: 数理分析相关
+
+      console.log(form.type);
+      console.log(toRaw(selectData.value))
+
+      let selectList=[]
+      let fieldIds=[]
+      for (var i=0; i<selectData.value.length;i++){
+        //selectList.push(JSON.parse(JSON.stringify(selectData.value[i])))
+        fieldIds.push(selectData.value[i].id)
+        //console.log(selectData.value[i].id)
+        //console.log(selectData.value[i])
+        //console.log(JSON.parse(JSON.stringify(selectData.value[i])))
+      }
+      //console.log(selectList)
+      console.log(fieldIds)
+      analysisFile(fieldIds,form.type).then(res=>{
+        console.log(res.data)
+        if (res.status!=200){
+          ElMessageBox.confirm("分析产生错误,请检查您的分析方法和字段选择是否合理", "错误", {
+            type: "error",
+          })
+              .then(()=>{
+
+              })
+              .catch(() => {});
+        }else{
+          analysisData.length=0
+          console.log(form.type);
+          switch (form.type){
+            case "1":
+              break;
+            case "2":
+              break;
+            case "3":
+              analysisData.push({attribute:"最大值",value:res.data.frame_index.max});
+              analysisData.push({attribute:"方差",value:res.data.frame_index.variance});
+              analysisData.push({attribute:"平均值",value:res.data.frame_index.mean});
+              analysisData.push({attribute:"标准方差",value:res.data.frame_index.stddev});
+              console.log(analysisData)
+              break;
+            case "4":
+              analysisData.push({attribute:"偏度",value:res.data[fieldIds[0]].skewness});
+              analysisData.push({attribute:"峰度",value:res.data[fieldIds[0]].kurtosis});
+              console.log(analysisData)
+              break;
+            case "5":
+              analysisData.push({attribute:"皮尔森相关系数",value:res.data.Corr});
+              console.log(analysisData)
+              break;
+          }
+
+          resultVisible.value=true;
+        }
+      })
+
+      // ElMessage.success(`修改第 ${idx + 1} 行成功`);
+      // Object.keys(form).forEach((item) => {
+      //   tableData.value[idx][item] = form[item];
+      // });
+
+    };
+    let resultVisible= ref(false);
+
+
     const configCreate = ref(false);
     const createConfig =() => {
       const fieldTable = ref(null)
@@ -208,21 +322,14 @@ export default {
 
       configCreate.value = true;
     };
-    const saveEdit = () => {
-      editVisible.value = false;
-      //todo: 数理分析相关
-
 
-      // ElMessage.success(`修改第 ${idx + 1} 行成功`);
-      // Object.keys(form).forEach((item) => {
-      //   tableData.value[idx][item] = form[item];
-      // });
-    };
     const saveConfig = () => {
-      editVisible.value = false;
+      configCreate.value = false;
       ElMessage.success(`已成功生成配置`);
       //todo: 调用Config相关接口
 
+
+
     };
     const handleSelectChange=val=>{
       selectData.value=val;
@@ -230,19 +337,23 @@ export default {
 
     return {
       query,
+      AnalysisMethodName,
       tableData,
       pageTotal,
-      editVisible,
+      analysisVisible,
+      resultVisible,
       form,
       configCreate,
+      createConfig,
+      saveConfig,
       selectData,
+      analysisData,
       handleSelectChange,
       handleSearch,
       handlePageChange,
       handleDelete,
-      handleEdit,
-      saveEdit,
-      createConfig
+      handleAnalysis,
+      startAnalysis,
     };
   },
 };

+ 1 - 1
src/views/FileList.vue

@@ -103,7 +103,7 @@ export default {
   setup() {
     const message = ref("first");
     let userId=1;
-    const state = reactive({
+    let state = reactive({
       fileList: [
         {
           date: "2018-04-19 20:00:00",

+ 1 - 1
参考/接口测试md/接口调用测试与说明.md

@@ -376,7 +376,7 @@ getDetail接口传入文件id,这里传入上面upload的event_data.csv的file
 
 ![文件字段分布2](.\接口调用测试&说明.assets\文件字段分布2.jpg)
 
-##### GET:/analysis/fields1
+##### GET:/analysis/fields
 
 调用FileService.getFieldAnalysis()进行字段数理函数分析
 

BIN=BIN
参考/接口测试md/接口调用测试与说明.pdf