Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Fedex
/
imac-vue
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Elements-SY
2023-10-22 21:20:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a4e4a9396c8b0e6ea99a79165d08afcb5e85f9bc
a4e4a939
1 parent
c4dd778c
modify
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
20 deletions
src/views/allocationConfig/flightAllocConfig/mixins/index.js
src/views/basicInformation/flightInformationMaintenance/index.vue
src/views/allocationConfig/flightAllocConfig/mixins/index.js
View file @
a4e4a93
...
...
@@ -566,27 +566,8 @@ export default {
);
});
if
(
this
.
$route
.
query
.
flightKindName
==
"Purple Tail"
)
{
let
routesStr
=
this
.
$route
.
query
.
routesStr
.
split
(
";"
);
// 跳转传过来的航线
// 查找跳转传过来的对应的航线把包含的航线并且按照dateDataLists航线排序
let
inRoutes
=
dateDataLists
.
filter
((
item
)
=>
routesStr
.
includes
(
item
.
route
))
.
sort
(
(
a
,
b
)
=>
routesStr
.
indexOf
(
a
.
route
)
-
routesStr
.
indexOf
(
b
.
route
)
);
// 处理航线优先级展示ET86
let
routes
=
[];
dateDataLists
.
map
((
item
,
i
,
arr
)
=>
{
if
(
arr
[
i
].
etesRule
==
"Y"
)
{
routes
.
push
(
`
${
arr
[
i
].
route
}
(ET86)`
);
}
else
{
routes
.
push
(
arr
[
i
].
route
);
}
});
// 把处理ET86航线优先级展示
this
.
queryForm
.
routesStr
=
routes
.
join
(
";"
);
// this.defaultRouteData(result) // 默认航线配置信息数据;
this
.
routeList
=
dateRouteList
;
// 航线优先级
console
.
log
(
dateList
);
this
.
routesInfo
=
dateList
;
this
.
pageLoading
=
false
;
}
else
{
...
...
src/views/basicInformation/flightInformationMaintenance/index.vue
View file @
a4e4a93
...
...
@@ -1341,13 +1341,29 @@ export default {
);
return;
}
queryRouteByFltNo({ fltNo: row.fltNo })
.then((res) => {
const { code, data, msg } = res;
if (code === 200) {
if (data.list.length) {
let include = data.list.filter((item) =>
row.route.split(";").some((val) => val == item.route)
); // 查询已被勾选的
let routes = [];
include.map((item, i, arr) => {
if (arr[i].isEtesRoute == "Y") {
routes.push(`${arr[i].route}(ET86)`);
} else {
routes.push(arr[i].route);
}
});
this.$router.push({
path: "/routeInfo",
query: {
flightDate: row.fltDate,
purposeOfFlightNo: row.fltNo,
flightRouteListStr: row.route,
routesStr: row.route
,
routesStr: routes.join(";")
,
status: row.status,
flightKindName: row.flightKindName,
pageName: "flightInformationMaintenance",
...
...
@@ -1355,6 +1371,17 @@ export default {
},
});
}
if (data.list.length == 0) {
this.msgError("该航班没有设置航线");
}
} else {
this.msgWarning(res.msg);
}
})
.catch((err) => {
console.log(err);
});
}
})
.catch(() => {});
},
...
...
Please
register
or
login
to post a comment