From f925f12d5263c94644bddf6fd2ac3d23b77791cf Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 19 Jan 2026 14:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
index e9355b7..a12e136 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/DeviceScrapDiaLog.vue
@@ -4,17 +4,17 @@
 			<el-row>
 				<el-col :span="24">
 					<el-form-item label="报废原因" prop="scrapReason">
-						<el-input class="command-data-cockpit-search-input" v-model="formData.scrapReason" maxlength="200" type="textarea" placeholder="请输入" clearable />
+						<el-input class="command-search-input" v-model="formData.scrapReason" maxlength="200" type="textarea" placeholder="请输入" clearable />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
 					<el-form-item label="处置方式" prop="disposeWay">
-						<el-input class="command-data-cockpit-search-input" v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
+						<el-input class="command-search-input" v-model="formData.disposeWay" maxlength="200" type="textarea" placeholder="请输入" clearable />
 					</el-form-item>
 				</el-col>
 				<el-col :span="12">
 					<el-form-item label="报废时间" prop="scrapTime">
-						<el-date-picker class="command-data-cockpit-date-picker" popper-class="command-data-cockpit-date-picker-popper"
+						<el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
 							v-model="formData.scrapTime"
 							type="datetime"
 							placeholder="选择日期"

--
Gitblit v1.9.3