diff --git a/config.js b/config.js index 211e21e..0a7f9b5 100644 --- a/config.js +++ b/config.js @@ -1,67 +1,18 @@ // 产线 -// module.exports = { -// // http://192.168.0.14:19999 -// loginBaseUrl: 'http://112.29.103.165:1616', -// baseUrl: 'http://112.29.103.165:1616/exam', -// // login: 'http://112.29.103.165:1616', -// login: 'http://112.29.103.165:1616/exam/exam-auth/', -// // 图片展示基础地址 -// fileUrl: 'http://112.29.103.165:1616/exam-file/', -// // 上传文件地址 -// uploadUrl: 'http://112.29.103.165:1616/exam-file/file/uploadBase64', -// bmwUrl: 'http://112.29.103.165:1616/exam-bmw', -// // 体检-基础路径 -// tjBaseUrl: 'http://112.29.103.165:1616/AppPeaManager', -// tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/', - -// //实名制移动端-登录接口 -// realLoginUrl: 'http://192.168.0.14:1616/auth/', -// realBaseUrl: 'http://192.168.0.14:1910/', -// //实名制移动端-移动 -// realAppUrl: 'http://192.168.0.14:1913/app', -// //实名制移动端-安培 -// realExamUrl: 'http://192.168.0.14:1616/system', -// //实名制移动端-文件 -// realFileUrl: 'http://192.168.0.14:1909/file/', -// //实名制移动端 -// realBmwUrl: 'http://192.168.0.14:1616/bmw', -// //实名制移动端 -- 新 -// realNewBmwUrl: 'http://192.168.0.14:1616', -// loginUrl: 'http://192.168.0.14:27018', -// //实名制移动端 -- 新 -// realNewYnUrl: 'http://192.168.0.14:1918', -// realIdCardUrl: 'http://192.168.0.14:26699', - -// //作业计划 -- 新 -// workPlanNewYnUrl: 'http://192.168.0.14:19191', - -// // 应用信息 -// appInfo: { -// // 应用名称 -// name: '作业管控智慧平台', -// // 应用版本 -// version: '1.1.0' -// } -// } -// 测试环境 module.exports = { - // baseUrl:'/prod-api', // http://192.168.0.14:19999 - loginBaseUrl: 'http://192.168.0.14:27018', - // loginBaseUrl:'http://192.168.0.14:19999', - // baseUrl:'http://192.168.0.14:2900', - baseUrl: 'http://192.168.0.14:19999', - // loginUrl: 'http://112.29.103.165:1616', - login: 'http://192.168.0.14:19200', + loginBaseUrl: 'http://112.29.103.165:1616', + baseUrl: 'http://112.29.103.165:1616/exam', + // login: 'http://112.29.103.165:1616', + login: 'http://112.29.103.165:1616/exam/exam-auth/', // 图片展示基础地址 - fileUrl: 'http://192.168.0.14:19999/exam-file/', + fileUrl: 'http://112.29.103.165:1616/exam-file/', // 上传文件地址 - uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64', - bmwUrl: 'http://192.168.0.14:19999/exam-bmw', + uploadUrl: 'http://112.29.103.165:1616/exam-file/file/uploadBase64', + bmwUrl: 'http://112.29.103.165:1616/exam-bmw', // 体检-基础路径 - tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager', - // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager', - tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/', + tjBaseUrl: 'http://112.29.103.165:1616/AppPeaManager', + tjFile: 'http://112.29.103.165:1616/medicalDocumentation/statics/', //实名制移动端-登录接口 realLoginUrl: 'http://192.168.0.14:1616/auth/', @@ -92,3 +43,52 @@ module.exports = { version: '1.1.0' } } +// 测试环境 +// module.exports = { +// // baseUrl:'/prod-api', +// // http://192.168.0.14:19999 +// loginBaseUrl: 'http://192.168.0.14:27018', +// // loginBaseUrl:'http://192.168.0.14:19999', +// // baseUrl:'http://192.168.0.14:2900', +// baseUrl: 'http://192.168.0.14:19999', +// // loginUrl: 'http://112.29.103.165:1616', +// login: 'http://192.168.0.14:19200', +// // 图片展示基础地址 +// fileUrl: 'http://192.168.0.14:19999/exam-file/', +// // 上传文件地址 +// uploadUrl: 'http://192.168.0.14:19999/exam-file/file/uploadBase64', +// bmwUrl: 'http://192.168.0.14:19999/exam-bmw', +// // 体检-基础路径 +// tjBaseUrl: 'http://192.168.0.14:18077/AppPeaManager', +// // tjBaseUrl: 'http://192.168.2.91:19100/AppPeaManager', +// tjFile: 'http://192.168.0.14:18077/medicalDocumentation/statics/', + +// //实名制移动端-登录接口 +// realLoginUrl: 'http://192.168.0.14:1616/auth/', +// realBaseUrl: 'http://192.168.0.14:1910/', +// //实名制移动端-移动 +// realAppUrl: 'http://192.168.0.14:1913/app', +// //实名制移动端-安培 +// realExamUrl: 'http://192.168.0.14:1616/system', +// //实名制移动端-文件 +// realFileUrl: 'http://192.168.0.14:1909/file/', +// //实名制移动端 +// realBmwUrl: 'http://192.168.0.14:1616/bmw', +// //实名制移动端 -- 新 +// realNewBmwUrl: 'http://192.168.0.14:1616', +// loginUrl: 'http://192.168.0.14:27018', +// //实名制移动端 -- 新 +// realNewYnUrl: 'http://192.168.0.14:1918', +// realIdCardUrl: 'http://192.168.0.14:26699', + +// //作业计划 -- 新 +// workPlanNewYnUrl: 'http://192.168.0.14:19191', + +// // 应用信息 +// appInfo: { +// // 应用名称 +// name: '作业管控智慧平台', +// // 应用版本 +// version: '1.1.0' +// } +// } diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue index 19fa8b0..4387fa6 100644 --- a/pages/YNEduApp/prac/exercises.vue +++ b/pages/YNEduApp/prac/exercises.vue @@ -33,6 +33,7 @@
{{ nowNum }}/{{ allNum }}
+
-
正确答案：{{ item.correctGrade }}
-
你的答案：{{ item.select }}
+
+
正确答案：{{ item.correctGrade }}
+
你的答案：{{ item.select }}
+
+
-
答案解析：
-
{{ item.answerAnaly }}
+
+
+ 答案解析： +
+
+ {{ item.answerAnaly || '暂无' }} +
@@ -142,11 +151,19 @@
-
正确答案：{{ item.correctGrade.split('').join('、') }}
-
你的答案：{{ item.select && item.select.join('、') }}
+
+
正确答案：{{ item.correctGrade.split('').join('、') }}
+
你的答案：{{ item.select && item.select.join('、') }}
+
+ -
知识点
-
{{ item.answerAnaly }}
+
+
+ 知识点： +
+
+ {{ item.answerAnaly || '暂无' }} +
@@ -185,20 +202,12 @@ - - -
{{ correctRate }}%
+ +
+
+
本次答题正确率
+
{{ correctRate }}%
+
{{ answerNum }}
@@ -213,8 +222,12 @@
答题时长
- - +
+ + +
+
+
@@ -238,6 +251,7 @@
{{ nowNum }}/{{ allNum }}
+
@@ -270,8 +284,10 @@ import { updStudyDurationExamPractice } from '@/api/eduApp' import config from '@/config' +import uLine from '../../../uni_modules/uview-ui/components/u-line/u-line.vue' export default { + components: { uLine }, data() { return { isLoading: false, @@ -752,25 +768,6 @@ export default { // 计算正确率 = 正确题数 / 已答题数 this.correctRate = rate == 'NaN' ? '0' : rate this.showModal = true - // const params = { - // id: this.practiceId - // } - // uni.request({ - // url: config.baseUrl + '/exam-student/studentPractice/getPracticeQuestionRate', - // method: 'post', - // data: params, - // header: { - // 'Content-Type': 'application/x-www-form-urlencoded', - // Authorization: uni.getStorageSync('access_token') - // }, - // success: res => { - // console.log('🚀 ~ handleSubmit ~ res:', res) - // res = res.data - // }, - // fail: err => { - // console.log(err) - // } - // }) }, handleConfirm() { console.log('确认') @@ -959,40 +956,75 @@ export default { justify-content: flex-end; align-items: center; } +.answer { + margin: 15px 0; + padding: 10px; + background: #f6f9fc; + border-radius: 5px; +} +.pop-content { + .top-title { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + color: #fff; + font-weight: 700; + background: #1f92df; + border-radius: 10px 10px 0 0; + line-height: 1; + .title { + margin: 20px 0; + font-size: 16px; + } + .correctRate { + margin-bottom: 20px; + font-size: 28px; + } + } + + .modal-container { + display: flex; + justify-content: space-around; + align-items: center; + margin: 20px 10px; + background: #f6f9fc; + border-radius: 5px; + height: 73px; + + .item { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + color: #9d9b9b; + font-size: 14px; + .num { + font-size: 19px; + font-weight: 600; + color: #3185f0; + } + } + } + + .pop-btn { + margin-bottom: 20px; + padding: 0 30px; + display: flex; + justify-content: space-between; + align-items: center; + .custom-style { + width: 100px; + } + } +} .wrapper { height: 100vh; /* background: url('/static/images/question-bg.png') no-repeat; */ background: #fff; background-size: 100% 100%; - - .slot-content { - width: 100%; - .correctRate { - text-align: center; - } - - .modal-container { - display: flex; - justify-content: space-around; - align-items: center; - margin-top: 20px; - background: #f5f8fb; - border-radius: 5px; - height: 73px; - - .item { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - color: #9d9b9b; - .num { - color: #3185f0; - } - } - } - } .topic-content { + padding: 10px; display: flex; /* justify-content: space-between; */ align-items: flex-start; @@ -1098,13 +1130,22 @@ export default { } .analysis { - margin-top: 20px; + margin-top: 8px; font-weight: 700; + display: flex; + align-items: center; + .line { + border: 2px solid #1f92df; + margin-right: 4px; + } } .analysis-container { margin-top: 6px; color: #475583; text-indent: 1em; + background: #f6f9fc; + border-radius: 5px; + padding: 10px; } } @@ -1116,12 +1157,13 @@ export default { .num-wrapper { display: flex; justify-content: space-around; - margin: 15px 6%; + margin: 15px 9%; .correct, .error, .total { display: flex; + justify-content: center; align-items: center; margin: 0 6px; }