Elements-SY

modify

...@@ -56,6 +56,7 @@ export default { ...@@ -56,6 +56,7 @@ export default {
56 this.msgError(msg); 56 this.msgError(msg);
57 return; 57 return;
58 } 58 }
59 + let noDateRouteLists = data.routeList; // 只负责展示航线优先级
59 let noDateRouteList = data.routeList.filter( 60 let noDateRouteList = data.routeList.filter(
60 (item) => item.etesRule == "N" 61 (item) => item.etesRule == "N"
61 ); // 航班航线基本信息(过滤ET86航线的) 62 ); // 航班航线基本信息(过滤ET86航线的)
...@@ -77,6 +78,7 @@ export default { ...@@ -77,6 +78,7 @@ export default {
77 ); 78 );
78 resolve({ 79 resolve({
79 noDateConfigFlag, 80 noDateConfigFlag,
81 + noDateRouteLists,
80 noDateRouteList, 82 noDateRouteList,
81 mergeNoDateRouteInfo, 83 mergeNoDateRouteInfo,
82 }); 84 });
...@@ -94,6 +96,7 @@ export default { ...@@ -94,6 +96,7 @@ export default {
94 this.msgError(msg); 96 this.msgError(msg);
95 return; 97 return;
96 } 98 }
99 + let dateDataLists = data.routeList; // 只负责展示航线优先级
97 let dateRouteList = data.routeList.filter( 100 let dateRouteList = data.routeList.filter(
98 (item) => item.etesRule == "N" 101 (item) => item.etesRule == "N"
99 ); // 航班航线基本信息(过滤ET86航线的) 102 ); // 航班航线基本信息(过滤ET86航线的)
...@@ -121,6 +124,7 @@ export default { ...@@ -121,6 +124,7 @@ export default {
121 // 返回日期级别查询结果 124 // 返回日期级别查询结果
122 resolve({ 125 resolve({
123 dateConfigFlag, 126 dateConfigFlag,
127 + dateDataLists,
124 dateRouteList, 128 dateRouteList,
125 mergeDateRouteInfo, 129 mergeDateRouteInfo,
126 }); 130 });
...@@ -196,7 +200,12 @@ export default { ...@@ -196,7 +200,12 @@ export default {
196 // 拿到【接口调用和数据去重整合】的数据做数据页面显示处理:日期级别 200 // 拿到【接口调用和数据去重整合】的数据做数据页面显示处理:日期级别
197 dateLevelData({ dateParmas, noDateParmas }) { 201 dateLevelData({ dateParmas, noDateParmas }) {
198 this.dateLevelRoute(dateParmas).then((res) => { 202 this.dateLevelRoute(dateParmas).then((res) => {
199 - const { dateConfigFlag, dateRouteList, mergeDateRouteInfo } = res; 203 + const {
204 + dateConfigFlag,
205 + dateDataLists,
206 + dateRouteList,
207 + mergeDateRouteInfo,
208 + } = res;
200 if (dateConfigFlag) { 209 if (dateConfigFlag) {
201 // 日期级别当前航班航线配置没有缺省的,就不用再去查询非日期级别了 210 // 日期级别当前航班航线配置没有缺省的,就不用再去查询非日期级别了
202 // 处理属性 211 // 处理属性
...@@ -210,7 +219,7 @@ export default { ...@@ -210,7 +219,7 @@ export default {
210 this.setattrVal(item); // 设置属性值 219 this.setattrVal(item); // 设置属性值
211 } 220 }
212 }); 221 });
213 - this.routeList = dateRouteList; // 航班航线列表 222 + this.routeList = dateDataLists; // 航班航线列表
214 this.routesInfo = mergeDateRouteInfo; // 航班航线配置信息列表 223 this.routesInfo = mergeDateRouteInfo; // 航班航线配置信息列表
215 } 224 }
216 if (dateConfigFlag == false) { 225 if (dateConfigFlag == false) {
...@@ -223,12 +232,19 @@ export default { ...@@ -223,12 +232,19 @@ export default {
223 (item) => item.config == false 232 (item) => item.config == false
224 ); 233 );
225 this.noDateLevelRoute(noDateParmas).then( 234 this.noDateLevelRoute(noDateParmas).then(
226 - ({ noDateConfigFlag, noDateRouteList, mergeNoDateRouteInfo }) => { 235 + ({
236 + noDateConfigFlag,
237 + noDateRouteLists,
238 + noDateRouteList,
239 + mergeNoDateRouteInfo,
240 + }) => {
227 // 航班种类 241 // 航班种类
228 this.flightKindName({ 242 this.flightKindName({
229 noDateConfigFlag, 243 noDateConfigFlag,
244 + noDateRouteLists,
230 noDateRouteList, 245 noDateRouteList,
231 mergeNoDateRouteInfo, 246 mergeNoDateRouteInfo,
247 + dateDataLists,
232 dateRouteList, 248 dateRouteList,
233 dateListHas, 249 dateListHas,
234 dateListNo, 250 dateListNo,
...@@ -241,8 +257,10 @@ export default { ...@@ -241,8 +257,10 @@ export default {
241 // 航班种类 257 // 航班种类
242 flightKindName({ 258 flightKindName({
243 noDateConfigFlag, 259 noDateConfigFlag,
260 + noDateRouteLists,
244 noDateRouteList, 261 noDateRouteList,
245 mergeNoDateRouteInfo, 262 mergeNoDateRouteInfo,
263 + dateDataLists,
246 dateRouteList, 264 dateRouteList,
247 dateListHas, 265 dateListHas,
248 dateListNo, 266 dateListNo,
...@@ -251,7 +269,7 @@ export default { ...@@ -251,7 +269,7 @@ export default {
251 // White Tail只展示当前查询的一条 269 // White Tail只展示当前查询的一条
252 const route = this.$route.query.flightRouteListStr; 270 const route = this.$route.query.flightRouteListStr;
253 let noDateRouteInfo, result; 271 let noDateRouteInfo, result;
254 - this.routeList = dateRouteList; 272 + this.routeList = noDateRouteLists;
255 // 从日期取 273 // 从日期取
256 if (dateListHas.length) { 274 if (dateListHas.length) {
257 const dateRouteInfo = dateListHas.filter( 275 const dateRouteInfo = dateListHas.filter(
...@@ -307,7 +325,7 @@ export default { ...@@ -307,7 +325,7 @@ export default {
307 this.setattrVal(item); // 设置属性值 325 this.setattrVal(item); // 设置属性值
308 } 326 }
309 }); 327 });
310 - this.routeList = dateRouteList; 328 + this.routeList = dateDataLists;
311 this.routesInfo = dateList; 329 this.routesInfo = dateList;
312 } 330 }
313 }, 331 },
......