From bd92cc32ff01d8c453342684d5ffe3de372da3b7 Mon Sep 17 00:00:00 2001 From: cc500 <2014434568@qq.com> Date: Fri, 7 Feb 2025 14:44:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=80=BB=E8=BE=91+=E4=BE=A7=E8=BE=B9?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=A0=8F=E6=98=8E=E5=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dialogue/components/DialogueAside.vue | 14 +++++++++----- src/views/dialogue/dialogueView.vue | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/views/dialogue/components/DialogueAside.vue b/src/views/dialogue/components/DialogueAside.vue index 73d8b16d..d75743b5 100644 --- a/src/views/dialogue/components/DialogueAside.vue +++ b/src/views/dialogue/components/DialogueAside.vue @@ -50,7 +50,7 @@ const isCollapsed = ref(false); const selectedAppId = ref(null); // const apps = ref([ - { id: "1", name: 'CVE热修复助手' }, + { appId: "1", name: 'CVE热修复助手' }, ]); const filteredHistorySessions = computed(() => { @@ -219,9 +219,13 @@ const toggleCollapse = () => { }; const selectApp = id => { - selectedAppId.value = id; user_selected_app.value = []; - user_selected_app.value.push(app.value.id); + if(selectedAppId.value === id) { + selectedAppId.value = ""; + }else{ + selectedAppId.value = id; + user_selected_app.value.push(id); + } }; function ensureAppAtFirstPosition() { if(!app.value.id){ @@ -237,7 +241,7 @@ function ensureAppAtFirstPosition() { } selectedAppId.value = app.value.id; user_selected_app.value = []; - user_selected_app.value.push(app.value.id); + user_selected_app.value.push(app.value.appId); } onMounted(async() => { @@ -287,7 +291,7 @@ watch( v-for="app in displayedApps" :key="app.id" @click="selectApp(app.appId)" - :class="{ selected: selectedAppId === app.id }" + :class="{ selected: selectedAppId === app.appId }" > {{ app.name }} diff --git a/src/views/dialogue/dialogueView.vue b/src/views/dialogue/dialogueView.vue index f4ce379d..2e7a4f80 100644 --- a/src/views/dialogue/dialogueView.vue +++ b/src/views/dialogue/dialogueView.vue @@ -42,7 +42,7 @@ const routerList = [ { name: '对话', path: '/' , src:CopilotIcon , selectedSrc:CopilotIconSelected ,routerName: 'dialogue' }, { name: '语义中心', path: '/api' , src:ApiIcon , selectedSrc:ApiIconSelected ,routerName: 'api' }, { name: '应用中心', path: '/app' , src:AppIcon , selectedSrc:AppIconSelected ,routerName: 'app' }, - { name: '工具', path: '/tools' , src:WitchainDIcon , selectedSrc:WitchainDIconSelected ,routerName: 'witchainD' }, + { name: '知识库', path: '/tools' , src:WitchainDIcon , selectedSrc:WitchainDIconSelected ,routerName: 'witchainD' }, ]; export interface ModelForm { max_tokens?: number; -- Gitee From 0a5be3087fc88e5cd2c131fa1b0ddb2931398670 Mon Sep 17 00:00:00 2001 From: cc500 <2014434568@qq.com> Date: Fri, 7 Feb 2025 15:20:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=94=E7=94=A8=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/api/index.vue | 8 ++------ src/views/app/index.vue | 2 +- src/views/dialogue/Copilot.vue | 20 +++++++++---------- .../dialogue/components/DialogueAside.vue | 14 ++++++------- src/views/dialogue/types.ts | 4 ++-- 5 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/views/api/index.vue b/src/views/api/index.vue index ff89c904..230ec216 100644 --- a/src/views/api/index.vue +++ b/src/views/api/index.vue @@ -22,7 +22,7 @@
-
+
{ drawer.value = true; diff --git a/src/views/app/index.vue b/src/views/app/index.vue index 27022add..30480e39 100644 --- a/src/views/app/index.vue +++ b/src/views/app/index.vue @@ -127,7 +127,7 @@ const handleCreateApp = () => { const routerToDetail = appItem => { //获取appItem.id & appItem.name - router.push(`/copilot?id=${appItem.appId}&name=${encodeURIComponent(encodeURI(appItem.name))}`); + router.push(`/copilot?appId=${appItem.appId}&name=${encodeURIComponent(encodeURI(appItem.name))}`); }; const handleParmasQueryAppList = (params?: any) => { diff --git a/src/views/dialogue/Copilot.vue b/src/views/dialogue/Copilot.vue index 485e5081..0b3445a1 100644 --- a/src/views/dialogue/Copilot.vue +++ b/src/views/dialogue/Copilot.vue @@ -49,8 +49,14 @@ const initCopilot = async (): Promise => { } else { localStorage.setItem('theme', 'light'); } - userinfo.value.organization = type; const currRoute = router.currentRoute; + if (currRoute.value.query.appId) { + app.value = { + appId: String(currRoute.value.query.appId), + name: String(currRoute.value.query.name), + }; + } + userinfo.value.organization = type; if ( ['/copilot','/'].includes(currRoute.value?.path)) { const isLogin = await getUserInfo(); if (!isLogin) { @@ -58,16 +64,9 @@ const initCopilot = async (): Promise => { await api.stopGeneration(); await getHistorySession(); // setApps(); - } - return; - } else if (currRoute.value.query.id) { - app.value = { - id: String(currRoute.value.query.id), - name: String(currRoute.value.query.name), - }; - } else { - console.log('else'); } + return; + } }; const dialogVisible = ref(false); @@ -121,7 +120,6 @@ onMounted(async() => { watch( () => route.path, () => { - console.log(111) initCopilot(); }, { diff --git a/src/views/dialogue/components/DialogueAside.vue b/src/views/dialogue/components/DialogueAside.vue index d75743b5..15b64639 100644 --- a/src/views/dialogue/components/DialogueAside.vue +++ b/src/views/dialogue/components/DialogueAside.vue @@ -219,16 +219,15 @@ const toggleCollapse = () => { }; const selectApp = id => { - user_selected_app.value = []; if(selectedAppId.value === id) { selectedAppId.value = ""; }else{ selectedAppId.value = id; - user_selected_app.value.push(id); + user_selected_app.value =[id]; } }; function ensureAppAtFirstPosition() { - if(!app.value.id){ + if(!app.value.appId){ return; } const newApp = app.value; @@ -239,9 +238,8 @@ function ensureAppAtFirstPosition() { } else if (index === -1) { apps.value.unshift(newApp); } - selectedAppId.value = app.value.id; - user_selected_app.value = []; - user_selected_app.value.push(app.value.appId); + selectedAppId.value = app.value.appId; + user_selected_app.value = [app.value.appId]; } onMounted(async() => { @@ -253,8 +251,8 @@ onMounted(async() => { else { appList.value = apps.value; } - if(app.value.id){ - selectedAppId.value = app.value.id; + if(app.value.appId){ + selectedAppId.value = app.value.appId; } }); diff --git a/src/views/dialogue/types.ts b/src/views/dialogue/types.ts index 33d46ead..b4dc5cbd 100644 --- a/src/views/dialogue/types.ts +++ b/src/views/dialogue/types.ts @@ -78,8 +78,8 @@ export interface FlowDataType { } export interface AppShowType { - id?: string, - name?:string, + appId: string, + name:string, } -- Gitee