diff --git a/src/views/system/airspace/index.vue b/src/views/system/airspace/index.vue index 3d198e5..a45d46c 100644 --- a/src/views/system/airspace/index.vue +++ b/src/views/system/airspace/index.vue @@ -244,7 +244,7 @@ - + @@ -421,15 +421,17 @@ name: undefined }, rules: { - userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }], - nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], - password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }], - email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }], - phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] + name: [{ required: true, message: "飞行名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "飞行名称长度必须介于 2 和 20 之间", trigger: "blur" }], + taskProp: [{ required: true, message: "飞行性质不能为空", trigger: "blur" }], + uavInfoName: [{ required: true, message: "无人机不能为空", trigger: "blur" }], + airspaceName: [{ required: true, message: "申请空域不能为空", trigger: "blur" }], + uavOperatorName: [{ required: true, message: "操控员不能为空", trigger: "blur" }], + // email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }], + tel: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] } }); - const { queryParams, form, rules } = toRefs(data); + const { queryParams, form, rules, rules1} = toRefs(data); /** 通过条件过滤节点 */ const filterNode = (value, data) => { @@ -741,19 +743,21 @@ function submitForm() { const airUAVs = [] - - form.value.uavInfoName.forEach((item) => { - console.log("item的值为:",item) - - uavInfoOptions.value.forEach((iten) => { - console.log("iten的值为:",iten) - if(iten.value == item){ - airUAVs.push(iten.key) - console.log("airUAV:",airUAVs) - } - }); - // this.routeIds.push(item) - }); + if (form.value.uavInfoName) { + + form.value.uavInfoName.forEach((item) => { + console.log("item的值为:",item) + + uavInfoOptions.value.forEach((iten) => { + console.log("iten的值为:",iten) + if(iten.value == item){ + airUAVs.push(iten.key) + console.log("airUAV:",airUAVs) + } + }); + // this.routeIds.push(item) + }); + } // form.airUAV = airUAVs; form.value.airUAV = form.value.uavInfoName; console.log(" form.airUAV:",form.value.airUAV) @@ -784,4 +788,3 @@ getDeptTree(); getList(); - \ No newline at end of file diff --git a/src/views/system/airspace/index1.vue b/src/views/system/airspace/index1.vue index b6bd1ac..2b41dae 100644 --- a/src/views/system/airspace/index1.vue +++ b/src/views/system/airspace/index1.vue @@ -421,11 +421,13 @@ const data = reactive({ name: undefined }, rules: { - userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }], - nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], - password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }], - email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }], - phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] + name: [{ required: true, message: "飞行名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "飞行名称长度必须介于 2 和 20 之间", trigger: "blur" }], + taskProp: [{ required: true, message: "飞行性质不能为空", trigger: "blur" }], + uavInfoName: [{ required: true, message: "无人机不能为空", trigger: "blur" }], + airspaceName: [{ required: true, message: "申请空域不能为空", trigger: "blur" }], + uavOperatorName: [{ required: true, message: "操控员不能为空", trigger: "blur" }], + // email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }], + tel: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] } }); diff --git a/src/views/system/c_airspace/index.vue b/src/views/system/c_airspace/index.vue index b6bd1ac..59dacd6 100644 --- a/src/views/system/c_airspace/index.vue +++ b/src/views/system/c_airspace/index.vue @@ -421,11 +421,13 @@ const data = reactive({ name: undefined }, rules: { - userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }], - nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }], - password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }], - email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }], - phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] + name: [{ required: true, message: "飞行名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "飞行名称长度必须介于 2 和 20 之间", trigger: "blur" }], + taskProp: [{ required: true, message: "飞行性质不能为空", trigger: "blur" }], + uavInfoName: [{ required: true, message: "无人机不能为空", trigger: "blur" }], + airspaceName: [{ required: true, message: "申请空域不能为空", trigger: "blur" }], + uavOperatorName: [{ required: true, message: "操控员不能为空", trigger: "blur" }], + // email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }], + tel: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }] } }); @@ -449,7 +451,7 @@ function getDeptTree() { // 数据改变调用 function handleAirspaceNameChange (value) { - + const selectedDict = AirspaceNameOptions.value.find(dict => dict.label === value); console.log("selectedDict的值为:",selectedDict) if (selectedDict) { @@ -457,7 +459,7 @@ function handleAirspaceNameChange (value) { // dataForm.mngCode = selectedDict.label; // dataForm.mngName = selectedDict.value; console.log("handleAirspaceNameChange",value,selectedDict.value); - } + } }; function handleUavInfoChange (value) { console.log("uavInfoOptions.value",uavInfoOptions.value) @@ -470,7 +472,7 @@ function handleUavInfoChange (value) { form.airUAV = selectedDict.value.key; // dataForm.mngCode = selectedDict.label; // dataForm.mngName = selectedDict.value; - } + } }; function handleOperatorInfoChange (value) { console.log("飞手的变换") @@ -481,7 +483,7 @@ function handleOperatorInfoChange (value) { // dataForm.mngCode = selectedDict.label; // dataForm.mngName = selectedDict.value; console.log("handleOperatorInfoChange",value,selectedDict.value); - } + } };