Elements-SY

modify

......@@ -377,9 +377,15 @@
:value="item.route"
>
<span style="float: left">{{ item.route }}</span>
<span style="float: right; margin-right: 30px; color: #8492a6; font-size: 13px">{{
item.isEtesRoute == 'Y' ? '(ET86)' : ''
}}</span>
<span
style="
float: right;
margin-right: 30px;
color: #8492a6;
font-size: 13px;
"
>{{ item.isEtesRoute == "Y" ? "(ET86)" : "" }}</span
>
</el-option>
</el-select>
<el-select
......@@ -402,9 +408,15 @@
:value="item.route"
>
<span style="float: left">{{ item.route }}</span>
<span style="float: right; margin-right: 30px; color: #8492a6; font-size: 13px">{{
item.isEtesRoute == 'Y' ? '(ET86)' : ''
}}</span>
<span
style="
float: right;
margin-right: 30px;
color: #8492a6;
font-size: 13px;
"
>{{ item.isEtesRoute == "Y" ? "(ET86)" : "" }}</span
>
</el-option>
</el-select>
<span
......@@ -825,6 +837,7 @@ export default {
//shift键状态
shiftKey: false,
routeError: false, // 请选择航线错误显示
routes: [],
};
},
directives: {
......@@ -1256,6 +1269,19 @@ export default {
}
});
},
compareArrays(arr1, arr2) {
for (let i = 0; i < arr1.length; i++) {
if (!arr2.includes(arr1[i])) {
return true;
}
}
for (let i = 0; i < arr2.length; i++) {
if (!arr1.includes(arr2[i])) {
return true;
}
}
return false;
},
/*
查看航班维度
不仅分为航班种类又分当前航班航线是不是ET86,
......@@ -1277,6 +1303,7 @@ export default {
isEtesRoute: false,
fltRoute: "",
};
// 本次判断跳转只是对接口的,并没有对勾选的取
queryRoute(params)
.then((res) => {
const { code, data } = res;
......@@ -1307,6 +1334,12 @@ export default {
);
routeInfo.isEtesRoute = whiteEt86.length;
}
}else{
// console.log(row)
// console.log(row.route.split(";"))
// console.log(et86RouteList)
// routeInfo.isEtesRoute = this.compareArrays(et86RouteList, row.route.split(";"));
// console.log(routeInfo.isEtesRoute)
}
} else {
this.msgError("暂无当前航班航线");
......
......@@ -3,7 +3,7 @@ export default {
data() {
return {
ursaError: "", // URSA包含校验提示语
notUrsaError: "", // URSA包含校验提示语
notUrsaError: "", // URSA包含校验提示语
validateForm: true, // form表单节流阀
};
},
......@@ -110,7 +110,19 @@ export default {
}
}
},
// 不包含
// Ursa校验
validateUrsa(ursaMark, ursa) {
let ursaList = ursa.split(";").filter((str) => str !== "");
let repeat = new Set(ursaList).size !== ursaList.length;
let inUrsa = ursaList.every((item) => /^[a-zA-Z][0-9]*_$/.test(item));
const ursaInfo = {
ursaMark: ursaMark, // ursa包含/不包含
ursa: ursaList,
repeat: repeat,
inUrsa: inUrsa,
};
},
// 包含
includeUrsa() {
// 分隔字符串并且转数组&去除数组空字符串
let inUrsa = this.queryForm.includeUrsa
......@@ -120,7 +132,6 @@ export default {
if (repeat) {
this.ursaError = "填写的Ursa已重复";
this.validateForm = false;
this.msgError("填写的Ursa已重复");
} else {
this.ursaError = "";
this.validateForm = true;
......@@ -135,7 +146,9 @@ export default {
this.ursaError = "";
this.validateForm = true;
}
console.log("包含:", this.validateForm);
},
// 不包含
notIncludeUrsa() {
// 分隔字符串并且转数组&去除数组空字符串
......@@ -160,6 +173,7 @@ export default {
this.notUrsaError = "";
this.validateForm = true;
}
console.log("不包含:", this.validateForm);
},
},
};
......