diff --git a/src/pages/course/components/chartFive.vue b/src/pages/course/components/chartFive.vue new file mode 100644 index 00000000..27533000 --- /dev/null +++ b/src/pages/course/components/chartFive.vue @@ -0,0 +1,329 @@ + + + \ No newline at end of file diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue index edc1b881..76700155 100644 --- a/src/pages/course/components/talkingItem.vue +++ b/src/pages/course/components/talkingItem.vue @@ -30,6 +30,7 @@ + @@ -189,6 +190,7 @@ import { downloadVoiceFile, uploadVoiceFile, getAudioByText } from "@/api/common import { studyParagraphOverApi, getAskAboutRawApi } from "@/api/study.js" import ChartFour from "./chartFour.vue" import ChartThree from "./chartThree.vue" +import ChartFive from './chartFive.vue' import common from '@/common/common'; import { getUserInfo } from '@/common/common'; import { useStorageStore } from "@/store/storage.js" @@ -522,7 +524,7 @@ const audioCacheObj = computed(() => storageStore.audioObj) width: 76rpx; height: 76rpx; border: 3rpx solid #fff; - background-color: #ccc; + background-color: #f1f1f1; overflow: hidden; border-radius: 10rpx; margin-right: 16rpx; @@ -698,7 +700,7 @@ const audioCacheObj = computed(() => storageStore.audioObj) width: 76rpx; height: 76rpx; border: 3rpx solid #fff; - background-color: #ccc; + background-color: #f1f1f1; overflow: hidden; border-radius: 10rpx; margin-left: 16rpx; diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue index 4facd525..30abf488 100644 --- a/src/pages/course/study.vue +++ b/src/pages/course/study.vue @@ -547,7 +547,8 @@ const nextQuestionSuccess = (info, type='next') => { isQuestion: true } talkingList.value.push(lastTalkingInfo.value) - qstLogId.value = _body.chatBody.qstLogId + logId.value = _body.chatBody.logId + qstLogId.value = _body.chatBody.qstLogId || qstLogId.value scrollToBottomNow() }) } @@ -610,10 +611,7 @@ const initsocketTask = () => { }) } const reconnect = ()=> { - if(reconnectTimer || isManualClose.value) return - reconnectTimer = setTimeout(()=>{ - initsocketTask() - },3000) + initsocketTask() } const sendMessage = (data) => { unref(SocketObj).send(data) @@ -622,6 +620,7 @@ const sendMessage = (data) => { const startPgrphId = ref('') const imageId = ref('') onLoad((params) => { + watchFlag.value = 1 crsId.value = params.crsId||''; crsNum.value = params.crsNum||''; imageId.value = params.imgId || '' @@ -638,13 +637,14 @@ onHide(()=>{ if(watchFlag.value === 1) return changePlayItemId('') socketStore.closeSocket() - common.show('提示信息', '检测到您已离开,即将退出学习页面。',false, '','确认').then((res) => { - common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) - }).finally(() => {}) + // common.show('提示信息', '检测到您已离开,即将退出学习页面。',false, '','确认').then((res) => { + // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`) + // }).finally(() => {}) }) onShow(()=>{ if(watchFlag.value === 1) return - getData('2'); + // getData('2'); + initsocketTask() }) const watchFlag = ref(1) onUnload(()=>{ diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index a1f5b782..bbd12434 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -152,18 +152,18 @@ import { const initsocketTask = () => { socketStore.creatSocket('/traask/asksocket/open?summary=') - unref(SocketObj).on('open', (res)=>{ - if(!answerIsOver.value){ - sendMessage({ - "commond" : 'ASK-RE-START', - "body" : { - reqBatch: reqBatch.value, - seqNo: seqNo.value, - answerContent: answerText.value - } - }) - } - }) + // unref(SocketObj).on('open', (res)=>{ + // if(!answerIsOver.value){ + // sendMessage({ + // "commond" : 'ASK-RE-START', + // "body" : { + // reqBatch: reqBatch.value, + // seqNo: seqNo.value, + // answerContent: answerText.value + // } + // }) + // } + // }) unref(SocketObj).on('message', (res)=>{ const { rtnCode, body, commond } = JSON.parse(res.data) let _id = new Date().getTime() + 'id' @@ -414,14 +414,25 @@ import { }) onShow(()=>{ if(watchFlag.value === 1) return - socketStore?.createSocket?.() - sendMessage({ - "commond" : 'ASK-START', - "body" : { - mascotId: mascotId.value, - deviceImei: '' - } - }) + socketStore?.createSocket() + if(!answerIsOver.value){ + sendMessage({ + "commond" : 'ASK-RE-START', + "body" : { + reqBatch: reqBatch.value, + seqNo: seqNo.value, + answerContent: answerText.value + } + }) + }else{ + sendMessage({ + "commond" : 'ASK-START', + "body" : { + mascotId: mascotId.value, + deviceImei: '' + } + }) + } }) onUnload(()=>{ watchFlag.value = 1