From e295922209fb87c6dcd68ea1560fd16c3e6d808c Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 27 六月 2025 09:36:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/ai'
---
src/views/ai/dashboard/components/conversation/CommonConversation.vue | 23 ++++-------------------
1 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/src/views/ai/dashboard/components/conversation/CommonConversation.vue b/src/views/ai/dashboard/components/conversation/CommonConversation.vue
index 04137e7..5d41a42 100644
--- a/src/views/ai/dashboard/components/conversation/CommonConversation.vue
+++ b/src/views/ai/dashboard/components/conversation/CommonConversation.vue
@@ -147,7 +147,7 @@
import * as authUtil from "@/utils/auth";
import {refreshToken} from "@/api/login";
import {formatToDateTime} from "@/utils/dateUtil";
-import {ElLoading} from "element-plus";
+import { formatReasoningContent } from '@/views/ai/utils/utils'
/** AI 聊天对话 列表 */
defineOptions({ name: 'NormalConversation' })
@@ -347,23 +347,6 @@
return []
})
-// //处理调度推理结论(deepSeek)
-// const dealResult = (conversations: any) => {
-// const regex = /<think>(\n*)([\s\S]*?)(\n*)<\/think>(\n*)([\s\S]*)/;
-// conversations.forEach((conversation) => {
-// if(conversation.content.includes('<\/think>')) {
-// conversation.thinkingFlag = false
-// } else {
-// conversation.thinkingFlag = true
-// }
-// const match = conversation.content.match(regex);
-// if(match) {
-// conversation.thinking = match[2];
-// conversation.conclusion = match[5]
-// }
-// })
-// }
-
//处理调度推理结论(微调大模型)
const dealResult = (messages: any) => {
messages.forEach((message) => {
@@ -378,6 +361,8 @@
} else {
message.thinking = message.content
}
+ // 处理推理思路内容
+ message.thinking = formatReasoningContent(message.thinking);
}
})
}
@@ -691,7 +676,7 @@
position: absolute;
left: 320px; // 初始展开位置
top: 40%;
- z-index: 1000;
+ z-index: 1;
width: 20px;
height: 80px;
background: rgba(115, 196, 255, 0.5);
--
Gitblit v1.9.3