Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
c842a716 2 parents 3af4dd38 a5e018df

Merge branch 'et86-black' into uat

Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
...@@ -222,9 +222,10 @@ export default { ...@@ -222,9 +222,10 @@ export default {
222 return; 222 return;
223 } 223 }
224 let noDateRouteLists = data.routeList; // 只负责展示航线优先级 224 let noDateRouteLists = data.routeList; // 只负责展示航线优先级
225 + // 航班航线基本信息(过滤ET86航线的)
225 let noDateRouteList = data.routeList.filter( 226 let noDateRouteList = data.routeList.filter(
226 (item) => item.etesRule == "N" 227 (item) => item.etesRule == "N"
227 - ); // 航班航线基本信息(过滤ET86航线的) 228 + );
228 // 普通级别航班航线维度规则详情 229 // 普通级别航班航线维度规则详情
229 const noDateDataList = removeDuplicates(data.list, { 230 const noDateDataList = removeDuplicates(data.list, {
230 duplicate: "flightRoute", // 去重字段 231 duplicate: "flightRoute", // 去重字段
...@@ -269,9 +270,10 @@ export default { ...@@ -269,9 +270,10 @@ export default {
269 return; 270 return;
270 } 271 }
271 let dateDataLists = data.routeList; // 只负责展示航线优先级 272 let dateDataLists = data.routeList; // 只负责展示航线优先级
273 + // 航班航线基本信息(过滤ET86航线的)
272 let dateRouteList = data.routeList.filter( 274 let dateRouteList = data.routeList.filter(
273 (item) => item.etesRule == "N" 275 (item) => item.etesRule == "N"
274 - ); // 航班航线基本信息(过滤ET86航线的) 276 + );
275 // 日期级别航班航线维度规则详情 277 // 日期级别航班航线维度规则详情
276 const dateDataList = removeDuplicates(data.list, { 278 const dateDataList = removeDuplicates(data.list, {
277 duplicate: "flightRoute", // 去重字段 279 duplicate: "flightRoute", // 去重字段
......