将算法模块拆分为数据处理、特征提取、故障预测三个算法模块

pdaaphm-admin/src/main/resources/mapper/algoManager/AlgorithmMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectAlgorithmList" parameterType="Algorithm" resultMap="AlgorithmResult">
         <include refid="selectAlgorithmVo"/>
         <where>
-            <if test="type != null  and type != ''"> and `type` = #{type}</if>
+            <if test="type != null  and type != ''"> and algo.`type` = #{type}</if>
             <if test="subTypeId != null "> and sub_type_id = #{subTypeId}</if>
             <if test="name != null  and name != ''"> and `name` like concat('%', #{name}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>

pdaaphm-ui/src/views/algoManager/algorithm/index.vue

@@ -4,7 +4,7 @@
       <el-form-item label="算法类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择算法类型" clearable filterable @change=changeQueryType()>
           <el-option
-            v-for="dict in dict.type.algorithm_type"
+            v-for="dict in dict.type.process_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -122,12 +122,12 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList()"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="algorithmList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="processList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编号" align="center" prop="id" />
       <el-table-column label="算法类型" align="center" prop="type">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.algorithm_type" :value="scope.row.type"/>
+          <dict-tag :options="dict.type.process_type" :value="scope.row.type"/>
         </template>
       </el-table-column>
       <el-table-column label="算法子类型" align="center" prop="algoSubName" />
@@ -193,7 +193,7 @@
         <el-form-item label="算法类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择算法类型" clearable filterable :disabled="form.status == 2" @change='changeFormType()'>
             <el-option
-              v-for="dict in dict.type.algorithm_type"
+              v-for="dict in dict.type.process_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -283,7 +283,7 @@ import { isExternal } from "@/utils/validate";
 
 export default {
   name: "Algorithm",
-  dicts: ['algorithm_type','algo_run_status'],
+  dicts: ['process_type','algo_run_status'],
   data() {
     return {
       // 遮罩层
@@ -300,6 +300,8 @@ export default {
       total: 0,
       // 算法表格数据
       algorithmList: [],
+      // 数据处理模块算法
+      processList: [],
       // 算法子类列表
       algorithmSubList: [],
       // 算法特定类列表
@@ -352,6 +354,12 @@ export default {
       this.loading = true;
       listAlgorithm(this.queryParams).then(response => {
         this.algorithmList = response.rows;
+        this.processList = [];
+        for(const algorithm of this.algorithmList) {
+          if(algorithm.type == 3 || algorithm.type == 5 || algorithm.type == 6) {
+            this.processList.push(algorithm);
+          }
+        }
         this.total = response.total;
         this.loading = false;
       });
@@ -491,6 +499,7 @@ export default {
       });
     },
     
+    /**创建连接算法大类型和算法子类列表的map */
     createTypeMap() {
       this.typeMap = new Map();
       for (const algorithmSub of this.algorithmSubList) {