diff --git a/.env.development b/.env.development index 9c391a72..1c623adf 100644 --- a/.env.development +++ b/.env.development @@ -24,15 +24,16 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # 线上 # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' -VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' -VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' -VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' -VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' +# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601' +# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' +# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' # 王洋洋 -#VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' +# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604' # 于嘉文 -#VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604' +# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604' + diff --git a/src/api/courseDetail.js b/src/api/courseDetail.js index 4e5139c9..bd0efd11 100644 --- a/src/api/courseDetail.js +++ b/src/api/courseDetail.js @@ -60,4 +60,13 @@ export const publishCrsEvaluation = (data) => { }; +// 考试排行榜/traexam/traCrsPapers/queryTraCrsRankingList +export const queryTraCrsRankingList = (data) => { + return request({ + url: '/traexam/traCrsPapers/queryTraCrsRankingList', + method: 'post', + data + }); +}; + diff --git a/src/api/dialog.js b/src/api/dialog.js index a4e2bdf7..b4e6e606 100644 --- a/src/api/dialog.js +++ b/src/api/dialog.js @@ -11,7 +11,21 @@ export const queryHotQuestionApi = (data) => { }); }; // 获取问答历史 - +export const queryAskBatchSessionPaging = (data) => { + return request({ + url: '/traask/traAskchatSession/queryAskBatchSessionPaging', + method: 'post', + data + }); +}; +// 问答详情 /traAskchatSession/queryAskHisByBatchIdPaging +export const queryAskHisByBatchIdPaging = (data) => { + return request({ + url: '/traask/traAskchatSession/queryAskHisByBatchIdPaging', + method: 'post', + data + }); +}; // 问答反馈 export const insertTraAskFeedback = (data) => { return request({ diff --git a/src/api/search.js b/src/api/search.js new file mode 100644 index 00000000..17666ef1 --- /dev/null +++ b/src/api/search.js @@ -0,0 +1,12 @@ +import request from '@/api/request' +const base_url = '/traapp' + +// 搜索 +export const appSearchCrsApi = (data) => { + return request({ + url: base_url + '/traSearchHis/appSearchCrs', + method: 'post', + toastErrors: true, + data + }); +}; diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue index e0116c18..516a9ec5 100644 --- a/src/components/course-item/course-item.vue +++ b/src/components/course-item/course-item.vue @@ -1,8 +1,7 @@ diff --git a/src/pages/index/components/history.vue b/src/pages/index/components/history.vue index 0b74fa43..f8ee2aad 100644 --- a/src/pages/index/components/history.vue +++ b/src/pages/index/components/history.vue @@ -6,8 +6,8 @@ 对话记录 - - {{'信息补录操作时，需录入什么信息？信息补录操作时，需录入什么信息？'}} + + {{item.sseContent}} @@ -20,18 +20,32 @@ reactive, computed, onMounted, - nextTick + nextTick } from 'vue'; + import { queryAskBatchSessionPaging } from '@/api/dialog.js' + const emit = defineEmits(['showDetail']) const historyPopupRef = ref() + const historyList = ref([]) const open = () => { openFeedback(true) } const close = () => { openFeedback() } - const openFeedback = (status) => { + const pageInfo = ref({ + page: 1, + limit: 20 + }) + const getList = async () => { + try { + const res = await queryAskBatchSessionPaging(pageInfo.value) + historyList.value = historyList.value.concat(res.body|| []) + }catch{}finally{} + } + const openFeedback = async (status) => { if (status) { + await getList() historyPopupRef.value.open('left') } else { historyPopupRef.value.close() @@ -39,6 +53,7 @@ } const chooseHistory = (item) => { console.log(item) + emit('showDetail',item) } defineExpose({ open,close diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue index f53e114a..f6c9cbba 100644 --- a/src/pages/index/dialog.vue +++ b/src/pages/index/dialog.vue @@ -85,7 +85,7 @@ :isDisabled="false" /> - + @@ -134,7 +134,8 @@ } from "@/api/common.js" import { queryHotQuestionApi, - insertTraAskFeedback + insertTraAskFeedback, + queryAskHisByBatchIdPaging } from "@/api/dialog.js" import Feedback from './components/feedback.vue' import History from './components/history.vue' @@ -436,6 +437,30 @@ const showHistory = () => { historyRef.value.open() } + + const showHistoryDetail = (item) => { + queryAskHisByBatchIdPaging({ + batchId: item.reqBatch, + page: 1, + limit: 100 + }).then(res=> { + console.log(res) + talkingList.value = (res.body || []).map((t,index)=> { + return { + type: t.chatRole === 'TCH'? 'answer':'question', + talkingText: t.respContent, + isLoading: false, + id: t.askId + index, + talkingVoice: '', + reqBatch: item.reqBatch, + intrctWay: '01', //01-文本；02-语音；03-图片 + intrctContent: t.respContent, + bucketKey: '' + } + }) + historyRef.value.close() + }) + } const routerTo = (type) => { switch (type) { case 'AI学': diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue index 6b08a68a..ab9d8c8c 100644 --- a/src/pages/learningTasks/components/content-item.vue +++ b/src/pages/learningTasks/components/content-item.vue @@ -10,17 +10,15 @@ {{ item.taskName }} - 起止时间： - {{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }} + 起止时间：{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }} - 完成人数： - {{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }} + 完成人数：{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }} 进度： - {{ item.finishCrs ?? 0 }}/{{ item.sumCrs ?? 0 }}门课程 + {{ item.finishCrs ?? item.learnedNumber ?? 0 }}/{{ item.sumCrs ?? item.taskNumber ?? 0 }}门课程 @@ -94,7 +92,7 @@ } .item { height: 170rpx; - margin: 32rpx 22rpx; + margin-top: 32rpx; display: flex; .img_div { @@ -151,6 +149,7 @@ flex-wrap: nowrap; height: 23rpx; overflow: hidden; + white-space: nowrap; } .people_progress_div { @@ -160,7 +159,7 @@ font-size: 23rpx; color: #666; margin-bottom: 23rpx; - + white-space: nowrap; line-height: 23rpx; flex-wrap: nowrap; height: 23rpx; diff --git a/src/pages/learningTasks/components/content.vue b/src/pages/learningTasks/components/content.vue index 6992c118..d84bc14b 100644 --- a/src/pages/learningTasks/components/content.vue +++ b/src/pages/learningTasks/components/content.vue @@ -83,5 +83,7 @@ height: calc(100vh - var(--status-bar-height) - 88rpx - 80rpx - 88rpx - 20rpx - 30rpx); background-color: #fff; border-radius: 16rpx; + padding: 0 12rpx 0 22rpx; + box-sizing: border-box; } diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue new file mode 100644 index 00000000..4fc9f487 --- /dev/null +++ b/src/pages/search/result.vue @@ -0,0 +1,535 @@ + + + + + \ No newline at end of file diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue index 63adc9c0..4e33ec9d 100644 --- a/src/pages/search/search.vue +++ b/src/pages/search/search.vue @@ -6,9 +6,10 @@ - + + @@ -55,6 +56,18 @@ diff --git a/src/pagesB.json b/src/pagesB.json index d020e53b..7ac67e83 100644 --- a/src/pagesB.json +++ b/src/pagesB.json @@ -34,6 +34,15 @@ "titleNView": false } } + }, + { + "path": "pages/search/result", + "style": { + "navigationBarTitleText": "", + "app-plus": { + "titleNView": false + } + } } ] } \ No newline at end of file diff --git a/src/static/images/search/result/ability.png b/src/static/images/search/result/ability.png new file mode 100644 index 00000000..bf81184b Binary files /dev/null and b/src/static/images/search/result/ability.png differ diff --git a/src/static/images/search/result/course.png b/src/static/images/search/result/course.png new file mode 100644 index 00000000..5d721a35 Binary files /dev/null and b/src/static/images/search/result/course.png differ diff --git a/src/static/images/search/result/exam.png b/src/static/images/search/result/exam.png new file mode 100644 index 00000000..b4cda33c Binary files /dev/null and b/src/static/images/search/result/exam.png differ diff --git a/src/static/images/search/result/task.png b/src/static/images/search/result/task.png new file mode 100644 index 00000000..97959aa7 Binary files /dev/null and b/src/static/images/search/result/task.png differ diff --git a/src/static/images/search/result/test.png b/src/static/images/search/result/test.png new file mode 100644 index 00000000..7b600932 Binary files /dev/null and b/src/static/images/search/result/test.png differ