部分前端样式修改

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

@@ -140,15 +140,9 @@ export default {
     },
     // 取消按钮
     cancel() {
-<<<<<<< HEAD
-      this.open = false
-      this.openOffline = false
-      this.reset()
-=======
       this.open = false;
       this.openOffline = false;
       this.reset();
->>>>>>> 70691ea7199067e6be8fceb7c69b9e0acf69a7c6
     },
     // 表单重置
     reset() {

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

@@ -37,7 +37,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="orderInfoList" @selection-change="handleSelectionChange" max-height="200">
+    <el-table v-loading="loading" :data="orderInfoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="指令名称" align="center" prop="orderName" />
       <el-table-column label="指令类型" align="center" prop="orderType" />

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

@@ -2,39 +2,31 @@
   <div class="reasoning">
     <el-steps :active="isActive" align-center class="step" finish-status="success">
       <el-step title="数据选择" description="请选择架次信息"></el-step>
-      <el-step title="测试性模型选择" description="这是一段很长很长很长的描述性文字"></el-step>
-      <el-step title="是否进行增强诊断" description="这是一段很长很长很长的描述性文字"></el-step>
-      <el-step title="故障方程选择" description="这是一段很长很长很长的描述性文字"></el-step>
+      <el-step title="测试性模型选择" description="请选择测试性模型"></el-step>
+      <el-step title="是否进行增强诊断" description="初步结果产生，是否还需要增强诊断"></el-step>
+      <el-step title="故障方程选择" description="请选择故障方程"></el-step>
       <el-step title="最终结果展示"></el-step>
     </el-steps>
     <div class="content">
       <div class="box">
-        <el-select ref="selectTable" v-model="queryParams.sortie" placeholder="请选择架次" v-if="isActive==0" filterable>
-          <template #empty>
-            <sortieTable :callback="handleCurrentChange" />
-          </template>
-        </el-select>
-        <el-select ref="selectTable" v-model="queryParams.testModel" placeholder="请选择测试性模型" v-if="isActive==1">
-          <template #empty>
-            <el-table :data="testModelOptions" style="width: 100%" @current-change="handleCurrentChange">
-              <el-table-column prop="model" label="模型" width="180">
-              </el-table-column>
-              <el-table-column prop="modelID" label="模型编号" width="180">
-              </el-table-column>
-              <el-table-column prop="attribute1" label="属性1">
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-select>
-        <div v-if="isActive==2">
+        <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>
+          <el-table-column prop="modelID" 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 class="result">
             初步结果
           </div>
           <el-select ref="selectTable" v-model="queryParams.diagnosis" placeholder="请选择增强诊断" @change="handleDiagnosis"
             style="marginRight:120px">
-            <el-option v-for="item in diagnosisOptions" :key="item.value" :label="item.label" :value="item.value">
-              <span style="float: left;">{{item.label}}</span>
-              <span style="float: right;color: #ccc;">{{item.value}}</span>
+            <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>
             </el-option>
           </el-select>
           <el-select :disabled="queryParams.diagnosis==''" ref="selectTable" v-model="queryParams.diagnosisModel"
@@ -70,14 +62,16 @@
 
 <script>
 import sortieTable from '@/views/manage/reasoning/sortieTable'
-import { listOrderInfo } from '@/api/manage/orderInfo'
 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";
+
 export default {
   name: 'Reasoning',
+  dicts: ['order_type'],
   components: { sortieTable, diagnosisTable },
   data() {
     return {
@@ -185,14 +179,10 @@ export default {
     /** 查询系统指令信息列表 */
     getOrderList() {
       this.loading = true
-      listOrderInfo(this.queryParams).then(response => {
-        this.diagnosisOptions = response.rows
-          .map(item => ({
-            label: item.orderName,
-            value: item.orderType,
-          }))
-          .filter(item => item.value !== 'XZ')
-      })
+      getDicts("order_type").then(response => {
+      const selectedValues = ["FALSE_ALARM", "GROUND_DIAGNOSIS", "DEEP_ISOLATION"];
+      this.diagnosisOptions = response.data.filter(item => selectedValues.includes(item.dictValue));
+    });
     },
     /** 查询虚警抑制模型列表 */
     getFalseAlarmList() {
@@ -340,10 +330,12 @@ export default {
     },
     //增强诊断的选择框
     handleDiagnosis(val) {
-      if (val == 'ZJ') {
+      if (val === 'FALSE_ALARM') {
         this.getFalseAlarmList()
-      } else if (val == 'DM') {
+      } else if (val === 'GROUND_DIAGNOSIS') {
         this.getGroundList()
+      } else {
+        this.getDeepList()
       }
     },
   },
@@ -363,7 +355,8 @@ export default {
   position: relative;
 }
 .box {
-  height: 400px;
+  height: 100%;
+  width: 100%;
   display: flex;
   justify-content: center;
 }
@@ -371,6 +364,7 @@ export default {
   width: 100%;
   height: 40px;
   position: absolute;
+  margin-top: 10px;
   bottom: -40px;
   left: 0;
   display: flex;

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

@@ -1,25 +1,26 @@
 <template>
-  <div>
-    <el-table ref="singleTable" v-loading="loading" :data="sortieList" @current-change="handle">
-      <el-table-column label="机号" align="center" prop="aircraftNumber" />
-      <el-table-column label="架次号" align="center" prop="sortieNumber" />
-      <el-table-column label="开始时间" align="center" prop="startTime" width="180">
+  <div class="table">
+    <el-table ref="singleTable" v-loading="loading" highlight-current-row :data="sortieList" @current-change="handle">
+      
+      <el-table-column label="机号" align="center" prop="aircraftNumber" fixed/>
+      <el-table-column label="架次号" align="center" prop="sortieNumber" fixed/>
+      <el-table-column label="开始时间" align="center" prop="startTime" min-width="180">
         <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.startTime, "{y}-{m}-{d} {h}:{i}:{s}")
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endTime" width="180">
+      <el-table-column label="结束时间" align="center" prop="endTime" min-width="180">
         <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.endTime, "{y}-{m}-{d} {h}:{i}:{s}")
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="飞行时长" align="center" prop="duration" />
+      <el-table-column label="飞行时长" align="center" prop="duration" min-width="180"/>
       <el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="180">
         <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}")
@@ -27,7 +28,7 @@
         </template>
       </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateBy" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+      <el-table-column label="更新时间" align="center" prop="updateTime" min-width="180">
         <template slot-scope="scope">
           <span>{{
             parseTime(scope.row.updateTime, "{y}-{m}-{d} {h}:{i}:{s}")
@@ -68,6 +69,8 @@ export default {
       open: false,
       startTime: '',
       endTime: '',
+      // 表格单选选中的
+      currentRow: null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -105,6 +108,7 @@ export default {
     // },
     //单选
     handle(val) {
+      this.currentRow=val
       this.callback(val)
     }
   },
@@ -112,6 +116,9 @@ export default {
 </script>
 
 <style scoped>
+.table{
+  width: 100%;
+}
 .pagination-container{
   height: 38px;
   padding: 0 0 !important;