From 76aa654cdeb49dba79f7fa551dc95f1ad7c06df6 Mon Sep 17 00:00:00 2001
From: yangsy <ysy@ittc.sh.cn>
Date: Thu, 25 Dec 2025 14:10:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=80=BB=E8=BE=91=E4=B8=AD=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84loading=E7=8A=B6=E6=80=81=E5=92=8C?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=BB=E8=BE=91=E7=9A=84=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/device/use-device-management.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/composables/device/use-device-management.ts b/src/composables/device/use-device-management.ts
index 6545b0a..18e5483 100644
--- a/src/composables/device/use-device-management.ts
+++ b/src/composables/device/use-device-management.ts
@@ -48,8 +48,8 @@ export const useDeviceManagement = () => {
       downloadByData(data, `${stationName}_${deviceTypeName}列表_${time}.xlsx`);
     },
     onError: (error) => {
-      if (isCancel(error)) return;
       window.$loadingBar.error();
+      if (isCancel(error)) return;
       console.error(error);
       const errorFeedback = parseErrorFeedback(error);
       window.$message.error(errorFeedback);
@@ -84,8 +84,8 @@ export const useDeviceManagement = () => {
       downloadByData(data, `${stationName}_${deviceTypeName}导入模板_${time}.xlsx`);
     },
     onError: (error) => {
-      if (isCancel(error)) return;
       window.$loadingBar.error();
+      if (isCancel(error)) return;
       console.error(error);
       const errorFeedback = parseErrorFeedback(error);
       window.$message.error(errorFeedback);
@@ -137,8 +137,8 @@ export const useDeviceManagement = () => {
       }
     },
     onError: (error) => {
-      if (isCancel(error)) return;
       window.$loadingBar.error();
+      if (isCancel(error)) return;
       console.error(error);
       const errorFeedback = parseErrorFeedback(error);
       window.$message.error(errorFeedback);
@@ -163,8 +163,8 @@ export const useDeviceManagement = () => {
       }
     },
     onError: (error) => {
-      if (isCancel(error)) return;
       window.$loadingBar.error();
+      if (isCancel(error)) return;
       console.error(error);
       const errorFeedback = parseErrorFeedback(error);
       window.$message.error(errorFeedback);