Jelajahi Sumber

3.2问题修改

zhongxiaoyu 2 tahun lalu
induk
melakukan
ed3ee253e3

+ 3 - 3
src/views/realTime/components/AirportView/AirportForm.vue

@@ -24,7 +24,7 @@
         :clearable="false"
       />
     </el-form-item>
-    <el-form-item :prop="formData.flightState" style="width: 104px">
+    <el-form-item :prop="formData.flightState" style="width: 134px">
       <el-select
         v-model="formData.flightState"
         size="default"
@@ -150,9 +150,9 @@ const flightStateOptions = ref([
   },
 ])
 onMounted(() => {
-  if (props.name.includes('InternationalDeparture')) {
+  if (props.name.includes('International')) {
     flightStateOptions.value.push({
-      label: '机场代理',
+      label: '机场代理操作',
       value: 'groundService',
     })
   }

+ 1 - 1
src/views/realTime/components/AirportView/index.vue

@@ -16,7 +16,7 @@
         <CountBox
           :count-number="airportCount.weight"
           :label="`已${isDeparture ? '装载' : '卸载'}重量(吨)`"
-          :length="5"
+          :length="4"
         />
       </div>
       <div class="airport-settings">

+ 1 - 1
src/views/realTime/components/AirportView/useFlightState.ts

@@ -50,7 +50,7 @@ export function useFlightState(
         }
       }
       if (
-        name.includes('InternationalDeparture') &&
+        name.includes('International') &&
         !(['CA', 'ZH', 'CZ', 'O3', '5X', 'FX', 'DO'] as CommonValue[]).includes(
           row.IATACode
         )

+ 5 - 6
src/views/realTime/components/FlightView/index.vue

@@ -47,11 +47,7 @@
           color="#ac014d"
           @click="refreshHandler"
         /> -->
-        <el-button
-          class="button-sqaure"
-          color="#ac014d"
-          @click="exportHandler"
-        >
+        <el-button class="button-sqaure" color="#ac014d" @click="exportHandler">
           <i class="icon-export" />
         </el-button>
         <ColumnSet
@@ -148,6 +144,7 @@ const tableFormatter: CommonTableFormatter = (
   cellValue,
   index
 ) => {
+  const value = String(cellValue ?? '').trim()
   if (column.property === 'execResult') {
     const execResult = Number(cellValue)
     if (Number.isNaN(execResult)) {
@@ -155,7 +152,6 @@ const tableFormatter: CommonTableFormatter = (
     }
     return execResult ? '通过' : '未通过'
   }
-  const value = String(cellValue ?? '').trim()
   if (column.property.includes('Time')) {
     return datetimeToTime(value, flightDate as CommonValue)
   }
@@ -194,6 +190,9 @@ const tableFormatter: CommonTableFormatter = (
     }
     return NODE_CODE[value] ?? value
   }
+  if (column.property === 'typeCode' && props.name.includes('International')) {
+    return value || '拼货'
+  }
   return value
 }
 

+ 11 - 0
src/views/realTime/components/FlightView/useFlightInfo.ts

@@ -283,6 +283,17 @@ export function useFlightInfo(name: string, dataContent: CommonValue[]) {
     }
   })
 
+  const proxyItem = {
+    label: '机场代理',
+    key: 'proxy',
+    getter: info => (info.proxy === 1 ? '是' : '否'),
+  }
+  onMounted(() => {
+    if (name.includes('International')) {
+      flightInfoItems.value[0].push(proxyItem)
+    }
+  })
+
   return {
     flightInfoItems,
     flightInfo,