From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/applications/drone-command/src/views/basicManage/deviceStock/index.vue b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
index b598892..b2fdf81 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/index.vue
+++ b/applications/drone-command/src/views/basicManage/deviceStock/index.vue
@@ -70,7 +70,7 @@
 
 		<div class="ztzf-table-toolbar">
 			<el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
-			<el-button :icon="Download" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
+			<el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
 			<!--			<el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>-->
 		</div>
 
@@ -155,7 +155,7 @@
 	size: 10, // 每页大小
 })
 const searchParams = ref(initSearchParams()) // 查询参数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
 const list = ref([]) // 列表数据
 const total = ref(0) // 总数
 const selectedIds = ref([]) // 勾选的设备ID列表

--
Gitblit v1.9.3