From 620a3a4ae8687766d4baae8ad7fe17ee480ff355 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Sat, 25 Mar 2023 11:00:10 +0800
Subject: [PATCH] fix: bug#10514

---
 .../device/Firmware/Task/Detail/index.vue     |  2 +-
 src/views/device/Instance/Detail/index.vue    | 40 +++++++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue
index e677650a..ae6fd789 100644
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@@ -237,7 +237,7 @@ const columns = [
         scopedSlots: true,
         width: 200,
         search: {
-            type: 'string',
+            type: 'number',
         },
     },
     {
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 081b6b96..b719c409 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -246,21 +246,35 @@ const getDetail = () => {
     }
 };
 
-watch(
-    () => route.params?.id,
-    async (newId) => {
-        if (newId) {
-            await instanceStore.refresh(String(newId));
-            getStatus(String(newId));
-            list.value = [...initList];
-            getDetail();
-            instanceStore.tabActiveKey = 'Info';
-        }
-    },
-    { immediate: true, deep: true },
-);
+// watch(
+//     () => route.params?.id,
+//     async (newId) => {
+//         if (newId) {
+//             await instanceStore.refresh(String(newId));
+//             getStatus(String(newId));
+//             list.value = [...initList];
+//             console.log('watch', route.params?.id)
+//             getDetail();
+//             instanceStore.tabActiveKey = 'Info';
+//         }
+//     },
+//     { immediate: true, deep: true },
+// );
+
+const getDetailFn = async () => {
+  const _id = route.params?.id
+  if (_id) {
+    await instanceStore.refresh(String(_id));
+    getStatus(String(_id));
+    list.value = [...initList];
+    console.log('watch', route.params?.id)
+    getDetail();
+    instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
+  }
+}
 
 onMounted(() => {
+    getDetailFn()
     instanceStore.tabActiveKey = history.state?.params?.tab || 'Info';
 });