From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
index 0e42fdb..cb60414 100644
--- a/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceScrap/FormDiaLog.vue
@@ -39,7 +39,7 @@
 					<div class="label">报废时间</div>
 					<div class="val">{{dayjs(formData.scrapTime).format('YYYY-MM-DD')}}</div>
 				</el-col>
-				<el-col :span="24">
+				<el-col :span="12">
 					<div class="label">报废原因</div>
 					<div class="val">{{ formData.scrapReason }}</div>
 				</el-col>

--
Gitblit v1.9.3