Переглянути джерело

实时视图-字号12px->14px

zhongxiaoyu 2 роки тому
батько
коміт
dbbd45eb60

+ 2 - 2
src/components/steps/index.vue

@@ -77,8 +77,8 @@ const props = defineProps({
         display: flex;
         flex-direction: column;
         &-list {
-          font-size: 12px;
-          font-family: Microsoft YaHei;
+          // font-size: 12px;
+          font-family: DIN, Microsoft YaHei;
           font-weight: 400;
           color: #101116;
           margin-top: 8px;

+ 6 - 7
src/views/realTime/components/AirportView/index.scss

@@ -29,13 +29,12 @@
     // height: calc(100% - 32px - 16px - 60px);
     height: calc(100% - 32px - 16px);
     :deep(.el-table) {
-      .el-table__cell {
-        .cell,
-        &::after {
-          font-size: 12px;
-          // font-weight: bold;
-        }
-      }
+      // .el-table__cell {
+      //   .cell,
+      //   &::after {
+      //     font-size: 12px;
+      //   }
+      // }
       .el-table__header {
         .el-table__cell {
           &.bg-yellow {

+ 17 - 8
src/views/realTime/components/AirportView/useAirportTable.ts

@@ -84,7 +84,7 @@ const columnGroupsMap: {
           columnName: 'jiahuo',
           columnLabel: '一个码标记',
           needCount: 1,
-          countMode: 'notNull'
+          countMode: 'notNull',
         },
       ],
     },
@@ -657,43 +657,52 @@ const columnGroupsMap: {
           columnName: 'IATACode',
           columnLabel: '航司',
           needFilters: 1,
+          fixed: true,
         },
         {
           columnName: 'flightNO',
           columnLabel: '航班号',
           needFilters: 1,
+          fixed: true,
         },
         {
           columnName: 'flightDate',
           columnLabel: '执飞日期',
+          fixed: true,
         },
         {
           columnName: 'planLandingTime',
           columnLabel: '计划降落\n时间',
+          fixed: true,
         },
         {
           columnName: 'acLandingTime',
           columnLabel: '实际降落\n时间',
+          fixed: true,
         },
         {
           columnName: 'target',
           columnLabel: '航程',
           width: 100,
           needFilters: 1,
+          fixed: true,
         },
         {
           columnName: 'planeType',
           columnLabel: '机型',
           needFilters: 1,
+          fixed: true,
         },
         {
           columnName: 'flightType',
           columnLabel: '航班类型',
           needFilters: 1,
+          fixed: true,
         },
         {
           columnName: 'landingStand',
           columnLabel: '停机位',
+          fixed: true,
         },
         {
           columnName: 'speCargoInfo',
@@ -757,7 +766,6 @@ const columnGroupsMap: {
         {
           columnName: 'tally',
           columnLabel: '理货\n(板卡/运单/件/重量)',
-          width: 120,
         },
         {
           columnName: 'tallyTime_in',
@@ -809,15 +817,15 @@ const computedWidth = (column: SimpleColumn) => {
     for (let i = 0; i < len; i++) {
       realLength += line.charCodeAt(i) > 255 ? 2 : 1
     }
-    if (width < realLength * 8) {
-      width = realLength * 8
+    if (width < realLength * 9) {
+      width = realLength * 9
     }
   })
   // 筛选/排序按钮宽度
   // if (column.needFilters || column.needSort) {
   //   width += 8
   // }
-  width += 8
+  width += 9
   // border
   return width + 1
 }
@@ -847,9 +855,10 @@ export function useAirportTable(name: string, formData: CommonData) {
             orderNumber: null,
             queryTemplateColumnSetID: null,
             queryTemplateID: null,
-            width: name.includes('Departure')
-              ? computedWidth(column)
-              : undefined,
+            width:
+              name.includes('Departure') || name.includes('International')
+                ? computedWidth(column)
+                : undefined,
             flexGrow: 1,
             align: 'center',
             labelClassName: headerClassMap[group.groupName] ?? '',