Merge branch 'dev' into feat_system_g

src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -386,7 +386,7 @@ const handleCustomizeColumns = () => {
       model_name: 'Booking_Search'
     }
   }
-  CustomizeColumnsRef.value.openDialog(params, -153)
+  CustomizeColumnsRef.value.openDialog(params, -220)
 }
 // 定制表格
 const customizeColumns = async () => {

src/views/SystemMessage/src/components/SystemMessageDetail.vue

@@ -72,7 +72,6 @@ const handleIframeLoaded = () => {
 
 <template>
   <div class="system-message-detail" v-vloading="loading">
-    <!-- <el-button @click="handleIframeLoaded">测试</el-button> -->
     <div class="content" v-if="route.query.type !== 'feature'">
       <div class="header" v-if="notificationData.title">
         <div class="status-icon"></div>
@@ -107,7 +106,7 @@ const handleIframeLoaded = () => {
         :data="item"
       />
     </div>
-    <div class="content" v-else>
+    <div class="content" style="height: 100%" v-else>
       <div class="header" v-if="notificationData.title">
         <div class="status-icon"></div>
         <div class="title">{{ notificationData.title }}</div>
@@ -133,7 +132,6 @@ const handleIframeLoaded = () => {
   .content {
     margin: auto;
     width: 1000px;
-    height: 100%;
   }
   .notification-card {
     max-width: 800px;

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -464,7 +464,7 @@ const handleCustomizeColumns = () => {
       model_name: 'Ocean_Search'
     }
   }
-  CustomizeColumnsRef.value.openDialog(params, -153)
+  CustomizeColumnsRef.value.openDialog(params, -220)
 }
 
 // 定制表格