悬浮报文显示修改

src/views/baggageManagement/components/baggage/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-19 11:40:15
+ * @LastEditTime: 2022-05-19 14:09:07
  * @LastEditors: your name
  * @Description: 行李视图
 -->
@@ -97,7 +97,8 @@
     >
       <el-popover
         trigger="hover"
-        placement="top"
+        placement="top-start"
+        popper-class="popover-dark"
         :visible-arrow="false"
         :disabled="!messageTooltipVisible"
       >
@@ -112,7 +113,6 @@
           border
           stripe
           fit
-          show-overflow-tooltip
           :header-cell-class-name="cellClass"
           :header-cell-style="{ color: '#101116' }"
           :cell-class-name="cellClass"
@@ -126,6 +126,7 @@
             :label="item.name"
             :align="item.align || 'center'"
             :width="item.width"
+            show-overflow-tooltip
           >
             <template slot="header">
               <div
@@ -381,7 +382,7 @@ export default {
           name: '航班号',
           prop: 'flightNo'
         },
-        { name: '航班日期', prop: 'flightDate', width: 103 },
+        { name: '航班日期', prop: 'flightDate', width: 100 },
         {
           name: '起飞航站\n预计起飞时间',
           prop: 'departureAirport',
@@ -393,23 +394,23 @@ export default {
           sortable: 'custom',
           width: 111
         },
-        { name: '旅客仓位', prop: 'passengerCompartment' },
-        { name: '旅客座位号', prop: 'passengerSeatNumber', width: 101 },
-        { name: '值机序号', prop: 'passengerCheckInNumber' },
-        { name: '节点标识', prop: 'nodeCode', width: 102 },
+        { name: '旅客仓位', prop: 'passengerCompartment', width: 70 },
+        { name: '旅客座位号', prop: 'passengerSeatNumber' },
+        { name: '值机序号', prop: 'passengerCheckInNumber', width: 70 },
+        { name: '节点标识', prop: 'nodeCode', width: 100 },
         { name: '节点名称', prop: 'nodeName' },
         { name: '位置标识', prop: 'locationCode' },
         // { name: '位置码', prop: '',  },
         { name: '位置描述', prop: 'locationRemark' },
         { name: '读取时间', prop: 'dealTime', width: 158 },
         { name: '结果', prop: 'status' },
-        { name: '次级代码', prop: 'secondaryCode' },
-        { name: '操作人', prop: 'AgentCode' },
+        { name: '次级代码', prop: 'secondaryCode', width: 70 },
+        { name: '操作人', prop: 'AgentCode', width: 100 },
         { name: '设备ID', prop: 'DeviceCode' },
         { name: '发往位置', prop: 'toLocation' },
-        { name: '发往位置描述', prop: 'toLocationMark', width: 113 },
+        { name: '发往位置描述', prop: 'toLocationMark', width: 110 },
         { name: '装载序号', prop: 'LoadSN' },
-        { name: '容器编号', prop: 'U_Device_ID' }
+        { name: '容器编号', prop: 'U_Device_ID', width: 100 }
       ],
       baggageTableData: [],
       spanArr: [],
@@ -762,26 +763,32 @@ export default {
     ::v-deep .el-table {
       width: 100%;
       height: 100%;
-      .el-table__cell {
-        background: #f0f3f7;
-        padding: 0;
-      }
       &.el-table--striped {
         .el-table__body tr.el-table__row--striped td.el-table__cell,
         .el-table__header .el-table__cell {
           background: #ffffff;
         }
       }
-      .cell {
+      .el-table__cell {
+        background: #f0f3f7;
         padding: 0;
-        word-spacing: 0;
-        font-size: 14px;
-        font-family: Helvetica, 'Microsoft YaHei';
-        font-weight: 400;
-        color: #303133;
+        .cell {
+          padding: 0;
+          word-spacing: 0;
+          font-size: 14px;
+          font-family: Helvetica, 'Microsoft YaHei';
+          font-weight: 400;
+          color: #303133;
+          .cell-content {
+            padding: 6px 0;
+          }
+        }
+      }
+      .el-table__body .el-table__cell .cell {
+        padding: 6px 10px;
         .cell-content {
-          min-height: 35px;
-          padding: 6px 10px;
+          display: inline;
+          padding: 0;
         }
       }
     }
@@ -845,8 +852,15 @@ export default {
     }
   }
 }
+</style>
 
-.pre-line {
-  white-space: pre-line;
+<style lang="scss">
+.popover-dark {
+  background: #303133;
+  color: #ffffff;
+  border: none;
+  .pre-line {
+    white-space: pre-line;
+  }
 }
 </style>

src/views/baggageManagement/components/flight/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-17 10:39:22
- * @LastEditTime: 2022-05-18 17:07:25
+ * @LastEditTime: 2022-05-19 14:11:04
  * @LastEditors: your name
  * @Description: 航班视图
 -->
@@ -610,7 +610,7 @@ export default {
           item['sorting'] = `${item['sortLocationMark'] ?? ''}\n${item['sortDealTime'] ?? ''}`
           item['loading'] = `${item['loadLocationMark'] ?? ''}\n${item['loadDealTime'] ?? ''}`
           item['installed'] = `${item['inflLocationMark'] ?? ''}\n${item['inflLoadDealTime'] ?? ''}`
-          item['transitFlag'] = item['preFlightNO'] ? '是' : '否'
+          item['transitFlag'] = item['PreFlightNO'] ? '是' : '否'
           return item
         })
 

src/views/baggageManagement/mixins/terminal.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Badguy
  * @Date: 2022-03-04 11:41:55
- * @LastEditTime: 2022-05-19 09:07:37
+ * @LastEditTime: 2022-05-19 11:52:28
  * @LastEditors: your name
  * @Description: 航站视图通用部分
  * have a nice day!
@@ -161,7 +161,7 @@ export default {
           'inTransferBaggageCount',
           'tounLoad',
           'unLoad',
-          'checkNumber',
+          'checkInNumber',
           'unActive',
           'midIn',
           'noCheckInNumber'
@@ -190,7 +190,7 @@ export default {
           'inTransferBaggageCount',
           'tounLoad',
           'unLoad',
-          'checkNumber',
+          'checkInNumber',
           'unActive',
           'midIn',
           'noCheckInNumber'
@@ -254,7 +254,7 @@ export default {
             }
           })
           break
-        case 'checkNumber':
+        case 'checkInNumber':
           this.$router.push({
             path: '/advance',
             query: {