diff --git a/.env.development b/.env.development index f634fee4..70f067d5 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ ENV = 'development' # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' # VITE_APP_BASE_API_Url = 'http://192.168.247.200' # VITE_APP_BASE_API_Url = 'http://aitscdn.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = 'http://192.168.108.129' diff --git a/src/pages.json b/src/pages.json index 6e4e53d5..fbbe360c 100644 --- a/src/pages.json +++ b/src/pages.json @@ -483,6 +483,33 @@ "titleNView": false } } + }, + { + "path": "pages/sparring/talk", + "style": { + "navigationBarTitleText": "AI陪练通话", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/sparring/result", + "style": { + "navigationBarTitleText": "AI陪练报告", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/static/study", + "style": { + "navigationBarTitleText": "学习分析", + "app-plus": { + "titleNView": false + } + } } ], "tabBar": { diff --git a/src/pages/course/components/chartFive.vue b/src/pages/course/components/chartFive.vue index b43d42ed..d0c8a0c9 100644 --- a/src/pages/course/components/chartFive.vue +++ b/src/pages/course/components/chartFive.vue @@ -9,11 +9,15 @@ - + 改进建议: - + + + 维度分析: + + {{ score }} @@ -37,6 +41,10 @@ size:{ default: 262, type: [Number,String] + }, + fromType:{ + default: 'crs', + type: String } }, data(){ @@ -96,7 +104,7 @@ return `polygon(${_tx}% ${_ty}%, ${_rx}% ${_ry}%, ${_bx}% ${_by}%, ${_lx}% ${_ly}%, ${_lxl}% ${_lyl}%)` }, styleFiveResult(){ - let score = this.dataList + let score = this.dataValue if(score.length >= 5){ let base = 50 let _tx = 50 @@ -253,9 +261,17 @@ line-height: 46rpx; font-size: 32rpx; color: #fff; - .title-icon{ + position: relative; + .title-icon { width: 27rpx; height: 27rpx; + + &.icon-tra{ + position: relative; + top: 4rpx; + width: 32rpx; + height: 32rpx; + } } } .total-score{ diff --git a/src/pages/course/components/chartFour.vue b/src/pages/course/components/chartFour.vue index 3b2130db..976ca8c3 100644 --- a/src/pages/course/components/chartFour.vue +++ b/src/pages/course/components/chartFour.vue @@ -4,19 +4,23 @@ - + - - + + 改进建议: - - {{props.score}}分 - + + + 维度分析: - + + {{ props.score }}分 + + + {{ item.gradeDimensName || item.gradeDimens }} {{ item.anlyGrade }} @@ -24,81 +28,90 @@ \ No newline at end of file diff --git a/src/pages/course/components/chartSix.vue b/src/pages/course/components/chartSix.vue new file mode 100644 index 00000000..871c6854 --- /dev/null +++ b/src/pages/course/components/chartSix.vue @@ -0,0 +1,342 @@ + + + \ No newline at end of file diff --git a/src/pages/course/components/chartThree.vue b/src/pages/course/components/chartThree.vue index d96b33ac..dda5f596 100644 --- a/src/pages/course/components/chartThree.vue +++ b/src/pages/course/components/chartThree.vue @@ -7,19 +7,23 @@ - + - - + + 改进建议: - - {{props.score}}分 - + + + 维度分析: - + + {{ props.score }}分 + + + {{ item.gradeDimensName || item.gradeDimens }} {{ item.anlyGrade }} @@ -27,130 +31,144 @@ \ No newline at end of file diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue new file mode 100644 index 00000000..a5e69ae3 --- /dev/null +++ b/src/pages/sparring/result.vue @@ -0,0 +1,388 @@ + + + + + \ No newline at end of file diff --git a/src/pages/sparring/talk.vue b/src/pages/sparring/talk.vue new file mode 100644 index 00000000..c163da20 --- /dev/null +++ b/src/pages/sparring/talk.vue @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/src/pages/static/study.vue b/src/pages/static/study.vue new file mode 100644 index 00000000..02409e35 --- /dev/null +++ b/src/pages/static/study.vue @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/src/pagesB.json b/src/pagesB.json index fc7e5451..bf703f4c 100644 --- a/src/pagesB.json +++ b/src/pagesB.json @@ -89,6 +89,33 @@ "titleNView": false } } + }, + { + "path": "pages/sparring/talk", + "style": { + "navigationBarTitleText": "AI陪练通话", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/sparring/result", + "style": { + "navigationBarTitleText": "AI陪练报告", + "app-plus": { + "titleNView": false + } + } + }, + { + "path": "pages/static/study", + "style": { + "navigationBarTitleText": "学习分析", + "app-plus": { + "titleNView": false + } + } } ] } \ No newline at end of file diff --git a/src/static/images/sparring/def-res.png b/src/static/images/sparring/def-res.png new file mode 100644 index 00000000..a9a4b2a0 Binary files /dev/null and b/src/static/images/sparring/def-res.png differ diff --git a/src/static/images/sparring/den-icon.png b/src/static/images/sparring/den-icon.png new file mode 100644 index 00000000..fee97e09 Binary files /dev/null and b/src/static/images/sparring/den-icon.png differ diff --git a/src/static/images/sparring/feedback.png b/src/static/images/sparring/feedback.png new file mode 100644 index 00000000..e81f958c Binary files /dev/null and b/src/static/images/sparring/feedback.png differ diff --git a/src/static/images/sparring/info-icon.png b/src/static/images/sparring/info-icon.png new file mode 100644 index 00000000..a99c1a77 Binary files /dev/null and b/src/static/images/sparring/info-icon.png differ diff --git a/src/static/images/sparring/pass-res.png b/src/static/images/sparring/pass-res.png new file mode 100644 index 00000000..c12f8ec2 Binary files /dev/null and b/src/static/images/sparring/pass-res.png differ diff --git a/src/static/images/sparring/time-icon.png b/src/static/images/sparring/time-icon.png new file mode 100644 index 00000000..52f8e78b Binary files /dev/null and b/src/static/images/sparring/time-icon.png differ