-
开始答题
+
+
diff --git a/src/views/myreport/index.vue b/src/views/myreport/index.vue
index d85b386..7048c8b 100644
--- a/src/views/myreport/index.vue
+++ b/src/views/myreport/index.vue
@@ -8,10 +8,10 @@
:headStyle="{ paddingLeft: '0px !important' }"
>
- {{ viewReport.courseName }}
+ {{ viewReport.courseName }}
交卷时间:{{ viewReport.submitTime }}
- 答题用时:{{ viewReport.totalScore }}
+ 答题用时:{{ (viewReport.answerTime/60).toFixed(2) || 0 }}分钟
@@ -24,7 +24,7 @@
:headStyle="{ paddingLeft: '0px !important' }"
>
- {{ viewReport.courseName }}
+ {{ viewReport.courseName }}
@@ -43,7 +43,6 @@
import DbQuestionInfoItem from '@/components/DbQuestionInfoItem/index.vue'
import DbReport from '@/components/DbReport/index.vue'
import { answerViewReport, answerViewResolution } from '@/api/practice/report'
-import { reqExamViewReport, reqExamViewResolution } from '@/api/myexam/exam.js'
export default {
components: { DbQuestionInfoItem, DbReport },
diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue
index 08a0080..c7dab8f 100644
--- a/src/views/user/Login.vue
+++ b/src/views/user/Login.vue
@@ -1,6 +1,12 @@
-
+
学员
@@ -18,7 +24,14 @@
- 登录
+
+ 登录
+
+
+
+
+ 注册
+
@@ -54,17 +67,25 @@ export default {
this.$refs.ruleForm.validate(valid => {
const { form } = this
if (valid) {
- this.Login(form).then(() => {
- this.loginSuccess()
- }, () => {
- this.requestFailed()
- })
+ this.Login(form).then(
+ () => {
+ this.loginSuccess()
+ },
+ () => {
+ this.requestFailed()
+ }
+ )
} else {
this.loading = false
return false
}
})
},
+ handlerRegister () {
+ this.$router.push({
+ path: '/user/register'
+ })
+ },
loginSuccess (res) {
this.loading = false
this.$router.push({ path: '/' })
@@ -83,5 +104,4 @@ export default {
}
-
+
diff --git a/src/views/user/Register.vue b/src/views/user/Register.vue
index 341bd33..ba57ec2 100644
--- a/src/views/user/Register.vue
+++ b/src/views/user/Register.vue
@@ -6,14 +6,14 @@
@@ -21,7 +21,7 @@
强度:{{ passwordLevelName }}
- 请至少输入 6 个字符。请不要使用容易被猜到的密码。
+ 请输入至少包括大写、小写、数字、特殊符号中的三种,密码长度至少为8位。
@@ -29,8 +29,8 @@