Elements-SY

modify

...@@ -377,9 +377,15 @@ ...@@ -377,9 +377,15 @@
377 :value="item.route" 377 :value="item.route"
378 > 378 >
379 <span style="float: left">{{ item.route }}</span> 379 <span style="float: left">{{ item.route }}</span>
380 - <span style="float: right; margin-right: 30px; color: #8492a6; font-size: 13px">{{ 380 + <span
381 - item.isEtesRoute == 'Y' ? '(ET86)' : '' 381 + style="
382 - }}</span> 382 + float: right;
383 + margin-right: 30px;
384 + color: #8492a6;
385 + font-size: 13px;
386 + "
387 + >{{ item.isEtesRoute == "Y" ? "(ET86)" : "" }}</span
388 + >
383 </el-option> 389 </el-option>
384 </el-select> 390 </el-select>
385 <el-select 391 <el-select
...@@ -402,9 +408,15 @@ ...@@ -402,9 +408,15 @@
402 :value="item.route" 408 :value="item.route"
403 > 409 >
404 <span style="float: left">{{ item.route }}</span> 410 <span style="float: left">{{ item.route }}</span>
405 - <span style="float: right; margin-right: 30px; color: #8492a6; font-size: 13px">{{ 411 + <span
406 - item.isEtesRoute == 'Y' ? '(ET86)' : '' 412 + style="
407 - }}</span> 413 + float: right;
414 + margin-right: 30px;
415 + color: #8492a6;
416 + font-size: 13px;
417 + "
418 + >{{ item.isEtesRoute == "Y" ? "(ET86)" : "" }}</span
419 + >
408 </el-option> 420 </el-option>
409 </el-select> 421 </el-select>
410 <span 422 <span
...@@ -825,6 +837,7 @@ export default { ...@@ -825,6 +837,7 @@ export default {
825 //shift键状态 837 //shift键状态
826 shiftKey: false, 838 shiftKey: false,
827 routeError: false, // 请选择航线错误显示 839 routeError: false, // 请选择航线错误显示
840 + routes: [],
828 }; 841 };
829 }, 842 },
830 directives: { 843 directives: {
...@@ -1256,6 +1269,19 @@ export default { ...@@ -1256,6 +1269,19 @@ export default {
1256 } 1269 }
1257 }); 1270 });
1258 }, 1271 },
1272 + compareArrays(arr1, arr2) {
1273 + for (let i = 0; i < arr1.length; i++) {
1274 + if (!arr2.includes(arr1[i])) {
1275 + return true;
1276 + }
1277 + }
1278 + for (let i = 0; i < arr2.length; i++) {
1279 + if (!arr1.includes(arr2[i])) {
1280 + return true;
1281 + }
1282 + }
1283 + return false;
1284 + },
1259 /* 1285 /*
1260 查看航班维度 1286 查看航班维度
1261 不仅分为航班种类又分当前航班航线是不是ET86, 1287 不仅分为航班种类又分当前航班航线是不是ET86,
...@@ -1277,6 +1303,7 @@ export default { ...@@ -1277,6 +1303,7 @@ export default {
1277 isEtesRoute: false, 1303 isEtesRoute: false,
1278 fltRoute: "", 1304 fltRoute: "",
1279 }; 1305 };
1306 + // 本次判断跳转只是对接口的,并没有对勾选的取
1280 queryRoute(params) 1307 queryRoute(params)
1281 .then((res) => { 1308 .then((res) => {
1282 const { code, data } = res; 1309 const { code, data } = res;
...@@ -1307,6 +1334,12 @@ export default { ...@@ -1307,6 +1334,12 @@ export default {
1307 ); 1334 );
1308 routeInfo.isEtesRoute = whiteEt86.length; 1335 routeInfo.isEtesRoute = whiteEt86.length;
1309 } 1336 }
1337 + }else{
1338 + // console.log(row)
1339 + // console.log(row.route.split(";"))
1340 + // console.log(et86RouteList)
1341 + // routeInfo.isEtesRoute = this.compareArrays(et86RouteList, row.route.split(";"));
1342 + // console.log(routeInfo.isEtesRoute)
1310 } 1343 }
1311 } else { 1344 } else {
1312 this.msgError("暂无当前航班航线"); 1345 this.msgError("暂无当前航班航线");
......
...@@ -3,7 +3,7 @@ export default { ...@@ -3,7 +3,7 @@ export default {
3 data() { 3 data() {
4 return { 4 return {
5 ursaError: "", // URSA包含校验提示语 5 ursaError: "", // URSA包含校验提示语
6 - notUrsaError: "", // URSA包含校验提示语 6 + notUrsaError: "", // URSA包含校验提示语
7 validateForm: true, // form表单节流阀 7 validateForm: true, // form表单节流阀
8 }; 8 };
9 }, 9 },
...@@ -110,7 +110,19 @@ export default { ...@@ -110,7 +110,19 @@ export default {
110 } 110 }
111 } 111 }
112 }, 112 },
113 - // 不包含 113 + // Ursa校验
114 + validateUrsa(ursaMark, ursa) {
115 + let ursaList = ursa.split(";").filter((str) => str !== "");
116 + let repeat = new Set(ursaList).size !== ursaList.length;
117 + let inUrsa = ursaList.every((item) => /^[a-zA-Z][0-9]*_$/.test(item));
118 + const ursaInfo = {
119 + ursaMark: ursaMark, // ursa包含/不包含
120 + ursa: ursaList,
121 + repeat: repeat,
122 + inUrsa: inUrsa,
123 + };
124 + },
125 + // 包含
114 includeUrsa() { 126 includeUrsa() {
115 // 分隔字符串并且转数组&去除数组空字符串 127 // 分隔字符串并且转数组&去除数组空字符串
116 let inUrsa = this.queryForm.includeUrsa 128 let inUrsa = this.queryForm.includeUrsa
...@@ -120,7 +132,6 @@ export default { ...@@ -120,7 +132,6 @@ export default {
120 if (repeat) { 132 if (repeat) {
121 this.ursaError = "填写的Ursa已重复"; 133 this.ursaError = "填写的Ursa已重复";
122 this.validateForm = false; 134 this.validateForm = false;
123 - this.msgError("填写的Ursa已重复");
124 } else { 135 } else {
125 this.ursaError = ""; 136 this.ursaError = "";
126 this.validateForm = true; 137 this.validateForm = true;
...@@ -135,7 +146,9 @@ export default { ...@@ -135,7 +146,9 @@ export default {
135 this.ursaError = ""; 146 this.ursaError = "";
136 this.validateForm = true; 147 this.validateForm = true;
137 } 148 }
149 + console.log("包含:", this.validateForm);
138 }, 150 },
151 +
139 // 不包含 152 // 不包含
140 notIncludeUrsa() { 153 notIncludeUrsa() {
141 // 分隔字符串并且转数组&去除数组空字符串 154 // 分隔字符串并且转数组&去除数组空字符串
...@@ -160,6 +173,7 @@ export default { ...@@ -160,6 +173,7 @@ export default {
160 this.notUrsaError = ""; 173 this.notUrsaError = "";
161 this.validateForm = true; 174 this.validateForm = true;
162 } 175 }
176 + console.log("不包含:", this.validateForm);
163 }, 177 },
164 }, 178 },
165 }; 179 };
......