From e86e17c36a0cf0fd9a8dd759a5a5cac603206edc Mon Sep 17 00:00:00 2001
From: carolsi <qin.si@daocloud.io>
Date: Fri, 15 Dec 2023 11:14:36 +0800
Subject: [PATCH] fix: inference applicationModel compare page single query
 resolution error

---
 .../InferenceApplicationModelCompare.vue            | 13 +++++++++++--
 src/views/login/Login.vue                           | 13 ++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/inference-application/InferenceApplicationModelCompare.vue b/src/views/inference-application/InferenceApplicationModelCompare.vue
index 5395b07..3f18aff 100644
--- a/src/views/inference-application/InferenceApplicationModelCompare.vue
+++ b/src/views/inference-application/InferenceApplicationModelCompare.vue
@@ -12,7 +12,13 @@ const { t } = useI18n();
 const router = useRouter();
 const { query } = useRoute();
 
-const servicename = computed(() => query.servicename as string[]);
+const servicename = computed(() => {
+  if (Array.isArray(query.servicename)) {
+    return query.servicename as string[];
+  }
+
+  return [query.servicename as string];
+});
 
 const examples: ExampleMap[] = [
   {
@@ -95,7 +101,10 @@ const examples: ExampleMap[] = [
         v-for="(name, index) in servicename"
         :key="index"
       >
-        <ComparisonChatItem :name="name" />
+        <ComparisonChatItem
+          :key="index"
+          :name="name"
+        />
       </dao-card-item>
     </dao-card>
     <div class="compare-input-card">
diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue
index b3410d4..db96915 100644
--- a/src/views/login/Login.vue
+++ b/src/views/login/Login.vue
@@ -3,6 +3,7 @@ import { useUserStore } from '@/stores/user';
 import { object, string } from 'yup';
 
 const router = useRouter();
+const route = useRoute();
 
 const userStore = useUserStore();
 const loginSuccess = computed(() => userStore.isLoginSuccess());
@@ -22,9 +23,15 @@ const { handleSubmit } = useForm<ServiceAccount>({
 
 const onSubmit = handleSubmit(async (values) => {
   await userStore.login(values.token);
-  router.push({
-    name: 'ConsoleContainer',
-  });
+  const redirectedPath = route.redirectedFrom?.fullPath;
+
+  if (redirectedPath) {
+    router.push(redirectedPath);
+  } else {
+    router.push({
+      name: 'ConsoleContainer',
+    });
+  }
 });
 
 onMounted(async () => {