修改

public/config.js

@@ -21,6 +21,7 @@ window.SERVICE_ID = {
   bagViewId: 20036, //航班视图-基础信息
   changePwd: 20045, // 修改密码
   userColAuthId: 200227, //用户授权-列设置
+  containerId: 200238, //容器历史记录-容器历史
 
   /***-----高级查询------***/
   baggageTypeId: 86, //高级查询-特殊行李类型下拉选项查询-id

src/views/newContainer/index.vue

@@ -3,7 +3,7 @@
     <div class="newContainer-top">
       <div class="newContainer-top-title flex">
         <div class="manageTitle">容器基本信息</div>
-        <el-button size="small" type="primary">历史记录</el-button>
+        <el-button @click="toHistory" size="small" type="primary">历史记录</el-button>
       </div>
       <div class="newContainer-top-table">
         <el-row class="msgs-ds" :gutter="20">
@@ -92,6 +92,12 @@ export default {
         }
         this.detailsArr = datas
       }
+    },
+    toHistory () {
+      const { container_ID } = this.query
+      if (container_ID) {
+        this.$router.push({ path: '/newContainerHistory', query: { container_ID } })
+      }
     }
   }
 }

src/views/newContainerHistory/index.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="newContainerHistory flex">
+    <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="newContainerHistory-left">
+      <div class="newContainerHistory-left-top manageTitle">容器历史</div>
+      <div class="newContainerHistory-left-bottom">
+        <el-scrollbar style="height: 100%;">
+          <el-tree :data="dataTree" :props="defaultProps" highlight-current default-expand-all @node-click="handleNodeClick"></el-tree>
+        </el-scrollbar>
+      </div>
+    </div>
+    <div class="newContainerHistory-right flex1">
+      <Table :tableTag="tableTag" />
+    </div>
+  </div>
+</template>
+
+<script>
+import pf from '@/layout/mixin/publicFunc'
+import Table from '@/views/newQuery/components/table.vue'
+export default {
+  name: 'NewContainerHistory',
+  mixins: [pf],
+  components: { Table },
+  data () {
+    return {
+      query: '',
+      loading: false,
+      dataTree: [
+        {
+          label: '',
+          children: []
+        }
+      ],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      tableTag: {}
+    }
+  },
+  created () {
+    const { query } = this.$route
+    this.query = query
+  },
+  mounted () {
+    this.tableTag = this.query
+    this.getListTree()
+  },
+  methods: {
+    async getListTree () {
+      try {
+        this.loading = true
+        const { code, returnData } = await this.getQueryList(SERVICE_ID.containerId, this.query)
+        if (code == 0 && returnData && returnData.length) {
+          const datas = [...returnData]
+          datas.forEach(item => {
+            item.label = `${item.carrierFlights}-${item.carrierFlightsDate.replaceAll('-', '/')}-${item.outAirport}-${item.landAirport}`
+          })
+          this.dataTree[0].label = `容器历史-${this.query.container_ID}`
+          this.dataTree[0].children = datas
+          this.loading = false
+        }
+      } catch (error) {
+        console.log(error)
+        this.loading = false
+      }
+    },
+    handleNodeClick (data) {
+      console.log(data)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.newContainerHistory {
+  padding: 24px;
+  height: calc(100vh - 80px);
+  &-left {
+    width: 360px;
+    margin-right: 24px;
+    background-color: #fff;
+    &-bottom {
+      height: calc(100% - 30px);
+      padding: 12px;
+      ::v-deep .el-tree {
+        .el-tree-node__label {
+          font-size: 14px;
+          font-weight: 600;
+        }
+      }
+    }
+  }
+  &-right {
+    background-color: #fff;
+  }
+}
+</style>

src/views/newFlightView/index.vue

@@ -99,6 +99,26 @@ export default {
   async created () {
     const checkDatas = []
     const query = this.$route.query
+    if (query.inflightNo || query.inflightDate) {
+      query.carrierFlights = query.inflightNo
+      query.carrierFlightsDate = query.inflightDate
+    }
+    if (query.transferFlightNO || query.outflightDate) {
+      query.carrierFlights = query.inflightNo
+      query.carrierFlightsDate = query.outflightDate
+    }
+    if (query.Inbound_flight_number || query.Inbound_flight_date) {
+      query.carrierFlights = query.Inbound_flight_number
+      query.carrierFlightsDate = query.Inbound_flight_date
+    }
+    if (query.Inbound_flight_number || query.Inbound_flight_date) {
+      query.carrierFlights = query.Inbound_flight_number
+      query.carrierFlightsDate = query.Inbound_flight_date
+    }
+    if (query.departure_flights_number || query.departure_flights_date) {
+      query.carrierFlights = query.departure_flights_number
+      query.carrierFlightsDate = query.departure_flights_date
+    }
     const { carrierFlights, carrierFlightsDate } = query
     this.flightObj = query
     this.dataContent = query

src/views/newTable/index.vue

@@ -63,7 +63,7 @@
               </div>
               <div class="flex-wrap">
                 <el-form-item class="flex1 r40" label="数据源名称">
-                  <el-select size="small" v-model="form.datasource_id" placeholder="请选择数据源">
+                  <el-select size="small" v-model="form.datasource_id" clearable placeholder="请选择数据源">
                     <el-option v-for="(item,index) in dataSourceArrs" :key="index" :label="item.dataSourceName" :value="item.dataSourceID"></el-option>
                   </el-select>
                 </el-form-item>