合并武汉新代码

src/components/FittingsModal/index.js

@@ -30,9 +30,12 @@ export const columns = (_this) => [
     width: '140px',
     render: (h, params) => {
       //根据healthStatus值显示健康或故障
-      const statusText = params.row.healthStatus === '已完成' ? '健康' : '故障'
-      const statusClass = params.row.healthStatus === '已完成' ? 'success-state' : 'warning-state'
-      return h('span', { class: statusClass }, statusText)
+      // const statusText = params.row.healthStatus === '已完成' ? '健康' : '故障'
+      // const statusClass = params.row.healthStatus === '已完成' ? 'success-state' : 'warning-state'
+      // return h('span', { class: statusClass }, statusText)
+
+      const statusClass = params.row.healthStatus === '健康' ? 'success-state' : 'warning-state'
+      return h('span', { class: statusClass }, params.row.healthStatus)
     }
   },
   {

src/components/FittingsModal/index.vue

@@ -63,8 +63,6 @@ export default {
       if (code == 200) {
         this.dialogTableData = data.list
         this.tableRequset.total = data.totalCount
-        debugger
-
         //获取飞机故障统计集合
         const { code: healthCode, data: healthData } = await getFaultStatisticsList()
         if (healthCode == 200) {
@@ -74,11 +72,13 @@ export default {
             healthStatusMap[item.aircraftNum] = item.repairStatus
           })
           this.dialogTableData.forEach(async (aircraft) => {
-            aircraft.healthStatus = healthStatusMap[aircraft.aircaftCatalogCode] || ''
+            // aircraft.healthStatus = healthStatusMap[aircraft.aircaftCatalogCode] || ''
+            const hasFault = healthStatusMap.hasOwnProperty(aircraft.aircaftCatalogCode)
+            aircraft.healthStatus = hasFault ? '故障' : '健康'
           })
         } else {
           this.dialogTableData.forEach(async (aircraft) => {
-            aircraft.healthStatus = ''
+            aircraft.healthStatus = '健康'
           })
         }
         //强制更新列定义