From 4f33e1e616e2a59112a6265073124abd7f0e81ed Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期二, 25 二月 2025 16:00:27 +0800
Subject: [PATCH] 修改地图
---
src/components/chat/Chat.vue | 140 ++++++++++++++++++++++++++++++++--------------
1 files changed, 96 insertions(+), 44 deletions(-)
diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue
index 3fbb0e4..66e1ebb 100644
--- a/src/components/chat/Chat.vue
+++ b/src/components/chat/Chat.vue
@@ -21,17 +21,20 @@
<!-- 杈撳叆鍖哄煙 -->
<template #input-area>
- <PlayBar
- ref="playBarRef"
- v-model:voicePageIsShow="voicePageIsShow"
- :isTalking="isTalking"
- :isHome="false"
- :msgList="computedMessageList"
- v-model="messageContent.values"
- @sendClick="sendClick"
- @stopGenClick="stopGenClick"
- :style="{ width: chatWidth }"
- />
+ <div class="w-full">
+ <PlayBar
+ ref="playBarRef"
+ v-model:voicePageIsShow="voicePageIsShow"
+ :isTalking="isTalking"
+ :isHome="false"
+ :msgList="computedMessageList"
+ v-model="messageContent.values"
+ @sendClick="sendClick"
+ @stopGenClick="stopGenClick"
+ :style="{ width: chatWidth }"
+ class="mx-auto"
+ />
+ </div>
</template>
<!-- 鎶藉眽 -->
@@ -47,7 +50,7 @@
import axios from 'axios';
import { orderBy } from 'lodash-es';
import moment from 'moment';
-import { computed, onActivated, onMounted, ref } from 'vue';
+import { computed, nextTick, onActivated, onMounted, ref } from 'vue';
import { loadAmisSource } from '../amis/load';
import { useScrollLoad } from './hooks/useScrollLoad';
import type { ChatContent } from './model/types';
@@ -56,8 +59,8 @@
import PlayBar from '/@/components/chat/components/playBar/PlayBar.vue';
import CustomDrawer from '/@/components/drawer/CustomDrawer.vue';
import { Logger } from '/@/model/logger/Logger';
-
-import { ElMessage } from 'element-plus';
+import { triggerRef } from 'vue';
+import { ElLoadingService, ElMessage } from 'element-plus';
import ChatContainer from './components/ChatContainer.vue';
import ShareLinkDlg from './components/shareLink/index.vue';
import router from '/@/router';
@@ -76,6 +79,7 @@
import { toMyFixed } from '/@/utils/util';
import { useLoadData } from './hooks/useLoadData';
import { useSyncMsg } from './hooks/useSyncMsg';
+import { getCurrentPosition } from '/@/utils/brower';
const containerRef = useCompRef(ChatContainer);
const chatListDom = computed(() => containerRef.value?.chatListDom);
const scrollToBottom = () => {
@@ -98,10 +102,21 @@
});
let questionRes = null;
-let position = null;
const preQuestion = ref(null);
let lastAxiosSource: CancelTokenSource = null;
+
+// 閫氳繃淇敼 isTalking 鏉ヨЕ鍙戞洿鏂�
+const triggerRefresh = () => {
+ isTalking.value = !isTalking.value;
+
+ nextTick(() => {
+ isTalking.value = !isTalking.value;
+ });
+};
+
+let streamOutputIsStart = false;
+let position: Position = null;
const questionAi = async (text) => {
let judgeParams = null;
if (!preQuestion.value) {
@@ -119,11 +134,21 @@
...judgeParams,
} as any;
- if (position) {
- const longitude = position.coords.longitude;
- const latitude = position.coords.latitude;
- params.cur_pos = [longitude, latitude].join(',');
- }
+ // if (!position) {
+ // const loadingInstance = ElLoadingService({
+ // text: '鑾峰彇浣嶇疆涓�...',
+ // target: '.layout-parent',
+ // fullscreen:false,
+ // });
+ // position = await getCurrentPosition().finally(() => {
+ // loadingInstance.close();
+ // });
+ // }
+
+ // if (position) {
+ // const { latitude, longitude } = position;
+ // params.cur_pos = [longitude, latitude].join(',');
+ // }
if (activeGroupType.value) {
params.group_type = activeGroupType.value;
@@ -150,33 +175,36 @@
};
const checkReportEmpty = () => {
const isEmpty = !questionRes?.reports || questionRes?.reports?.length === 0;
-
return isEmpty;
};
questionStreamByPost(
params,
(chunkRes) => {
Logger.info('chunk response锛歕n\n' + JSON.stringify(chunkRes));
-
if (chunkRes.mode === 'result') {
lastIsResult = true;
const res = chunkRes.value;
-
if (checkReportEmpty()) {
const resReport = getResReport();
resReport.reports.push(res);
questionRes = resReport;
+ // resReport.reports = resReport.reports.concat([]);
resolve(resReport);
} else {
const lastMsg = computedMessageList.value.at(-1);
-
+ // lastMsg.content.values = lastMsg.content.values.concat([]);
// 宸茬粡瑙ｆ瀽杩囦竴娆� reports
+ if (!lastMsg.content.values) {
+ lastMsg.content.values = [];
+ }
+
lastMsg.content.values.push({
content: parseContent(res, true, {
origin: res,
}),
});
}
+ triggerRefresh();
return;
// chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽';
}
@@ -236,7 +264,7 @@
}
}
const getLastGroup = () => {
- const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1);
+ const lastGroup = computedMessageList.value.at(-1).stepGroup[0];
return lastGroup;
};
const getLastStepList = () => {
@@ -266,40 +294,64 @@
return;
}
- // 鏆傛椂涓嶈�冭檻澶氫釜 report鎯呭喌
+ // 鏆傛椂涓嶈�冭檻澶氫釜 report 鎯呭喌
- // if (lastIsResult && chunkRes.mode !== 'finish') {
- // // 寮�濮嬪鍔犳柊鐨� stepGroup
- // computedMessageList.value.at(-1).stepGroup.push({
- // value: [],
- // isShow: true,
- // });
- // lastIsResult = false;
- // }
- const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1);
+ if (lastIsResult && chunkRes.mode !== 'finish') {
+ // const lastTow = computedMessageList.value.at(-1);
+ // lastTow.stepGroup.at(-1).value.at(-1).finishLoading = true;
+ // lastTow.content.values = lastTow.content.values.concat([]);
+
+ // 寮�濮嬪鍔犳柊鐨� stepGroup锛屽悗缁殑 stepGroup 骞舵病鏈夊疄闄呬綔鐢紝鍙槸涓轰簡鍋氳凯浠ｇ敤锛岃凯浠ｅ嚭缁勪欢锛屽睅灞变唬鐮佸疄鍦ㄥお闅炬敼浜嗭紒锛侊紒
+ computedMessageList.value.at(-1).stepGroup.push({
+ value: [],
+ isShow: true,
+ });
+ lastIsResult = false;
+ }
+ const lastGroup = computedMessageList.value.at(-1).stepGroup[0];
const stepList = lastGroup?.value ?? [];
const currentTimeStamp = new Date().getTime();
- const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
if (chunkRes.mode === 'finish') {
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
stepList.at(-1).ms = ms;
isTalking.value = false;
-
+ streamOutputIsStart = false;
return;
}
- if (stepList?.length >= 1) {
+ if (stepList?.length >= 1 && !streamOutputIsStart) {
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
+
stepList.at(-1).ms = ms;
} else {
const stepGroup = computedMessageList.value.at(-1).stepGroup;
if (stepGroup.length > 1) {
const lastStepList = stepGroup.at(-2).value;
+ const ms = toMyFixed(currentTimeStamp - lastTimestamp, 2) + ' ms';
+
lastStepList.at(-1).ms = ms;
}
}
- lastTimestamp = currentTimeStamp;
- const stepItem = convertProcessItem(chunkRes);
- stepList.push(stepItem);
+ if (!streamOutputIsStart) {
+ lastTimestamp = currentTimeStamp;
+ }
+ if (!streamOutputIsStart) {
+ const stepItem = convertProcessItem(chunkRes);
+ stepList.push(stepItem);
+ } else {
+ const lastItem = stepList.at(-1);
+ lastItem.title += chunkRes.value ?? '';
+ }
+
+ if (chunkRes.mode === 'begin_stream') {
+ streamOutputIsStart = true;
+ lastTimestamp = currentTimeStamp;
+ }
+ if (chunkRes.mode === 'end_stream') {
+ streamOutputIsStart = false;
+ }
+
// 寮哄埗瑙﹀彂鏇存柊
scrollToBottom();
@@ -398,9 +450,7 @@
try {
const [userItem, assistantItem] = addChatItem(content);
-
resMsgContent = await questionAi(content.values);
-
updateLoadIndex();
userItem.historyId = questionRes?.history_id;
@@ -435,6 +485,9 @@
checkCanSync: (data) => {
return !isTalking.value && !moreIsLoading.value;
},
+ showTip: (data) => {
+ playBarRef.value.showSyncTip(data);
+ },
loadReplyData,
scrollToBottom,
});
@@ -451,7 +504,6 @@
};
sendChatMessage();
};
-
const initHistoryChat = () => {
// 鍒濆鐘舵�佹粴涓�涓�
--
Gitblit v1.9.3