From f95cf00ee081d9958e7cd3b43294e1a3e57bdfe9 Mon Sep 17 00:00:00 2001
From: njdaoyehu <vmuser!>
Date: Tue, 26 Nov 2024 17:35:13 +0800
Subject: [PATCH] fixed

---
 index.html                      |  2 +-
 src/views/dashboard/index.vue   |  6 ++++++
 src/views/data/device/index.vue |  6 +++++-
 src/views/data/task/index.vue   | 16 +++++++++-------
 src/views/system/log/index.vue  |  5 +++++
 src/views/system/user/index.vue |  6 +++++-
 6 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/index.html b/index.html
index 67316e2..f874e05 100644
--- a/index.html
+++ b/index.html
@@ -151,7 +151,7 @@
       </style>
       <div class="app-loading">
         <div class="app-loading-wrap">
-          <img src="<%= VITE_PUBLIC_PATH %>logo.png" class="app-loading-logo" alt="Logo" />
+<!--          <img src="<%= VITE_PUBLIC_PATH %>logo.png" class="app-loading-logo" alt="Logo" />-->
 <!--          <div class="app-loading-dots">-->
 <!--            <span class="dot dot-spin"><i></i><i></i><i></i><i></i></span>-->
 <!--          </div>-->
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index ab88699..fb9c2c3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,7 +4,13 @@
   </div>
 </template>
 <script lang="ts" setup>
+  import {onMounted} from "vue";
+
   defineOptions({
     name: 'AUTH_DASHBOARD'
   })
+
+  onMounted(() => {
+    WebViewService.setIsLoading(false).then(() => {});
+  });
 </script>
diff --git a/src/views/data/device/index.vue b/src/views/data/device/index.vue
index feeba7d..a1795bf 100644
--- a/src/views/data/device/index.vue
+++ b/src/views/data/device/index.vue
@@ -48,7 +48,7 @@
   import { columns, searchFormSchema } from './schema';
   import { useMessage } from '@/hooks/web/useMessage';
   import {SvgIcon} from "@/components/Icon";
-  import {h} from "vue";
+  import {h, onMounted} from "vue";
   import {PlusOutlined} from "@ant-design/icons-vue";
 
   const { createMessage } = useMessage();
@@ -78,6 +78,10 @@
     },
   });
 
+  onMounted(() => {
+    WebViewService.setIsLoading(false).then(() => {});
+  });
+
   const handleParams = (params) => {
     const { pageNum, pageSize, field = 'id', order = 'descend', ...rest } = params;
     const handledParams: any = {
diff --git a/src/views/data/task/index.vue b/src/views/data/task/index.vue
index cd95a33..fbf986d 100644
--- a/src/views/data/task/index.vue
+++ b/src/views/data/task/index.vue
@@ -181,7 +181,7 @@
 
   const handleImport = () => {
     WebViewService.importExcel().then((str) => {
-      useMessage().createMessage.success("数据导入成功！");
+      WebViewService.setMessage("数据导入成功！", "success").then(() => {});
       const data = JSON.parse(str);
       if (data.length === 0) return;
       const taskName = data[0].name;
@@ -198,26 +198,26 @@
         isUpdate: false,
       });
     }, error => {
-      useMessage().createMessage.error(error);
+      WebViewService.setMessage("数据导入失败！", "error").then(() => {});
     });
   }
 
   const handleDownload = (record: Recordable) => {
     const ids = [...new Set([...(record.id ? [record.id] : []), ...(checkedKeys.value.map(d => (d)))])]
     DeviceClientService.assignTasks(ids).then(() => {
-      useMessage().createMessage.success("下发任务成功！");
+      WebViewService.setMessage("下发任务成功！", "success").then(() => {});
     }, error => {
-      useMessage().createMessage.error(error);
+      WebViewService.setMessage("下发任务失败！", "error").then(() => {});
     });
   };
 
   const handleSync = (record: Recordable) => {
     const ids = [...new Set([...(record.id ? [record.id] : []), ...(checkedKeys.value.map(d => (d)))])]
     DeviceClientService.syncTasks(ids).then(() => {
-      useMessage().createMessage.success("同步任务成功！");
+      WebViewService.setMessage("同步任务成功！", "success").then(() => {});
       reload();
     }, error => {
-      useMessage().createMessage.error(error);
+      WebViewService.setMessage("同步任务失败！", "error").then(() => {});
     });
   };
 
@@ -236,9 +236,11 @@
       DeviceClientService.getDeviceConnected().then((d) => {
         deviceConnectedList.value = d;
       }, error => {
-        useMessage().createMessage.error(error);
+        WebViewService.setMessage("获取设备连接出错", "error").then(() => {});
       });
     }, 300);
+
+    WebViewService.setIsLoading(false).then(() => {});
   });
 
   onUnmounted(()=> {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 539c84a..2a285a2 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -18,6 +18,7 @@
   import { columns, searchFormSchema } from './schema';
   import { useMessage } from "@/hooks/web/useMessage";
   import {SvgIcon} from "@/components/Icon";
+  import {onMounted} from "vue";
 
   const { createMessage } = useMessage();
   const { hasPermission } = usePermission();
@@ -40,6 +41,10 @@
     rowKey: (record: any) => record.id,
   });
 
+  onMounted(() => {
+    WebViewService.setIsLoading(false).then(() => {});
+  });
+
   const handleParams = (params, embedded = true) => {
     const { pageNum, pageSize, field = 'id', order = 'descend', ...rest } = params;
     const handledParams: any = { pageNum, pageSize, orderByClause: `${field} ${order === 'descend' ? 'desc' : 'asc'}` };
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 331cd2c..c1190c1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -39,7 +39,7 @@
   </div>
 </template>
 <script lang="ts">
-  import {defineComponent, h} from 'vue';
+import {defineComponent, h, onMounted} from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import * as UserApi from '/@/api/system/userApi';
   import { useDrawer } from '/@/components/Drawer';
@@ -103,6 +103,10 @@
         reload();
       }
 
+      onMounted(() => {
+        WebViewService.setIsLoading(false).then(() => {});
+      });
+
       return {
         registerTable,
         registerDrawer,