修改

public/staticConfig.js

@@ -40,6 +40,14 @@ switch (baseNewUrl) {
       hasStaticRoutes: true,
     }
     break
+  case '10.211.67.163':
+    PLATFROM_CONFIG = {
+      ...PLATFROM_CONFIG,
+      baseNewUrl: 'http://10.211.67.163:8883',
+      baseURLCA: 'http://10.211.67.163:8883',
+      hasStaticRoutes: true,
+    }
+    break
   case '10.199.7.20':
     PLATFROM_CONFIG = {
       ...PLATFROM_CONFIG,

src/layout/components/Navbar.vue

@@ -4,12 +4,12 @@
     <!-- <breadcrumb class="breadcrumb-container" /> -->
     <div class="navbar_top">
       <div class="nav_left">
-        <div class="log_icon">
+        <!-- <div class="log_icon">
           <el-avatar :size="24" :src="imgSrc" @error="errorHandler">
             <img src="@/assets/logo/error.png" />
           </el-avatar>
-        </div>
-        <div class="dividing"></div>
+        </div> -->
+        <!-- <div class="dividing"></div> -->
         <div class="log_name">{{ pageTitle }}</div>
       </div>
       <div class="right-menu">
@@ -28,11 +28,7 @@
             </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button
-          class="btn-help"
-          plain
-          @click="downFile"
-        >帮助</el-button>
+        <el-button class="btn-help" plain @click="downFile">帮助</el-button>
         <!-- <div class="seting">
           <span @click="toSystem" class="img-icon"></span>
         </div> -->
@@ -125,9 +121,9 @@ export default {
     downFile () {
       const a = document.createElement('a')
       // 给a标签的href属性值加上地址,注意:这里是绝对路径,不用加 点.
-      a.href = './国航行李全流程跟踪数据系统-用户使用手册V2.1.pdf'
+      a.href = './行李全流程跟踪数据系统-用户使用手册V2.1.docx'
       // 设置下载文件文件名,这里加上.xlsx指定文件类型,pdf文件就指定.fpd即可
-      a.download = '国航行李全流程跟踪数据系统-用户使用手册V2.1.pdf'
+      a.download = '行李全流程跟踪数据系统-用户使用手册V2.1.docx'
       // 障眼法藏起来a标签
       a.style.display = 'none'
       // 将a标签追加到文档对象中
@@ -136,7 +132,7 @@ export default {
       a.click()
       // 一次性的,用完就删除a标签
       a.remove()
-      // window.location.href = './国航行李全流程跟踪数据系统-用户使用手册V2.1.pdf'
+      // window.location.href = './行李全流程跟踪数据系统-用户使用手册V2.1.pdf'
     },
     goBackHandler (item) {
       return item.parent?.path

src/views/login/index.vue

@@ -2,9 +2,9 @@
   <div class="login-container">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
       <div class="title-container flex-wrap">
-        <el-avatar :size="36" :src="imgSrc" @error="errorHandler">
+        <!-- <el-avatar :size="36" :src="imgSrc" @error="errorHandler">
           <img src="@/assets/logo/error.png" />
-        </el-avatar>
+        </el-avatar> -->
         <!-- <el-divider direction="vertical"></el-divider> -->
         <div class="content-box">
           <div class="title">{{ pageTitle }}</div>

src/views/newContainerHistory/index.vue

@@ -9,7 +9,7 @@
       </div>
     </div>
     <div class="newContainerHistory-right flex1">
-      <Table :tableTag="tableTag" />
+      <Table :tableTag="tableTag" :pageSize="9999" />
     </div>
   </div>
 </template>
@@ -43,7 +43,6 @@ export default {
     this.query = query
   },
   mounted () {
-    this.tableTag = this.query
     this.getListTree()
   },
   methods: {
@@ -54,7 +53,7 @@ export default {
         if (code == 0 && returnData && returnData.length) {
           const datas = [...returnData]
           datas.forEach(item => {
-            item.label = `${item.carrierFlights}-${item.carrierFlightsDate.replaceAll('-', '/')}-${item.outAirport}-${item.landAirport}`
+            item.label = `${item.carrierFlights}-${item.carrierFlightsDate.replaceAll('-', '/')}-${item.outAirport}-${item.landAirport}-${item.luggageType}`
           })
           this.dataTree[0].label = `容器历史-${this.query.container_ID}`
           this.dataTree[0].children = datas
@@ -66,7 +65,8 @@ export default {
       }
     },
     handleNodeClick (data) {
-      console.log(data)
+      const { carrierFlights, carrierFlightsDate, landAirport, outAirport, luggageType, container_ID } = data
+      this.tableTag = { carrierFlights, carrierFlightsDate, landAirport, outAirport, luggageType, container_ID }
     }
   }
 }

src/views/newFlightView/index.vue

@@ -253,9 +253,23 @@ export default {
       this.selectedFilter = [value]
     }
     const { carrierFlights, carrierFlightsDate } = nq
-    this.flightObj = nq
-    this.dataContent = nq
+    // this.flightObj = nq
+    // this.dataContent = nq
     const res = await this.getViewInfo(nq)
+    //2023-9-19新增
+    if (nq.landAirport && nq.outAirport) {
+      this.flightObj = nq
+      this.dataContent = nq
+    } else {
+      const { outAirport, landAirport } = res[0]
+      const nqObj = {
+        outAirport,
+        landAirport
+      }
+      this.flightObj = Object.assign(nq, nqObj)
+      this.dataContent = Object.assign(nq, nqObj)
+    }
+    //2023-9-19新增结束
     this.infoObj = res[0]
     const sts = await this.getViewInfo({ carrierFlights, carrierFlightsDate })
     if (sts && sts.length) {
@@ -287,11 +301,14 @@ export default {
         this.checkList = [`${outAirport}-${landAirport}`]
       }
     }
-  },
-  mounted () {
+    //2023-9-19新增
     this.table1 = this.dataContent
     this.table2 = this.dataContent
   },
+  // mounted () {
+  //   this.table1 = this.dataContent
+  //   this.table2 = this.dataContent
+  // },
   methods: {
     //格式化参数-航班号
     formatParams (arr = [], query = {}) {