diff --git a/.env.development b/.env.development
index e47e198f..53f4e8f1 100644
--- a/.env.development
+++ b/.env.development
@@ -7,7 +7,7 @@ ENV = 'development'
# 苗扬
# VITE_APP_BASE_API_Url = 'http://25.64.16.133:9786'
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# http://25.18.122.65:7001/download/dev-jax.apk
# app入口
#VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001'
diff --git a/.env.production b/.env.production
index 7e159f55..df16bf80 100644
--- a/.env.production
+++ b/.env.production
@@ -3,4 +3,4 @@ ENV = 'production'
# base api
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
diff --git a/src/api/common.js b/src/api/common.js
index 6ae46633..baf0375f 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -93,6 +93,7 @@ export const commonUploadVoiceFile = (file, url, data = {}, fileKey='voice') =>
}
},
fail(error) {
+ console.log(error)
reject(new Error('Upload failed'));
}
});
diff --git a/src/api/socket.js b/src/api/socket.js
index ca9c0b7d..927cc195 100644
--- a/src/api/socket.js
+++ b/src/api/socket.js
@@ -63,7 +63,9 @@ export default class WebSocketUtil {
if(res.data){
const { rtnCode } = JSON.parse(res.data)
console.log('收到WebSocket消息', JSON.parse(res.data) );
- if(['0005', 'QQ0005'].includes(res.rtnCode)) {
+ if(['0005', 'QQ0005'].includes(rtnCode)) {
+ clearInterval(this.reconnectTimer);
+ this.close()
goto_login_fun();
return
}
diff --git a/src/api/study.js b/src/api/study.js
index 77a7c50a..203c30f0 100644
--- a/src/api/study.js
+++ b/src/api/study.js
@@ -1,5 +1,6 @@
import request from '@/api/request'
-
+import { getToken } from '@/common/common.js'
+import { get_base_url } from '@/api/request'
const base_url = '/trastudy'
// 获取课程学习信息接口
@@ -31,6 +32,15 @@ export const deleteTraStdyInfoByIdApi = (data) => {
});
};
+// 重新学习
+export const afreshStudyCourseApi = (data) => {
+ return request({
+ url: base_url + '/traStdyInfo/afreshStudyCourse',
+ method: 'post',
+ toastErrors: true,
+ data
+ });
+};
// 学习段落完成
export const studyParagraphOverApi = (data) => {
return request({
@@ -94,6 +104,17 @@ export const waitMakeEvaluateApi = (data) => {
data
});
};
+// 查询问题评价
+// /traStdyInfo/queryQuestionEvalate
+export const queryQuestionEvalateApi = (data) => {
+ return request({
+ url: base_url + '/traStdyInfo/queryQuestionEvalate',
+ method: 'post',
+ toastErrors: true,
+ data
+ });
+};
+
// /trastudy/intgask/askAbout
// 流式获取文本
@@ -111,25 +132,19 @@ export const getAskAboutRawApi = (data) => {
// toastErrors: false,
// data
// });
- return new Promise((resolve, reject) => {
- request({
+ return request({
url: base_url + '/intgask/askAbout',
header: {
'Accept':'text/event-stream',
- 'content-type': 'application/json; charset=UTF-8',
+ 'content-type': 'text/event-stream; charset=UTF-8',
},
+ responseType: 'arrayBuffer',
method: 'get',
isStream: true,
timeout: 30000,
toastErrors: false,
data
- }).then(res=>{
- console.log(res.data)
- let _str = `[${ res.data.split('}{').join('},{')}]`
- console.log(JSON.parse(_str))
-
})
- });
// return request({
// url: base_url + '/intgask/askAbout',
// header: {
@@ -142,4 +157,15 @@ export const getAskAboutRawApi = (data) => {
// toastErrors: false,
// data
// });
+};
+
+
+// 学习 对话
+export const textChartApi = (data) => {
+ return request({
+ url: base_url + '/traStdychat/textChart',
+ method: 'post',
+ toastErrors: true,
+ data
+ });
};
\ No newline at end of file
diff --git a/src/pages/course/components/chartFour.vue b/src/pages/course/components/chartFour.vue
index 41bd8e4e..03559c0b 100644
--- a/src/pages/course/components/chartFour.vue
+++ b/src/pages/course/components/chartFour.vue
@@ -13,12 +13,12 @@
改进建议:
- 57分
+ {{props.score}}分
-
- 词命中率
- 98
+
+ {{ item.gradeDimensName }}
+ {{ item.anlyGrade }}
@@ -26,15 +26,22 @@
@@ -225,9 +236,9 @@
transform: translateY(v-bind(scoreMarginAbsY));
}
&.score-item2{
- left: 0%;
+ right: 0%;
top: 50%;
- transform: translate(calc(v-bind(scoreMarginX) - 60rpx), calc(-50% + 25rpx));
+ transform: translate(calc(v-bind(scoreMarginAbsX) + 60rpx), calc(-50% + 25rpx));
}
&.score-item3{
left: 50%;
@@ -236,9 +247,9 @@
transform: translateY(v-bind(scoreMarginY));
}
&.score-item4{
- right: 0%;
+ left: 0%;
top: 50%;
- transform: translate(calc(v-bind(scoreMarginAbsX) + 60rpx), calc(-50% + 25rpx));
+ transform: translate(calc(v-bind(scoreMarginX) - 60rpx), calc(-50% + 25rpx));
}
}
}
diff --git a/src/pages/course/components/chartThree.vue b/src/pages/course/components/chartThree.vue
index 426a16e4..34d51e49 100644
--- a/src/pages/course/components/chartThree.vue
+++ b/src/pages/course/components/chartThree.vue
@@ -16,12 +16,12 @@
改进建议:
- 57分
+ {{props.score}}分
-
- 词命中率
- 98
+
+ {{ item.gradeDimensName }}
+ {{ item.anlyGrade }}
@@ -29,15 +29,22 @@