1

src/views/system/securityCheck/components/securityCheckTableWaybill.vue

@@ -28,7 +28,7 @@ export default {
   props: {
     height: {
       type: [Number, String],
-      default: '40vh',
+      default: '50vh',
     },
     tableCols: {
       type: Array,

src/views/system/securityCheck/views/cargoRelevanceTable.vue

@@ -56,7 +56,7 @@ export default {
               query: {
                 startTime: this.FormData.beginDate,
                 endTime: this.FormData.endDate,
-                destination: row.flightLine,
+                destination: row.flightLine == '合计' ? '' : row.flightLine,
                 agentCode: this.FormData.proxyId,
                 riskRating: '',
                 openResult: '',
@@ -79,7 +79,7 @@ export default {
                   query: {
                     startTime: this.FormData.beginDate,
                     endTime: this.FormData.endDate,
-                    destination: row.flightLine,
+                    destination: row.flightLine == '合计' ? '' : row.flightLine,
                     agentCode: this.FormData.proxyId,
                     openResult: '',
                     riskRating: '普通',
@@ -109,7 +109,7 @@ export default {
                   query: {
                     startTime: this.FormData.beginDate,
                     endTime: this.FormData.endDate,
-                    destination: row.flightLine,
+                    destination: row.flightLine == '合计' ? '' : row.flightLine,
                     agentCode: this.FormData.proxyId,
                     openResult: '',
                     riskRating: '严控',
@@ -141,7 +141,7 @@ export default {
                   query: {
                     startTime: this.FormData.beginDate,
                     endTime: this.FormData.endDate,
-                    destination: row.flightLine,
+                    destination: row.flightLine == '合计' ? '' : row.flightLine,
                     agentCode: this.FormData.proxyId,
                     openResult: '',
                     riskRating: '低风险',
@@ -174,7 +174,7 @@ export default {
                   query: {
                     startTime: this.FormData.beginDate,
                     endTime: this.FormData.endDate,
-                    destination: row.flightLine,
+                    destination: row.flightLine == '合计' ? '' : row.flightLine,
                     agentCode: this.FormData.proxyId,
                     openResult: '',
                     riskRating: '优先',
@@ -207,7 +207,7 @@ export default {
                   query: {
                     startTime: this.FormData.beginDate,
                     endTime: this.FormData.endDate,
-                    destination: row.flightLine,
+                    destination: row.flightLine == '合计' ? '' : row.flightLine,
                     agentCode: this.FormData.proxyId,
                     openResult: '',
                     riskRating: '高风险',

src/views/system/securityCheck/views/waybillTable.vue

@@ -46,7 +46,7 @@ export default {
           return `共${total}条`
         },
       },
-      tableHeight: '50vh',
+      tableHeight: '600px',
       tableCols: [
         {
           dataIndex: 'waybillNo',
@@ -141,14 +141,12 @@ export default {
       tableData: [],
     }
   },
-  created() {
-    
-  },
+  created() {},
   mounted() {
     this.setTableHeight()
     window.addEventListener('resize', this.setTableHeight)
   },
-  activated(){
+  activated() {
     let queryData = this.$route.query
     const {
       waybillNo,
@@ -188,7 +186,7 @@ export default {
       const topBarHeight = 80
       const headerHeight = this.$refs['tableWrapperHeader'].offsetHeight
       const footerBlackHeight = 24
-      this.tableHeight = `calc(100vh - ${topBarHeight + headerHeight + footerBlackHeight}px)`
+      this.tableHeight = `calc(100vh - ${topBarHeight + headerHeight + footerBlackHeight}px - 20px)`
     },
     async getData() {
       try {