飞行器信息添加设备码

This commit is contained in:
hr121 2025-10-20 19:48:46 +08:00
parent 2d5a90da0f
commit 0dfee15bf7
2 changed files with 17 additions and 4 deletions

View File

@ -22,6 +22,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8">
<el-form-item label="设备码">
<el-input v-model="form.deviceCode" disabled />
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="类型"> <el-form-item label="类型">
<el-input v-model="form.useType" disabled /> <el-input v-model="form.useType" disabled />
@ -32,13 +37,13 @@
<el-input v-model="form.areaName" disabled /> <el-input v-model="form.areaName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="景区"> <el-form-item label="景区">
<el-input v-model="form.scenicName" disabled /> <el-input v-model="form.scenicName" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="负责人"> <el-form-item label="负责人">
<el-input v-model="form.username" disabled /> <el-input v-model="form.username" disabled />

View File

@ -90,6 +90,9 @@
<el-form-item label="型号" prop="model"> <el-form-item label="型号" prop="model">
<el-input v-model="form.model" style="width: 150px" /> <el-input v-model="form.model" style="width: 150px" />
</el-form-item> </el-form-item>
<el-form-item label="设备码" prop="deviceCode">
<el-input v-model="form.deviceCode" style="width: 150px" placeholder="请输入设备码" />
</el-form-item>
<el-form-item label="类型" prop="useType"> <el-form-item label="类型" prop="useType">
<el-select v-model="form.useType" style="width: 150px"> <el-select v-model="form.useType" style="width: 150px">
<el-option <el-option
@ -222,6 +225,7 @@
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column label="飞行器名称" prop="name" :formatter="commonFormatter" /> <el-table-column label="飞行器名称" prop="name" :formatter="commonFormatter" />
<el-table-column label="品牌" prop="brand" :formatter="brandFormatter" /> <el-table-column label="品牌" prop="brand" :formatter="brandFormatter" />
<el-table-column label="设备码" prop="deviceCode" :formatter="commonFormatter" />
<el-table-column label="型号" prop="model" :formatter="commonFormatter" /> <el-table-column label="型号" prop="model" :formatter="commonFormatter" />
<el-table-column label="类型" prop="useType"> <el-table-column label="类型" prop="useType">
<template slot-scope="scope"> <template slot-scope="scope">
@ -287,6 +291,7 @@ const defaultForm = {
scenicId: null, scenicId: null,
employeesId: null, employeesId: null,
deviceImages: [], deviceImages: [],
deviceCode: null,
remark: "", remark: "",
createTime: null, createTime: null,
}; };
@ -357,6 +362,9 @@ export default {
name: [ name: [
{ required: true, message: "请输入飞行器名称", trigger: "blur" }, { required: true, message: "请输入飞行器名称", trigger: "blur" },
], ],
deviceCode: [
{ required: true, message: "请输入设备码", trigger: "blur" }
],
brand: [{ required: true, message: "品牌不能为空", trigger: "blur" }], brand: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
model: [{ required: true, message: "请输入型号", trigger: "blur" }], model: [{ required: true, message: "请输入型号", trigger: "blur" }],
useType: [{ required: true, message: "请选择类型", trigger: "change" }], useType: [{ required: true, message: "请选择类型", trigger: "change" }],
@ -416,7 +424,7 @@ export default {
brandFormatter(row, column) { brandFormatter(row, column) {
try { try {
const brand = this.dict.aircraft_brand.find(item=>item.value===row[column.property]); const brand = this.dict.aircraft_brand.find(item=>item.value===row[column.property]);
return brand.label || '/' return brand.label || '/'
} catch (error) { } catch (error) {
return '/' return '/'
} }
@ -545,7 +553,7 @@ export default {
// //
Promise.all(detailPromises).then(async(detailedData) => { Promise.all(detailPromises).then(async(detailedData) => {
// usernamegetList() // usernamegetList()
await getList().then(({ content }) => { await getList().then(({ content }) => {
detailedData.forEach((item) => { detailedData.forEach((item) => {
if (item.employeesId) { if (item.employeesId) {
const empItem = content.find(employee => employee.id === item.employeesId); const empItem = content.find(employee => employee.id === item.employeesId);