推理机

PHM-web/src/views/manage/reasoning/index.vue

@@ -8,22 +8,22 @@
       <el-step title="最终结果展示"></el-step>
     </el-steps>
     <div class="content">
-      <div class="box">
+      <div class="box" style="height: 430px; overflow-y: auto; overflow-x: hidden;">
         <sortieTable v-if="isActive==0" :callback="handleCurrentChange" />
         <el-table v-if="isActive==1" :data="testModelOptions" highlight-current-row style="width: 100%;marginBottom:20px" @current-change="handleCurrentChange">
-          <el-table-column prop="model" label="模型" align="center">
+          <el-table-column prop="name" label="模型" align="center">
           </el-table-column>
-          <el-table-column prop="modelID" label="模型编号" align="center">
-          </el-table-column>
-          <el-table-column prop="attribute1" label="属性1" align="center">
+          <el-table-column prop="id" label="模型编号" align="center">
           </el-table-column>
+          <!-- <el-table-column prop="attribute1" label="属性1" align="center">
+          </el-table-column> -->
         </el-table>
-        <div v-if="isActive==2" class="">
+        <div v-if="isActive==2">
           <div class="result">
             初步结果
           </div>
           <el-select ref="selectTable" v-model="queryParams.diagnosis" placeholder="请选择增强诊断" @change="handleDiagnosis"
-            style="marginRight:120px">
+            style="margin: 0 100px">
             <el-option v-for="item in diagnosisOptions" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue">
               <span style="float: left;">{{item.dictLabel}}</span>
               <span style="float: right;color: #ccc;">{{item.dictValue}}</span>
@@ -31,23 +31,22 @@
           </el-select>
           <el-select :disabled="queryParams.diagnosis==''" ref="selectTable" v-model="queryParams.diagnosisModel"
             placeholder="请选择诊断模型">
-            <template #empty>
-              <diagnosisTable :ModelOptions="ModelOptions" :modelFlag="modelFlag" :callback="handleCurrentChange" />
-            </template>
+            <el-option v-for="item in modelOptions" :key="item.id" :label="item.name" :value="item">
+            </el-option>
           </el-select>
         </div>
         <el-select ref="selectTable" v-model="queryParams.faultModel" placeholder="请选择故障方程模型" v-if="isActive==3">
           <el-option v-for="item in FEQOptions" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <div v-if="isActive==4">
+        <div v-if="isActive==4" class="result">
           最终结果展示
         </div>
       </div>
       <div class="btn">
-        <el-button type="primary" class="back" @click="back">上一步</el-button>
-        <el-button v-if="isActive==2" type="primary" class="jump" @click="jump">跳过</el-button>
-        <el-button type="primary" class="next" @click="next">{{nextBtn}}</el-button>
+        <el-button type="primary" class="back" @click="back" style="margin-right:20px">上一步</el-button>
+        <el-button v-if="isActive==2" type="primary" class="jump" @click="jump" style="margin:0 20px">跳过</el-button>
+        <el-button type="primary" class="next" @click="next" style="margin-left:20px">{{nextBtn}}</el-button>
       </div>
     </div>
     <!-- 进度条对话框 -->
@@ -62,12 +61,10 @@
 
 <script>
 import sortieTable from '@/views/manage/reasoning/sortieTable'
-import { listFalseAlarmRestrainModel } from '@/api/manage/falseAlarmRestrainModel'
-import { listGroundDiagnosisModel } from '@/api/manage/groundDiagnosisModel'
-import { listDeepIsolationModel } from '@/api/manage/deepIsolationModel'
 import diagnosisTable from '@/views/manage/reasoning/diagnosisTable'
 import { listSortie } from '@/api/manage/sortie'
 import { getDicts } from "@/api/system/dict/data";
+import { modelListAll } from '@/api/manage/data'
 
 export default {
   name: 'Reasoning',
@@ -96,19 +93,8 @@ export default {
         { value: '选项2', label: '故障方程2' },
         { value: '选项3', label: '故障方程3' },
       ],
-      // 选择性模型
-      testModelOptions: [
-        {
-          model: '模型1',
-          modelID: 'F111',
-          attribute1: '属性1',
-        },
-        {
-          model: '模型2',
-          modelID: 'F222',
-          attribute1: '属性2',
-        },
-      ],
+      // 测试性模型
+      testModelOptions: [],
       // 调用计算引擎的选择器
       ComputingEngine: [
         { value: '选项1', label: '计算引擎1' },
@@ -143,6 +129,7 @@ export default {
       timer: null,
       // 是否跳过
       isJump: false,
+      modelOptions: [],
     }
   },
   created() {
@@ -167,12 +154,20 @@ export default {
     },
   },
   methods: {
-    // 架次信息列表
+    // 架次信息列表、测试性模型数据
     getList() {
       this.loading = true
+      const data = {
+        pageNum: 1,
+        pageSize: 10,
+        type: 8,
+      }
       listSortie(this.queryParams).then(response => {
         this.sortieList = response.rows
         this.total = response.total
+      })
+      modelListAll(data).then(response => {
+        this.testModelOptions = response.data
         this.loading = false
       })
     },
@@ -184,36 +179,6 @@ export default {
       this.diagnosisOptions = response.data.filter(item => selectedValues.includes(item.dictValue));
     });
     },
-    /** 查询虚警抑制模型列表 */
-    getFalseAlarmList() {
-      this.loading = true
-      listFalseAlarmRestrainModel(this.queryParams).then(response => {
-        this.ModelOptions = response.rows
-        this.modelFlag = 1
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    /** 查询深度隔离模型列表 */
-    getDeepList() {
-      this.loading = true
-      listDeepIsolationModel(this.queryParams).then(response => {
-        this.ModelOptions = response.rows
-        this.modelFlag = 2
-        this.total = response.total
-        this.loading = false
-      })
-    },
-    /** 查询地面诊断模型信息列表 */
-    getGroundList() {
-      this.loading = false
-      listGroundDiagnosisModel(this.queryParams).then(response => {
-        this.ModelOptions = response.rows
-        this.modelFlag = 3
-        this.total = response.total
-        this.loading = true
-      })
-    },
     // 下一步
     next() {
       if (this.isActive >= 4) this.isActive = 4
@@ -330,13 +295,23 @@ export default {
     },
     //增强诊断的选择框
     handleDiagnosis(val) {
+      let data = {
+        pageNum: 1,
+        pageSize: 10,
+        type: null,
+      }
       if (val === 'FALSE_ALARM') {
-        this.getFalseAlarmList()
+        data.type=3
       } else if (val === 'GROUND_DIAGNOSIS') {
-        this.getGroundList()
+        data.type=4
       } else {
-        this.getDeepList()
+        data.type=5
       }
+      modelListAll(data).then(response => {
+        this.modelOptions = response.data
+        this.loading = false
+      })
+      this.queryParams.diagnosisModel=''
     },
   },
 }
@@ -368,13 +343,13 @@ export default {
   bottom: -40px;
   left: 0;
   display: flex;
-  justify-content: space-around;
+  justify-content: center;
 }
 .result {
-  width: 100%;
-  height: 200px;
+  width: 700px;
+  height: 250px;
   border: 1px solid #ebebeb;
-  margin-bottom: 20px;
+  margin-bottom: 30px;
   padding: 15px;
 }
 .ProgressBar {