From cee87e8401fdfb46f9cb9a4ad2818daeb09a59b4 Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期日, 03 十一月 2024 15:15:55 +0800 Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test --- src/components/chat/Chat.vue | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue index c5352f3..5a7e090 100644 --- a/src/components/chat/Chat.vue +++ b/src/components/chat/Chat.vue @@ -1,18 +1,19 @@ <template> <div class="flex h-full"> <div class="flex flex-col h-full flex-auto"> - <div ref="chatListDom" class="relative h-full flex flex-col items-center overflow-y-auto "> + <div ref="chatListDom" class="relative h-full flex flex-col items-center overflow-y-auto"> <span class="more-loading absolute text-blue-400 left-[50%] translate-x-[-50%] cursor-pointer w-10" v-loading="moreIsLoading" ></span> - <div class="h-full" v-loading="chatListLoading" :style="{ width: chatWidth }"> + <div class="h-full relative" v-loading="chatListLoading" :style="{ width: chatWidth }"> <div class="group flex px-4 py-6 hover:bg-slate-100 rounded-lg relative" :class="{ 'flex-row-reverse': item.role === RoleEnum.user }" v-for="(item, index) of computedMessageList" :key="`${item.historyId}_${item.role}`" > + <div class="absolute top-0 left-[72px] text-[#8d8e99]">{{ item?.createTime }}</div> <img class="rounded-full size-12 flex-0" :class="{ 'mr-4': item.role === RoleEnum.assistant, 'ml-4': item.role === RoleEnum.user }" @@ -143,7 +144,7 @@ </div> </div> - <div class="sticky bottom-0 w-full p-6 bg-[rgb(247,248,250)] flex justify-center"> + <div class="sticky bottom-0 w-full p-6 bg-[rgb(247,248,250)] flex justify-center"> <PlayBar v-model:voicePageIsShow="voicePageIsShow" :isTalking="isTalking" @@ -161,6 +162,7 @@ <script setup lang="ts"> import _ from 'lodash'; +import moment from 'moment'; import { v4 as uuidv4 } from 'uuid'; import { computed, onMounted, ref } from 'vue'; import FeedbackPanel from './components/FeedbackPanel.vue'; @@ -171,11 +173,20 @@ import { useScrollToBottom } from './hooks/useScrollToBottom'; import type { ChatContent } from './model/types'; import { AnswerState, AnswerType, RoleEnum, answerTypeMapCom, roleImageMap, type ChatMessage } from './model/types'; -import { GetHistoryAnswer, QuestionAi, extCallQuery } from '/@/api/ai/chat'; +import { QuestionAi, extCallQuery } from '/@/api/ai/chat'; import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue'; import CustomDrawer from '/@/components/drawer/CustomDrawer.vue'; import router from '/@/router'; -import { activeChatRoom, activeGroupType, activeLLMId, activeRoomId, activeSampleId, activeSectionAId, getRoomConfig, roomConfig } from '/@/stores/chatRoom'; +import { + activeChatRoom, + activeGroupType, + activeLLMId, + activeRoomId, + activeSampleId, + activeSectionAId, + getRoomConfig, + roomConfig, +} from '/@/stores/chatRoom'; import { ErrorCode } from '/@/utils/request'; const chatWidth = '75%'; @@ -193,7 +204,6 @@ const computedMessageList = computed(() => { return messageList.value.filter((v) => !!v); }); - const parseContent = (res) => { if (!res) return null; let content: ChatContent = { @@ -253,10 +263,8 @@ content.origin = res; return content; }; - const { clearQueryProcess, process, processId, queryProcess } = useQueryProcess(); const DEFAULT_SECTION_A_ID = 'knowledge_base'; - let questionRes = null; let finalCalcSectionAId = null; @@ -301,7 +309,7 @@ ...judgeParams, } as any; - if(activeGroupType.value){ + if (activeGroupType.value) { params.group_type = activeGroupType.value; } @@ -332,7 +340,6 @@ let currentSampleId = ''; let currentLLMId = null; - const sendChatMessage = async (content: ChatContent = messageContent.value, cb?: any, isCallExtParams?: any) => { if (!content?.values || isTalking.value || chatListLoading.value) return; @@ -399,8 +406,10 @@ sendChatMessage(messageContent.value, cb); }; const appendLastMessageContent = (content: ChatContent) => { + const currentTime = moment().format('MM鏈圖D鏃� HH:mm:ss'); if (messageList.value.at(-1)) { messageList.value.at(-1).content = content; + messageList.value.at(-1).createTime = currentTime; } }; const { loadRangeData, onChatListScroll, moreIsLoading, nextUserMsgEndIndex } = useScrollLoad({ -- Gitblit v1.9.3