From 404600d8352b4ecac6daf963b63e01bec543fcb3 Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期三, 19 二月 2025 14:45:32 +0800 Subject: [PATCH] 定时获取位置 --- src/components/chat/Chat.vue | 71 ++++++++++++++++++++++++----------- 1 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/components/chat/Chat.vue b/src/components/chat/Chat.vue index 808f898..08b5198 100644 --- a/src/components/chat/Chat.vue +++ b/src/components/chat/Chat.vue @@ -21,7 +21,7 @@ <!-- 杈撳叆鍖哄煙 --> <template #input-area> - <div class="w-full "> + <div class="w-full"> <PlayBar ref="playBarRef" v-model:voicePageIsShow="voicePageIsShow" @@ -50,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'; @@ -59,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'; @@ -79,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 = () => { @@ -101,10 +102,19 @@ }); 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 position: Position = null; const questionAi = async (text) => { let judgeParams = null; if (!preQuestion.value) { @@ -122,9 +132,19 @@ ...judgeParams, } as any; + if (!position) { + const loadingInstance = ElLoadingService({ + text: '鑾峰彇浣嶇疆涓�...', + target: '.layout-parent', + fullscreen:false, + }); + position = await getCurrentPosition().finally(() => { + loadingInstance.close(); + }); + } + if (position) { - const longitude = position.coords.longitude; - const latitude = position.coords.latitude; + const { latitude, longitude } = position; params.cur_pos = [longitude, latitude].join(','); } @@ -153,7 +173,6 @@ }; const checkReportEmpty = () => { const isEmpty = !questionRes?.reports || questionRes?.reports?.length === 0; - return isEmpty; }; questionStreamByPost( @@ -164,22 +183,27 @@ 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([]); // 宸茬粡瑙f瀽杩囦竴娆� reports + if (!lastMsg.content.values) { + lastMsg.content.values = []; + } + lastMsg.content.values.push({ content: parseContent(res, true, { origin: res, }), }); } + triggerRefresh(); return; // chunkRes.value = '鍑嗗鏁版嵁鍒嗘瀽'; } @@ -239,7 +263,7 @@ } } const getLastGroup = () => { - const lastGroup = computedMessageList.value.at(-1).stepGroup.at(-1); + const lastGroup = computedMessageList.value.at(-1).stepGroup[0]; return lastGroup; }; const getLastStepList = () => { @@ -269,24 +293,27 @@ 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 骞舵病鏈夊疄闄呬綔鐢紝鍙槸涓轰簡鍋氳凯浠g敤锛岃凯浠e嚭缁勪欢锛屽睅灞变唬鐮佸疄鍦ㄥお闅炬敼浜嗭紒锛侊紒 + 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') { stepList.at(-1).ms = ms; isTalking.value = false; - return; } -- Gitblit v1.9.3