From cb91ec58acc98edc396cf2777ac5d063c1821685 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Thu, 23 Mar 2023 15:44:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#10787=E3=80=8110786?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/BasicLayoutPage.vue   |  2 +-
 src/store/scene.ts                          |  2 +-
 src/utils/request.ts                        | 14 +++++++-------
 src/views/iot-card/CardManagement/index.vue |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 71ebdcc8..598fa6e5 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -15,7 +15,7 @@
             >
               {{ slotProps.route.breadcrumbName }}
             </a>
-            <span v-else style='cursor: pointer' >{{ slotProps.route.breadcrumbName }}</span>
+            <span v-else style='cursor: default' >{{ slotProps.route.breadcrumbName }}</span>
         </template>
         <template #rightContentRender>
             <div class="right-content">
diff --git a/src/store/scene.ts b/src/store/scene.ts
index b58ab447..efc423a9 100644
--- a/src/store/scene.ts
+++ b/src/store/scene.ts
@@ -109,7 +109,7 @@ export const useSceneStore = defineStore('scene', () => {
         ...result,
         trigger: result.trigger || {},
         branches: cloneDeep(assignmentKey(branches)),
-        options: result.options ? {...defaultOptions, ...result.options } : defaultOptions,
+        options: result.options ? {...cloneDeep(defaultOptions), ...result.options } : cloneDeep(defaultOptions),
       }
     }
   }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 0cf20b9a..5c260845 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -158,10 +158,7 @@ const errorHandler = (error: any) => {
                 description: '用户未登录'
             })
             setTimeout(() => {
-                debugger
-                router.push({
-                    path: LoginPath
-                })
+                location.href = `/#${LoginPath}`
             }, 0)
         }
     } else if (error.response === undefined) {
@@ -180,10 +177,13 @@ request.interceptors.request.use(config => {
     const token = LocalStore.get(TOKEN_KEY)
     // const token = store.$state.tokenAlias
     if (!token) {
+        // setTimeout(() => {
+        //     router.replace({
+        //         path: LoginPath
+        //     })
+        // }, 0)
         setTimeout(() => {
-            router.replace({
-                path: LoginPath
-            })
+            location.href = `/#${LoginPath}`
         }, 0)
         return config
     }
diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue
index 8762639a..a6117f7e 100644
--- a/src/views/iot-card/CardManagement/index.vue
+++ b/src/views/iot-card/CardManagement/index.vue
@@ -572,7 +572,7 @@ const columns = [
         search: {
             type: 'select',
             options: [
-                { label: '正常', value: 'using' },
+                { label: '激活', value: 'using' },
                 { label: '未激活', value: 'toBeActivated' },
                 { label: '停机', value: 'deactivate' },
                 { label: '其它', value: 'using,toBeActivated,deactivate' },