From 0dfee15bf74cdc02d4d213e2a61ce05eb05cc4f4 Mon Sep 17 00:00:00 2001
From: hr121 <568127468@qq.com>
Date: Mon, 20 Oct 2025 19:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E5=99=A8=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft/aircraftDetail/components/BasicInfo.vue |  9 +++++++--
 src/views/aircraft/index.vue                         | 12 ++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/aircraft/aircraftDetail/components/BasicInfo.vue b/src/views/aircraft/aircraftDetail/components/BasicInfo.vue
index cffead5..3152636 100644
--- a/src/views/aircraft/aircraftDetail/components/BasicInfo.vue
+++ b/src/views/aircraft/aircraftDetail/components/BasicInfo.vue
@@ -22,6 +22,11 @@
         </el-col>
       </el-row>
       <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-form-item label="类型">
             <el-input v-model="form.useType" disabled />
@@ -32,13 +37,13 @@
             <el-input v-model="form.areaName" disabled />
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="景区">
             <el-input v-model="form.scenicName" disabled />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="负责人">
             <el-input v-model="form.username" disabled />
diff --git a/src/views/aircraft/index.vue b/src/views/aircraft/index.vue
index baeb1f9..16ba3dc 100644
--- a/src/views/aircraft/index.vue
+++ b/src/views/aircraft/index.vue
@@ -90,6 +90,9 @@
         <el-form-item label="型号" prop="model">
           <el-input v-model="form.model" style="width: 150px" />
         </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-select v-model="form.useType" style="width: 150px">
             <el-option
@@ -222,6 +225,7 @@
       <el-table-column type="selection" width="55" />
       <el-table-column label="飞行器名称" prop="name" :formatter="commonFormatter" />
       <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="useType">
         <template slot-scope="scope">
@@ -287,6 +291,7 @@ const defaultForm = {
   scenicId: null,
   employeesId: null,
   deviceImages: [],
+  deviceCode: null,
   remark: "",
   createTime: null,
 };
@@ -357,6 +362,9 @@ export default {
         name: [
           { required: true, message: "请输入飞行器名称", trigger: "blur" },
         ],
+        deviceCode: [
+          { required: true, message: "请输入设备码", trigger: "blur" }
+        ],
         brand: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
         model: [{ required: true, message: "请输入型号", trigger: "blur" }],
         useType: [{ required: true, message: "请选择类型", trigger: "change" }],
@@ -416,7 +424,7 @@ export default {
     brandFormatter(row, column) {
       try {
         const brand = this.dict.aircraft_brand.find(item=>item.value===row[column.property]);
-        return brand.label || '/' 
+        return brand.label || '/'
       } catch (error) {
         return '/'
       }
@@ -545,7 +553,7 @@ export default {
           // 等待所有详情请求完成后再更新数据
           Promise.all(detailPromises).then(async(detailedData) => {
             // username字段需要通过getList()获取
-            await getList().then(({ content }) => { 
+            await getList().then(({ content }) => {
               detailedData.forEach((item) => {
                 if (item.employeesId) {
                   const empItem = content.find(employee => employee.id === item.employeesId);