modify

Elements-SY
Commit 58ae9ddc251eb219a607eb76a37ef849a29388a3 58ae9ddc 1 parent 78e95c8a
Showing 2 changed files with 46 additions and 47 deletions
src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
src/views/allocationConfig/flightAllocConfig/mixins/index.js
--- a/src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
View file @58ae9dd
+++ b/src/views/allocationConfig/flightAllocConfig/flightRouteInfo/index.vue
View file @58ae9dd
@@ -70,7 +70,7 @@ import {
   batchUpdateOrAddFlight, // 航班航线优先级更新
   queryRouteByFltNo, // 通过航班号查询航线
 } from "@/api/destinationFlight";
-import { findAllFltDataApi } from "@/api/findAllFltData";
+// import { findAllFltDataApi } from "@/api/findAllFltData";
 import indexMixins from "../mixins";
 export default {
   components: {
@@ -109,7 +109,6 @@ export default {
     判断有日期的找到了就走有日期的，如果日期级别的没有找到再去走一次普通级别的接口
   */
   created() {
-    // console.log(this.$route.query.flightRouteListStr);
     const parmas = {
       querySpecifyData: this.$route.query.querySpecifyData || "", // 查询特殊数据字段 1、2
       purposeOfFlightNo: this.$route.query.purposeOfFlightNo || "", // 航班号
@@ -122,15 +121,15 @@ export default {
       id: this.$route.query.id || "",
     };
     this.getAllDictData(); // 获取全部字典
-    this.queryFindAllFltDataApi({
+    // this.queryFindAllFltDataApi({
-      fltNo: parmas.purposeOfFlightNo,
+    //   fltNo: parmas.purposeOfFlightNo,
-      fltDateEnd: parmas.flightDate,
+    //   fltDateEnd: parmas.flightDate,
-      fltDateStart: parmas.flightDate,
+    //   fltDateStart: parmas.flightDate,
-      limitSize: 20,
+    //   limitSize: 20,
-      limitStart: 0,
+    //   limitStart: 0,
-      pageNum: 1,
+    //   pageNum: 1,
-      start: 0,
+    //   start: 0,
-    }); // 通过航班号查询航线
+    // }); // 通过航班号查询航线
     // 指定隐藏或显示From表单域
     this.hiddenFormItem(parmas);
     // queryCondition只负责接收参数和接口调用
--- a/src/views/allocationConfig/flightAllocConfig/mixins/index.js
View file @58ae9dd
+++ b/src/views/allocationConfig/flightAllocConfig/mixins/index.js
View file @58ae9dd
@@ -95,29 +95,30 @@ export default {
           queryParmas: function () {
             // 非日期级别
             if (parmas.querySpecifyData == "2") {
+              _this.queryForm = _this.$route.query; // 获取跳转过来的参数
               _this.noDateLevelData(this.noDateParmas);
             }
             // 日期级别
             if (parmas.querySpecifyData == "1") {
+              _this.queryForm = _this.$route.query; // 获取跳转过来的参数
               _this.dateLevelData({
                 dateParmas: this.dateParmas,
                 noDateParmas: this.noDateParmas,
               });
             }
-            _this.queryForm = _this.$route.query; // 获取跳转过来的参数
           },
         },
         // 航班信息维护
         flightInformationMaintenance: {
           noDateParmas: {
             purposeOfFlightNo: parmas.purposeOfFlightNo,
-            flightRouteListStr: parmas.flightRouteListStr,
+            flightRouteListStr: this.$route.query.flightRouteListStr,
             status: "",
           },
           dateParmas: {
             purposeOfFlightNo: parmas.purposeOfFlightNo,
             flightDate: parmas.flightDate,
-            flightRouteListStr: parmas.flightRouteListStr,
+            flightRouteListStr: this.$route.query.flightRouteListStr,
             status: "",
           },
           queryParmas: function () {
@@ -488,20 +489,20 @@ export default {
         // White Tail只展示当前查询的一条
         const route = this.$route.query.flightRouteListStr;
         let noDateRouteInfo, result, byFlightRouteListSort;
-        byFlightRouteListSort = dateRouteList
+        // byFlightRouteListSort = dateRouteList
-          .filter((item2) => {
+        //   .filter((item2) => {
-            return this.flightRouteList.some((item1) => {
+        //     return this.flightRouteList.some((item1) => {
-              return item1.route === item2.route;
+        //       return item1.route === item2.route;
-            });
+        //     });
-          })
+        //   })
-          .sort((a, b) => {
+        //   .sort((a, b) => {
-            return (
+        //     return (
-              this.flightRouteList.findIndex((item) => item.route === a.route) -
+        //       this.flightRouteList.findIndex((item) => item.route === a.route) -
-              this.flightRouteList.findIndex((item) => item.route === b.route)
+        //       this.flightRouteList.findIndex((item) => item.route === b.route)
-            );
+        //     );
-          });
+        //   });
-        // this.routeList = dateRouteList;
+        this.routeList = dateRouteList;
-        this.routeList = byFlightRouteListSort;
+        // this.routeList = byFlightRouteListSort;
         // 从日期取
         if (dateListHas.length) {
           const dateRouteInfo = dateListHas.filter(
@@ -601,27 +602,26 @@ export default {
           });
           // 把处理ET86航线优先级展示
           this.queryForm.flightRouteListStr = routes.join(";");
-          // console.log(this.queryForm);
+          // // 跳转传过来的对应的航线把ET86航线的过滤掉
-          // 跳转传过来的对应的航线把ET86航线的过滤掉
+          // let noEtesRoutes = inRoutes.filter((item) => item.etesRule == "N");
-          let noEtesRoutes = inRoutes.filter((item) => item.etesRule == "N");
+          // let noRoutes = dateList.filter((item) => {
-          let noRoutes = dateList.filter((item) => {
+          //   return noEtesRoutes.some((el) => el.route === item.route);
-            return noEtesRoutes.some((el) => el.route === item.route);
+          // });
-          });
+          // const result = noRoutes
-          const result = noRoutes
+          //   .filter((item2) => {
-            .filter((item2) => {
+          //     return noEtesRoutes.some((item1) => {
-              return noEtesRoutes.some((item1) => {
+          //       return item1.route === item2.route;
-                return item1.route === item2.route;
+          //     });
-              });
+          //   })
-            })
+          //   .sort((a, b) => {
-            .sort((a, b) => {
+          //     return (
-              return (
+          //       noEtesRoutes.findIndex((item) => item.route === a.route) -
-                noEtesRoutes.findIndex((item) => item.route === a.route) -
+          //       noEtesRoutes.findIndex((item) => item.route === b.route)
-                noEtesRoutes.findIndex((item) => item.route === b.route)
+          //     );
-              );
+          //   });
-            });
           // this.defaultRouteData(result) // 默认航线配置信息数据;
           this.routeList = dateRouteList; // 航线优先级
-          this.routesInfo = result;
+          this.routesInfo = dateList;
           this.pageLoading = false;
         } else {
           this.routeList = dateRouteList; // 航线优先级