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

src/views/baggageManagement/components/container/index.vue

@@ -1,7 +1,14 @@
 <template>
   <div class="container-view">
     <div v-loading="treeLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-left">
-      <el-tree :data="containerHistoryTree" :props="defaultTreeProps" node-key="index" default-expand-all :expand-on-click-node="false" @current-change="currentChangeHandler" />
+      <el-tree :data="containerHistoryTree" :props="defaultTreeProps" node-key="index" default-expand-all :expand-on-click-node="false" @current-change="currentChangeHandler" >
+        <span class="custom-tree-node" slot-scope="{ node, data }">
+          <el-tooltip class="item" effect="dark" :content="msg" placement="top" v-if="data.index==-1">
+            <span>{{ node.label }}</span>
+          </el-tooltip>
+          <span v-else>{{ node.label }}</span>
+        </span>
+      </el-tree>
     </div>
     <div v-loading="tableLoading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)" class="container-right">
 
@@ -116,7 +123,9 @@ export default {
       tableData: [],
       tableDataFilters: {},
       filterValues: {},
-      tableDataSortRules: {}
+      tableDataSortRules: {},
+      containerNO:"",
+      msg:"容器历史默认显示最近10条历史，如果需要可联系管理员进行配置"
     }
   },
   computed: {
@@ -125,7 +134,7 @@ export default {
       return [
         {
           index: -1,
-          label: '容器历史',
+          label: '容器历史'+'-'+this.containerNO,
           children: this.containerHistory.map(({ flightNO, flightDate, departureAirport, arriveAirport }, index) => ({
             index,
             label: [flightNO, flightDate.replaceAll('-', '/'), departureAirport, arriveAirport].join('-')
@@ -162,9 +171,11 @@ export default {
       handler ({ path, query }) {
         if (path.includes('containerView')) {
           const { containerID } = query
+          this.containerNO = containerID;
           if (containerID) {
             const { containerID: oldContainerID } = this.queryData
             if (containerID !== oldContainerID) {
+              this.containerNO = containerID;
               this.queryData = { containerID }
               this.queryContainerHistory([containerID])
             }
@@ -326,6 +337,7 @@ export default {
       try {
         const result = await myQuery(DATACONTENT_ID.containerHistory, ...dataContent)
         this.containerHistory = result
+        this.msg = "容器历史默认显示最近"+this.containerHistory[0].k+"条历史，如果需要可联系管理员进行配置"
       } catch (error) {
 
       }

src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -24,10 +24,6 @@
             <el-col :span="6">
               <div class="aviName">
                 <span class="aviP">航司二字码</span>
-                <!-- <el-input
-                  v-model="tableFormer.IATACode"
-                  placeholder="请输入航司二字码"
-                ></el-input> -->
                 <el-select
                   v-model="tableFormer.IATACode"
                   class="input-shadow"
@@ -63,10 +59,6 @@
                     :value="item.planDepartureApt"
                   />
                 </el-select>
-                <!-- <el-input
-                  v-model="tableFormer.departmentAirport"
-                  placeholder="请输入起飞机场"
-                ></el-input> -->
               </div>
             </el-col>
             <el-col :span="6">
@@ -87,10 +79,6 @@
                     :value="item.planDepartureApt"
                   />
                 </el-select>
-                <!-- <el-input
-                  v-model="tableFormer.landingAirport"
-                  placeholder="请输入起飞机场"
-                ></el-input> -->
               </div>
             </el-col>
             <el-col :span="6">
@@ -315,9 +303,9 @@
                     >
                       <el-option
                         v-for="item in tableOptions[item.columnName]"
-                        :key="item.v"
-                        :label="item.k"
-                        :value="item.v"
+                        :key="item.v ? item.v : item.planDepartureApt"
+                        :label="item.k ? item.k : item.planDepartureApt"
+                        :value="item.v ? item.v : item.planDepartureApt"
                       >
                       </el-option>
                     </el-select>
@@ -487,6 +475,7 @@ export default {
       dataContent: [],
       tableCols: [],
       tableColsCopy: [],
+      tableColsCopys: [],
       tableForm: {}, //弹框表单
       width: "560px",
       flag: false,
@@ -537,7 +526,6 @@ export default {
         arr.push(this.$route.query.id);
         const { code, returnData } = await Query({
           id: DATACONTENT_ID.sysServiceWarnId,
-          needPage: ++this.page,
           dataContent: arr,
         });
         if (code == 0) {

src/views/systemSettings/views/warningSet/warningSet.vue

@@ -78,9 +78,9 @@
                     >
                       <el-option
                         v-for="item in tableOptions[item.columnName]"
-                        :key="item.v"
-                        :label="item.k"
-                        :value="item.v"
+                        :key="item.v ? item.v : item.planDepartureApt"
+                        :label="item.k ? item.k : item.planDepartureApt"
+                        :value="item.v ? item.v : item.planDepartureApt"
                       >
                       </el-option>
                     </el-select>
@@ -416,7 +416,6 @@ export default {
     handleAdd() {
       this.flag = true;
       this.tableType = "add";
-      this.getAirPortData();
     },
     //获取航司信息列表
     async getAirlines() {