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

src/layout/components/NavBarTop/index.vue

@@ -5,7 +5,7 @@
         <el-avatar class="appNav-avatar" :size="25" :src="imgUrl" @error="errorHandler">
           <img src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" />
         </el-avatar>
-        <span class="appNav-name">名称</span>
+        <span class="appNav-name">深圳机场货运一个码系统-管理端</span>
       </div>
       <div class="appNav-right">
         <el-avatar class="appNav-avatar" :size="25" :src="imgUrl" @error="errorHandler">

src/router/routes/routes-file-six.ts

@@ -20,6 +20,7 @@ const ActualTimeRoutes = {
       redirect: '/realTime/departure/airport',
       meta: {
         title: '国内出港',
+        breadcrumb: false,
         roles: ['view_of_domestic_departure_termina_page'],
       },
       component: {
@@ -31,7 +32,6 @@ const ActualTimeRoutes = {
           name: 'DepartureAirport',
           meta: {
             title: '国内出港航站视图',
-            breadcrumb: false,
           },
           component: {
             render: () => h(resolveComponent('router-view')),

src/views/BasicsData/containerMaintenance/index.vue

@@ -4,7 +4,7 @@
       <Minheader :is-auth="true" :is-statuser="true" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
-            <div class="manageTitle">容器维护</div>
+            <div class="manageTitle">容器类型维护</div>
           </div>
         </template></Minheader
       >
@@ -140,7 +140,7 @@ const tableBtnGroup = ref([
 ]);
 //新增
 const addForm = () => {
-  msgTitle.value = "新增容器维护";
+  msgTitle.value = "新增类型维护";
   flag.value = true;
   type.value = "";
   tableForm.event = 1;
@@ -156,7 +156,7 @@ const resetForm = () => {
 };
 //编辑
 const editDialog = (data) => {
-  msgTitle.value = "编辑容器维护";
+  msgTitle.value = "编辑容器类型维护";
   flag.value = true;
   type.value = "";
   tableForm.name = data.name;
@@ -165,7 +165,7 @@ const editDialog = (data) => {
 };
 //删除
 const eleDialog = () => {
-  msgTitle.value = "删除容器维护";
+  msgTitle.value = "删除容器类型维护";
   flag.value = true;
   type.value = "del";
 };
@@ -180,7 +180,7 @@ const delRest = () => {
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
-    msgTitle.value = "编辑容器维护";
+    msgTitle.value = "编辑容器类型维护";
     flag.value = true;
     type.value = "";
     tableForm.event = 2;
@@ -190,7 +190,7 @@ const btnClick = (row, index, param) => {
     tableForm.containerDesc = index.containerDesc;
     tableForm.containerUnit = index.containerUnit;
   } else if (param === 3) {
-    msgTitle.value = "删除容器维护";
+    msgTitle.value = "删除容器类型维护";
     flag.value = true;
     type.value = "del";
     tableForm.event = 3;

src/views/realTime/components/AirportView/index.scss

@@ -33,7 +33,7 @@
       .el-table-v2__header-cell,
       .el-table-v2__row-cell {
         padding: 0;
-        &:not(:last-child) {
+        &:not(:last-of-type) {
           border-right: 1px solid #dfe3ea;
         }
       }

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

@@ -14,12 +14,18 @@
         />
       </div>
       <div class="airport-settings">
-        <CommonSwitch v-model:flag="goodsCountFlag" label="显示件数" />
-        <CommonSwitch v-model:flag="UTCFlag" label="开启UTC" />
-        <ColumnSet
-          :table-columns="tableColumns"
-          @checked-submit="columnChecked"
-        />
+        <div v-permission="getPermission('count')">
+          <CommonSwitch v-model:flag="goodsCountFlag" label="显示件数" />
+        </div>
+        <div v-permission="getPermission('UTC')">
+          <CommonSwitch v-model:flag="UTCFlag" label="开启UTC" />
+        </div>
+        <div v-permission="getPermission('columnSet')">
+          <ColumnSet
+            :table-columns="tableColumns"
+            @checked-submit="columnChecked"
+          />
+        </div>
       </div>
     </div>
     <div class="airport-table">
@@ -129,6 +135,36 @@ const {
   tableDataSortRuleMap,
   dealedTableData,
 } = useTableFilterAndSort(tableColumns, tableData)
+
+const permissionMap = {
+  DepartureAirport: {
+    count:
+      'number_of_pieces_displayed_in_domestic_departure_terminal_view_button',
+    UTC: 'turn_on_utc_in_view_of_domestic_departure_terminal_button',
+    columnSet: 'domestic_departure_terminal_view_column_setting_button',
+  },
+  InternationalDepartureAirport: {
+    count:
+      'number_of_pieces_displayed_in_international_departure_terminal_view_button',
+    UTC: 'international_departure_terminal_view_opens_utc_button',
+    columnSet: 'international_departure_terminal_view_column_setting_button',
+  },
+  ArrivalAirport: {
+    count:
+      'number_of_pieces_displayed_in_domestic_inbound_terminal_view_button',
+    UTC: 'turn_on_utc_in_view_of_domestic_inbound_terminal_button',
+    columnSet: 'domestic_inbound_terminal_view_column_setting_button',
+  },
+  InternationalArrivalAirport: {
+    count:
+      'number_of_display_pieces_of_international_inbound_terminal_view_button',
+    UTC: 'the_view_of_international_inbound_terminal_opens_utc_button',
+    columnSet: 'view_column_setting_of_international_inbound_terminal_button',
+  },
+}
+const getPermission = (type?: string) => {
+  return [permissionMap[props.name][type]]
+}
 </script>
 <style lang="scss" scoped>
 @import './index.scss';

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

@@ -1,10 +1,16 @@
 import { Query } from '@/api/webApi'
 import { CommonData, CommonTableColumn } from '~/common'
 
+interface SimpleColumn {
+  columnName: string
+  columnLabel: string
+  [x: string]: any
+}
+
 const columnGroupsMap: {
   [x: string]: {
     groupName: string
-    children: { columnName: string; columnLabel: string; [x: string]: any }[]
+    children: SimpleColumn[]
   }[]
 } = {
   departure: [
@@ -19,10 +25,12 @@ const columnGroupsMap: {
         {
           columnName: 'flightDate',
           columnLabel: '执飞日期',
+          width: 73,
         },
         {
           columnName: 'planDepartureTime',
           columnLabel: '起飞时间',
+          width: 73,
         },
         {
           columnName: 'landingAirport',
@@ -40,6 +48,7 @@ const columnGroupsMap: {
         {
           columnName: 'planLandingTime',
           columnLabel: '实际降落\n时间',
+          width: 73,
         },
       ],
     },
@@ -326,22 +335,23 @@ const simulateTableDataMap = {
 }
 const headerClassMap = ['bg-yellow', 'bg-green', 'bg-cyan']
 
-const computedWidth = (text: string) => {
+const computedWidth = (column: SimpleColumn) => {
   let width = 0
-  text.split('\n').forEach(line => {
+  column.columnLabel.split('\n').forEach(line => {
     const len = line.length
     let realLength = 0
     for (let i = 0; i < len; i++) {
       realLength += line.charCodeAt(i) > 255 ? 2 : 1
     }
-    if (width < realLength * 8) {
-      width = realLength * 8
+    if (width < (realLength + 2) * 6) {
+      width = (realLength + 2) * 6
     }
   })
-  if (['航班号', '目的站'].includes(text)) {
-    width += 8
+  if (column.needFilters || column.needSort) {
+    width += 6
   }
-  return width
+  // border
+  return width + 1
 }
 
 export default function useAirportTable(name: string, formData: CommonData) {
@@ -369,7 +379,7 @@ export default function useAirportTable(name: string, formData: CommonData) {
             orderNumber: null,
             queryTemplateColumnSetID: null,
             queryTemplateID: null,
-            width: computedWidth(column.columnLabel),
+            width: computedWidth(column),
             flexGrow: 1,
             align: 'center',
             headerClass: headerClassMap[groupIndex],

src/views/realTime/trackMap/index.vue

@@ -13,6 +13,7 @@
           @clear="clearHandler"
         />
         <el-button
+          v-permission="['waybill_query_button']"
           class="search-button"
           size="default"
           type="primary"