Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

.gitignore

@@ -1,5 +1,6 @@
 # compiled output
 /dist
+/dist.rar
 /dist-ssr
 /node_modules
 

src/views/realTime/components/AirportView/useAirportTable.ts

@@ -121,14 +121,14 @@ const columnGroupsMap: {
           columnName: 'addCargoTime',
           columnLabel: '加货时间',
         },
-        {
-          columnName: 'wait',
-          columnLabel: '待运区\n(板卡/件)',
-        },
-        {
-          columnName: 'waitTime',
-          columnLabel: '待运区时间',
-        },
+        // {
+        //   columnName: 'wait',
+        //   columnLabel: '待运区\n(板卡/件)',
+        // },
+        // {
+        //   columnName: 'waitTime',
+        //   columnLabel: '待运区时间',
+        // },
         {
           columnName: 'stowage',
           columnLabel: '预配载\n(板卡/件)',
@@ -137,18 +137,18 @@ const columnGroupsMap: {
           columnName: 'stowageTime',
           columnLabel: '预配载时间',
         },
-        {
-          columnName: 'planJoinTime',
-          columnLabel: '计划交接\n时间',
-        },
-        {
-          columnName: 'requestDepotJoin',
-          columnLabel: '发起货站交接\n(板卡/件)',
-        },
-        {
-          columnName: 'requestDepotJoinTime',
-          columnLabel: '发起货站交接\n时间',
-        },
+        // {
+        //   columnName: 'planJoinTime',
+        //   columnLabel: '计划交接\n时间',
+        // },
+        // {
+        //   columnName: 'requestDepotJoin',
+        //   columnLabel: '发起货站交接\n(板卡/件)',
+        // },
+        // {
+        //   columnName: 'requestDepotJoinTime',
+        //   columnLabel: '发起货站交接\n时间',
+        // },
         {
           columnName: 'depotJoin',
           columnLabel: '货站交接\n(板卡/件)',

src/views/realTime/components/WaybillView/index.vue

@@ -136,18 +136,18 @@ const { trackAirlines, trackBoxStyle } = useTrackData(props.name, trackData)
 const tableData = computed(() =>
   trackData.value.reduce((data, current) => {
     const sameRow = data.find(row =>
-      ['subCode', 'flightNO', 'flightDate', 'stowageNo', 'CargoNo'].every(
+      ['stockCode', 'flightNO', 'flightDate', 'ULDNO', 'CargoSN'].every(
         key => row[key] === current[key]
       )
     )
     const {
-      subCode,
+      stockCode,
       flightNO,
       flightDate,
-      LoadingLocation, // 装载机场
-      UnloadingLocation, // 卸载机场
-      stowageNo,
-      CargoNo,
+      departureAirport, // 装载机场
+      arriveAirport, // 卸载机场
+      ULDNO,
+      CargoSN,
       pullMark,
       returnMark,
       transMark,
@@ -158,9 +158,9 @@ const tableData = computed(() =>
       execResult,
       execTime,
     } = current
-    const nodeValue = `${execPosition ?? ''}\n${execResult ?? ''}\n${
-      execTime ?? ''
-    }`
+    const nodeValue = `${execPosition ?? ''}\n${
+      execResult ? '通过' : '未通过'
+    }\n${execTime ?? ''}`
     if (sameRow) {
       sameRow[String(nodeCode)] = nodeValue
     } else {

src/views/realTime/hooks/useTable.ts

@@ -84,11 +84,11 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '集装器编号',
-      columnName: 'stowageNo',
+      columnName: 'ULDNO',
       width: 100,
       needFilters: 1,
     },
-    { columnLabel: '货物编码', columnName: 'CargoNo', needFilters: 1 },
+    { columnLabel: '货物编码', columnName: 'CargoSN', needFilters: 1 },
     { columnLabel: '拉下', columnName: 'pullMark', needFilters: 1, width: 60 },
     {
       columnLabel: '退运',
@@ -118,7 +118,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '加货',
-      columnName: 'ACC_BUP',
+      columnName: 'LS_CARGO',
       className: 'cell-filter cell-filter-green',
     },
     {
@@ -244,7 +244,7 @@ const tableColumnsMap: {
     },
     {
       columnLabel: '货物编码',
-      columnName: 'CargoNo',
+      columnName: 'CargoSN',
       width: 100,
       needFilters: 1,
     },

src/views/realTime/hooks/useTableCellClick.ts

@@ -33,12 +33,12 @@ export function useTableCellClick(tableName?: string) {
     }
     // if (tableName?.includes('WaybillGoods')) {
     //   switch (column.property) {
-    //     case 'CargoNo':
+    //     case 'CargoSN':
     //       router.push({
     //         path: `${route.path.split('/').slice(0, -1).join('/')}/goods`,
     //         query: {
     //           waybillNO: route.query.waybillNO,
-    //           goodsNO: row.CargoNo,
+    //           goodsNO: row.CargoSN,
     //         },
     //       })
     //       break

src/views/realTime/hooks/useTableStyle.ts

@@ -47,7 +47,7 @@ export function useTableStyle(tableName?: string) {
       }
     }
     // if (tableName?.includes('WaybillGoods')) {
-    //   if (['CargoNo'].includes(column.property)) {
+    //   if (['CargoSN'].includes(column.property)) {
     //     classes.push('cell-click')
     //   }
     // }

src/views/realTime/hooks/useTrackData.ts

@@ -35,7 +35,7 @@ const trackNodesMap = {
     },
     {
       name: '加货',
-      nodeCode: 'ACC_BUP',
+      nodeCode: 'LS_CARGO',
     },
     {
       name: '待运区',
@@ -107,8 +107,8 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
         {
           flightNO,
           flightDate,
-          LoadingLocation,
-          UnloadingLocation,
+          departureAirport,
+          arriveAirport,
           nodeCode,
           execPosition,
           ConsignmentItemPackagingQuantityQuantity,
@@ -128,7 +128,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           'DEH',
           'ACC_CHECK',
           '安检',
-          'ACC_BUP',
+          'LS_CARGO',
           'WAT_LOC',
           'CARGOS_DEP_ULD_HANDOVER',
           '出港货邮',
@@ -138,8 +138,8 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           'BILL_RETURN',
         ].includes(String(nodeCode))
         const airport = isDeparture
-          ? String(LoadingLocation ?? '')
-          : String(UnloadingLocation ?? '')
+          ? String(departureAirport ?? '')
+          : String(arriveAirport ?? '')
         const trackNode = {
           flag: Boolean(
             execPosition ||
@@ -150,7 +150,7 @@ export function useTrackData(name: string, trackData: MaybeRef<CommonData[]>) {
           descriptions: [
             String(execPosition ?? ''),
             String(ConsignmentItemPackagingQuantityQuantity ?? ''),
-            String(execResult ?? ''),
+            execResult ? '通过' : '未通过',
             String(execTime ?? '').split('T')[1] ?? '',
           ],
         }

src/views/userManagement/role/auth.vue

@@ -13,8 +13,8 @@
             </el-form-item>
             <el-form-item label="是否启用" prop="role_status">
               <el-radio-group disabled v-model="ruleForm.role_status">
-                <el-radio label="1">启用</el-radio>
-                <el-radio label="2"> 禁用</el-radio>
+                <el-radio :label="1">启用</el-radio>
+                <el-radio :label="2"> 禁用</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-form>