Elements-SY

modify

......@@ -25,8 +25,8 @@ export const formConfig = [
{
label: "航线",
type: "Input",
name: "flightRouteListStr",
prop: "flightRouteListStr",
name: "routesStr",
prop: "routesStr",
placeholder: "",
span: 6,
labelWidth: "40px",
......
......@@ -69,8 +69,7 @@ import {
enableOrDisable, // 开启/停用航线规则设置
batchUpdateOrAddFlight, // 航班航线优先级更新
queryRouteByFltNo, // 通过航班号查询航线
} from "@/api/destinationFlight";
// import { findAllFltDataApi } from "@/api/findAllFltData";
} from "@/api/destinationFlight"
import indexMixins from "../mixins";
export default {
components: {
......@@ -114,25 +113,17 @@ export default {
purposeOfFlightNo: this.$route.query.purposeOfFlightNo || "", // 航班号
flightDate: this.$route.query.flightDate || "", // 飞行日期
flightRouteListStr: this.$route.query.flightRouteListStr || "", // 飞行航线集合
routesStr: this.$route.query.routesStr || "", // 从航班信息维护查看维度过来作为接收回显
status: this.$route.query.status || "", // 状态:0 无效、1 有效、2 配置中、3 停用
dataStatus: this.$route.query.dataStatus || "", // add 、edit、view
flightKindName: this.$route.query.flightKindName || "", // 航班种类White Tail 、Purple Tail
pageName: this.$route.query.pageName || "", // flightAllocConfig、flightInformationMaintenance、flightRandConfig、dmLog
id: this.$route.query.id || "",
};
this.getAllDictData(); // 获取全部字典
// this.queryFindAllFltDataApi({
// fltNo: parmas.purposeOfFlightNo,
// fltDateEnd: parmas.flightDate,
// fltDateStart: parmas.flightDate,
// limitSize: 20,
// limitStart: 0,
// pageNum: 1,
// start: 0,
// }); // 通过航班号查询航线
this.queryForm = this.$route.query;
// 指定隐藏或显示From表单域
this.hiddenFormItem(parmas);
// queryCondition只负责接收参数和接口调用
// 只负责接收参数和接口调用
this.queryCondition(parmas);
},
mounted() {},
......
......@@ -95,12 +95,10 @@ 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,
......@@ -488,21 +486,8 @@ export default {
if (this.$route.query.flightKindName == "White Tail") {
// White Tail只展示当前查询的一条
const route = this.$route.query.flightRouteListStr;
let noDateRouteInfo, result, byFlightRouteListSort;
// byFlightRouteListSort = dateRouteList
// .filter((item2) => {
// return this.flightRouteList.some((item1) => {
// return item1.route === item2.route;
// });
// })
// .sort((a, b) => {
// return (
// this.flightRouteList.findIndex((item) => item.route === a.route) -
// this.flightRouteList.findIndex((item) => item.route === b.route)
// );
// });
let noDateRouteInfo, result;
this.routeList = dateRouteList;
// this.routeList = byFlightRouteListSort;
// 从日期取
if (dateListHas.length) {
const dateRouteInfo = dateListHas.filter(
......@@ -581,15 +566,12 @@ export default {
);
});
if (this.$route.query.flightKindName == "Purple Tail") {
let flightRouteListStr =
this.$route.query.flightRouteListStr.split(";"); // 跳转传过来的航线
let routesStr = this.$route.query.routesStr.split(";"); // 跳转传过来的航线
// 查找跳转传过来的对应的航线把包含的航线并且按照dateDataLists航线排序
let inRoutes = dateDataLists
.filter((item) => flightRouteListStr.includes(item.route))
.filter((item) => routesStr.includes(item.route))
.sort(
(a, b) =>
flightRouteListStr.indexOf(a.route) -
flightRouteListStr.indexOf(b.route)
(a, b) => routesStr.indexOf(a.route) - routesStr.indexOf(b.route)
);
// 处理航线优先级展示ET86
let routes = [];
......@@ -601,24 +583,7 @@ export default {
}
});
// 把处理ET86航线优先级展示
this.queryForm.flightRouteListStr = routes.join(";");
// // 跳转传过来的对应的航线把ET86航线的过滤掉
// let noEtesRoutes = inRoutes.filter((item) => item.etesRule == "N");
// let noRoutes = dateList.filter((item) => {
// return noEtesRoutes.some((el) => el.route === item.route);
// });
// const result = noRoutes
// .filter((item2) => {
// return noEtesRoutes.some((item1) => {
// return item1.route === item2.route;
// });
// })
// .sort((a, b) => {
// return (
// noEtesRoutes.findIndex((item) => item.route === a.route) -
// noEtesRoutes.findIndex((item) => item.route === b.route)
// );
// });
this.queryForm.routesStr = routes.join(";");
// this.defaultRouteData(result) // 默认航线配置信息数据;
this.routeList = dateRouteList; // 航线优先级
this.routesInfo = dateList;
......
......@@ -283,6 +283,7 @@ export default {
flightDate: flightDate,
purposeOfFlightNo: actualFlight,
flightRouteListStr: route,
routesStr: route,
status: "",
pageName: "flightRandConfig",
disable: true,
......
......@@ -1347,6 +1347,7 @@ export default {
flightDate: row.fltDate,
purposeOfFlightNo: row.fltNo,
flightRouteListStr: row.route,
routesStr: row.route,
status: row.status,
flightKindName: row.flightKindName,
pageName: "flightInformationMaintenance",
......
......@@ -279,6 +279,7 @@ export default {
purposeOfFlightNo: row.flightFltNo,
flightDate: row.flightFltDate,
flightRouteListStr: row.currentFlightRoute,
routesStr: row.currentFlightRoute,
pageName: "dmLog",
disable: true,
},
......