diff --git a/api/index.js b/api/index.js
index f015655..e2d8ec8 100644
--- a/api/index.js
+++ b/api/index.js
@@ -74,7 +74,14 @@ export const getHistoricalApprovalRecords = (params) => post('/app/Task/getHis',
export const getIsUploadFace = (params) => post('/app/user/getUserFace', params) // 获取是否上传人脸信息
export const getClassList = (params) => post('/app/stagestudentrelation/pageTaskByUser', params) //获取班级列表
export const joinClass = (params) => uploads('/app/student/joinClass', params) // 实名认证信息提交
-export const getTaskScoreInfo = (params) => post('/app/stageexam/findResult', params) // 考试成绩详情
+export const getSignInfo = (params) => post('/app/student/signinfo', params) // 获取签到信息
+export const getTaskScoreInfo = (params) => post('/app/stageexam/findResult', params) // 考试成绩记录详情
export const getExamExercises = (params) => post('/app/stageexam/getExam', params) // 考试习题
export const setTestPaperSubmission = (params) => post('/app/stageexam/submit', params) // 考试交卷
+export const submitEditUserFace = (params) => post('/app/user/editUserFace', params) // 提交照片人脸
+export const submitEditUserVideoFace = (params) => post('/app/user/editUserVideoFace', params) // 提交视频人脸
+export const compareUserFaceCertify = (params) => post('/app/user/compareFace', params) // 照片人脸认证
+export const compareUserVideoFaceCertify = (params) => post('/app/user/compareVideoFace', params) // 视频人脸验证
+export const compareUserExamFaceCertify = (params) => post('/app/user/compareExamFace', params) // 考试照片人脸认证
+export const compareUserExamVideoFaceCertify = (params) => post('/app/user/compareExamVideoFace', params) // 考试视频人脸认证
// ********************* end ***********************
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 13326fc..a457a9f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,144 +1,180 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 扫码
-
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 扫码
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/mine/index/index.vue b/pages/mine/index/index.vue
index e6b32ba..59a713f 100644
--- a/pages/mine/index/index.vue
+++ b/pages/mine/index/index.vue
@@ -64,6 +64,11 @@ export default {
name: '个人信息',
url: '/pages/mine/information/index'
},
+ {
+ img: require('../../../static/images/my_ico2.png'),
+ name: '人脸认证',
+ url: '/pages/train_management/face_authentication?type=update_facial_input'
+ },
{
img: require('../../../static/images/my_ico3.png'),
name: '问题反馈',
diff --git a/pages/train_management/course_exam.vue b/pages/train_management/course_exam.vue
index c09b446..38cfe9a 100644
--- a/pages/train_management/course_exam.vue
+++ b/pages/train_management/course_exam.vue
@@ -18,19 +18,19 @@
-
+
A
{{ options[current].OPTIONA }}
-
+
B
{{ options[current].OPTIONB }}
-
+
C
{{ options[current].OPTIONC }}
-
+
D
{{ options[current].OPTIOND }}
@@ -39,7 +39,7 @@
@@ -49,7 +49,7 @@
@@ -59,7 +59,7 @@
@@ -69,7 +69,7 @@
@@ -78,11 +78,11 @@
-
+
{{ options[current].OPTIONA }}
-
+
{{ options[current].OPTIONB }}
@@ -108,7 +108,7 @@ import {
getExamExercises,
// getStrengthenExam,
setTestPaperSubmission,
-} from '../../api'
+} from '@/api';
export default {
data() {
@@ -133,7 +133,6 @@ export default {
}
},
onLoad(query) {
- console.log('query :>> ', query);
this.routeQuery = query
// this.STAGEEXAMPAPER_ID = query.STAGEEXAMPAPER_ID;
// this.entrySite = query.entrySite;
diff --git a/pages/train_management/exam_record.vue b/pages/train_management/exam_record.vue
index 00235a4..9b9469e 100644
--- a/pages/train_management/exam_record.vue
+++ b/pages/train_management/exam_record.vue
@@ -17,8 +17,7 @@
- 当前试题: {{ current + 1 }}/{{ questionList.length }}
+ 当前试题: {{ current + 1 }}/{{ questionList.length }}
@@ -92,7 +91,7 @@
diff --git a/pages/train_management/index.vue b/pages/train_management/index.vue
index 20cf59a..8add4b1 100644
--- a/pages/train_management/index.vue
+++ b/pages/train_management/index.vue
@@ -45,11 +45,13 @@
\ No newline at end of file
diff --git a/static/images/my_ico2.png b/static/images/my_ico2.png
new file mode 100644
index 0000000..dd95406
Binary files /dev/null and b/static/images/my_ico2.png differ
diff --git a/store/index.js b/store/index.js
index cf0b9e9..ffa18fa 100644
--- a/store/index.js
+++ b/store/index.js
@@ -5,6 +5,8 @@ import createPersistedState from 'vuex-persistedstate'
Vue.use(Vuex)
const store = new Vuex.Store({
state: {
+ /** 人脸检测验证状态 ["0": 未完成人脸认证; "1": 已完成人脸认证] */
+ verification: "0",
userInfo: {
CORPINFO_ID: '',
DEPARTMENT_ID: '',
@@ -19,16 +21,23 @@ const store = new Vuex.Store({
},
getters: {
getUserInfo: state => state.userInfo,
+ getVerification: state => state.verification,
},
mutations: {
setUserInfo(state, userInfo) {
state.userInfo = userInfo
- }
+ },
+ setVerification(state, verification) {
+ state.verification = verification
+ },
},
actions: {
setUserInfo({commit}, userInfo) {
commit('setUserInfo', userInfo)
- }
+ },
+ setVerification({commit}, verification) {
+ commit('setVerification', verification)
+ },
},
plugins: [
createPersistedState({
diff --git a/utils/request.js b/utils/request.js
index 0adc3a0..c3932f9 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,5 @@
// let requestPath = 'https://qggf.qhdsafety.com/xgfApi/'; // 后台请求地址
-let requestPath = 'http://192.168.0.37:8058//xgf_gwj/'; // 后台请求地址
+let requestPath = 'http://192.168.0.37:8058/xgf_gwj_2.0'; // 后台请求地址
// let requestPath = 'https://skqhdg.porthebei.com:9006/qa-prevention-xgf/'; // 后台请求地址
// let requestPath = 'https://qgxgf.qhdsafety.com/qa-prevention-xgf/'; // 外网地址
import store from '../store/index'