Merge branch 'dev-lhp' of Rmengdi/LQBZ_web into master

判故逻辑机型改为下拉框选择

src/views/als/judgeFaultLogic/index.vue

@@ -24,7 +24,9 @@
       <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="600px" :before-close="handleClose">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
           <el-form-item label="机型" prop="model">
-            <el-input v-model="form.model" placeholder="请输入机型" />
+            <el-select v-model="form.model" placeholder="请选择机型">
+              <el-option v-for="item in aircaftModelAll" :key="item.aircaftModelId" :label="item.aircaftModelName" :value="item.aircaftModelId"> </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="HMC码" prop="hmcCode">
             <el-input v-model="form.hmcCode" placeholder="请输入HMC码" />
@@ -57,6 +59,7 @@ import { getJudgeFaultLogic, getAircaftTypeAndModelTree, addJudgeFaultLogic, upd
 import { deepClone, debounce } from '@/utils/index'
 import { getDict } from '@/api/dict'
 import { getModel } from '@/api/als/model'
+import { getAircaftModelAll, getAircaftCatalogAll } from '@/api/als/aircraft'
 export default {
   name: 'JudgeFaultLogic',
   components: {},
@@ -90,7 +93,15 @@ export default {
         { prop: 'id', label: '编号' },
         {
           prop: 'model',
-          label: '机型'
+          label: '机型',
+          render: (h, params) => {
+            const matchedItem = this.aircaftModelAll.find((item) => params.row.model === item.aircaftModelId)
+            if (matchedItem) {
+              return h('span', matchedItem.aircaftModelName)
+            } else {
+              return h('span', params.row.model)
+            }
+          }
         },
         {
           prop: 'hmcCode',
@@ -176,7 +187,8 @@ export default {
         parameterColumn: [{ required: true, message: '参数列不能为空', trigger: 'blur' }],
         pattern: [{ required: true, message: '模型不能为空', trigger: 'blur' }]
       },
-      debounceFn: debounce(this.fetch, 500)
+      debounceFn: debounce(this.fetch, 500),
+      aircaftModelAll: []
     }
   },
   watch: {
@@ -252,6 +264,13 @@ export default {
       } = await getJudgeFaultLogic({ pageSize, pageNum: pageIndex, keyWord, ...params })
       this.tableData = list
       this.tableRequset.total = totalCount
+      const getAircaftModelAllParams = {
+        aircaftTypeCode: '',
+        aircaftTypeId: '',
+        queryParam: ''
+      }
+      const { data: data1 } = await getAircaftModelAll(getAircaftModelAllParams)
+      this.aircaftModelAll = data1
     },
 
     fetch() {