guoyuepeng
/
qa-prevention-xgf-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'xgf-training-dev' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-xgf-app into xgf-training-dev 

# Conflicts:
#	pages/train_management/realname_info_auth.vue
xgf-training-dev
wangyan 2025-02-19 14:35:13 +08:00
parent 18486ab2f2 40bfdf1cf7
commit 00474fc0be
4 changed files with 463 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/index.js
View File

@ -72,10 +72,7 @@ export const getHistoricalApprovalRecords = (params) => post("/app/Task/getHis",
// **************************************************** // ****************************************************
// ************* 以下接口培训管理流程使用 *************** // ************* 以下接口培训管理流程使用 ***************
// ********************* start *********************** // ********************* start ***********************
export const getIsUploadFace = (params) => post("/app/user/getUserFace", params); // 获取是否上传人脸信息
/**
* 获取班级管理分页列表
*/
export const getClassList = (params) => post("/app/stagestudentrelation/pageTaskByUser", params); //获取班级列表 export const getClassList = (params) => post("/app/stagestudentrelation/pageTaskByUser", params); //获取班级列表
export const joinClass = (params) => post("/app/student/joinClass", params); //实名认证信息提交 export const joinClass = (params) => uploads("/app/student/joinClass", params); // 实名认证信息提交
// ********************* end *********************** // ********************* end ***********************

10
pages/train_management/face_authentication.nvue
View File

@ -60,12 +60,13 @@ export default {
// scan_face 扫码 // scan_face 扫码
// learning_certification 学习认证 // learning_certification 学习认证
// meeting_attendance 会议签到 // meeting_attendance 会议签到
const typeKey = ["scan_face", "learning_certification"]; const typeKey = ["facial_input", "scan_face", "learning_certification"];
if (!typeKey.includes(query.type)) { if (!typeKey.includes(query.type)) {
uni.$u.toast("type参数错误"); uni.$u.toast("type参数错误");
return; return;
} }
this.isFirst = query.isFirst || ""; this.isFirst = query.isFirst || "";
if (query.type === "facial_input") this.btnTextStr = "人脸认证";
if (query.type === "scan_face") this.btnTextStr = "签到"; if (query.type === "scan_face") this.btnTextStr = "签到";
if (query.type === "learning_certification") this.btnTextStr = "开始考试"; if (query.type === "learning_certification") this.btnTextStr = "开始考试";
this.type = query.type; this.type = query.type;
@ -74,7 +75,7 @@ export default {
}, },
onBackPress(event) { onBackPress(event) {
if (event.from === "backbutton") { if (event.from === "backbutton") {
if ( if (this.type === "facial_input" ||
(this.type === "scan_face" && this.isFirst === "1") || (this.type === "scan_face" && this.isFirst === "1") ||
this.type === "learning_certification" this.type === "learning_certification"
) { ) {
@ -125,7 +126,10 @@ export default {
speech.indexOf("base64,") + 7, speech.indexOf("base64,") + 7,
); );
try { try {
if (this.type === "scan_face") { if (this.type === "facial_input") {
uni.$u.toast("人脸认证成功");
uni.navigateBack({ delta: 1 });
} else if (this.type === "scan_face") {
// await setScanCodeToVerifyFace({ // await setScanCodeToVerifyFace({
// USERAVATARPREFIX, // USERAVATARPREFIX,
// USERAVATARURL, // USERAVATARURL,

108
pages/train_management/index.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<view class="content"> <view class="content">
<u-list @scrolltolower="scrolltolower"> <u-list @scrolltolower="scrolltolower" v-if="trainList.length > 0">
<u-list-item v-for="(item, index) in trainList" :key="index"> <u-list-item v-for="(item, index) in trainList" :key="index">
<view class="container_item"> <view class="container_item">
<view class="container_item_name"> <view class="container_item_name">
@ -28,14 +28,10 @@
</view> </view>
<view class="content_text"> <view class="content_text">
<view class="content_bottom"> <view class="content_bottom">
<view> <view> <text class="content_label">任务状态: </text>{{ handleCalcTaskStatus(item.state) }} </view>
<text class="content_label">任务状态: </text>{{ handleCalcTaskStatus(item.state) }}
</view>
<view class="action-row"> <view class="action-row">
<u-button size="mini" type="primary" text="签到信息" :disabled="item.userSignPath==='0'" <u-button size="mini" type="primary" text="签到信息" :disabled="item.userSignPath === '0'" @click="signInInformation(item.classId)" />
@click="signInInformation(item.classId)" /> <u-button size="mini" type="primary" text="考试记录" :disabled="item.stageexamstate === '1' || item.stageexamstate === '4'" @click="ExamRecord(item.classId)" />
<u-button size="mini" type="primary" text="考试记录" :disabled="item.stageexamstate==='1' || item.stageexamstate ==='4'"
@click="ExamRecord(item.classId)" />
</view> </view>
</view> </view>
</view> </view>
@ -43,11 +39,13 @@
</view> </view>
</u-list-item> </u-list-item>
</u-list> </u-list>
<empty v-else></empty>
</view> </view>
</template> </template>
<script> <script>
import { getClassList } from '../../api'; import { getClassList } from '../../api'
export default { export default {
data() { data() {
@ -57,10 +55,10 @@
totalPage: 0, totalPage: 0,
trainList: [], trainList: [],
taskStatusMap: { taskStatusMap: {
1: "待完善", 1: '待完善',
4: "待开班", 4: '待开班',
5: "培训中", 5: '培训中',
6: "培训结束" 6: '培训结束'
} }
} }
}, },
@ -70,15 +68,19 @@
this.resetList() this.resetList()
}, },
async onLoad(query) {
console.log('页面加载完成 :>> ', query)
// await this.getUserFaceCompleted()
},
methods: { methods: {
async getData() { async getData() {
let resData = await getClassList({ let resData = await getClassList({
showCount: this.pageSize, showCount: this.pageSize,
currentPage: this.currentPage, currentPage: this.currentPage
}); })
console.log(resData) this.trainList = [...this.trainList, ...resData.page.list]
this.trainList = [...this.trainList, ...resData.page.list]; this.totalPage = resData.page.totalPage
this.totalPage = resData.page.totalPage;
}, },
resetList() { resetList() {
this.pageSize = 10 this.pageSize = 10
@ -94,44 +96,66 @@
* 右上角自定义扫码图标触发事件 * 右上角自定义扫码图标触发事件
*/ */
onNavigationBarButtonTap(e) { onNavigationBarButtonTap(e) {
// 只允许通过手机相机扫码
uni.scanCode({
// scanType: ['qrCode'], // 仅支持二维码扫码
onlyFromCamera: false, // 是否只能从相机扫码，不允许从相册选择图片
hideAlbum: false, // 隐藏相册,不允许从相册选择图片,只能从相机扫码
success: function (response) {
const { id, type } = JSON.parse(response.result);
if (type === '0') {
// 签到二维码方式进入
uni.$u.route({ uni.$u.route({
url: '/pages/train_management/realname_info_auth', url: '/pages/train_management/realname_info_auth',
params: { params: {
type: 'scan_face', type: 'scan_face',
classId: id
} }
}) })
// 只允许通过手机相机扫码 } else if (type === '1') {
// uni.scanCode({ // 考试二维码方式进入
// // scanType: ['qrCode'], // 仅支持二维码扫码 uni.$u.route({
// onlyFromCamera: false, // 是否只能从相机扫码，不允许从相册选择图片 url: '/pages/train_management/face_authentication',
// hideAlbum: false, // 隐藏相册,不允许从相册选择图片,只能从相机扫码 params: {
type: 'learning_certification',
classId: id
}
})
}
},
fail: function (error) {
console.log('error :>> ', error)
},
complete: function (result) {
console.log('扫码完成,正在跳转功能页!')
}
})
},
/**
* 获取是否已经完成上传人脸信息
*/
// async getUserFaceCompleted() {
// const userFaceData = await getIsUploadFace()
// console.log('userFaceData :>> ', userFaceData)
// if (!userFaceData?.data) {
// uni.showModal({
// title: '温馨提示',
// content: '检测到您还未完成人脸信息读取，请先完成人脸信息认证!',
// success: function (res) { // success: function (res) {
// if (res.result === '0') { // if (res.confirm) {
// // 签到二维码方式进入
// uni.$u.route({
// url: '/pages/train_management/realname_info_auth',
// params: {
// type: 'scan_face',
// }
// })
// } else if (res.result === '1') {
// // 考试二维码方式进入
// uni.$u.route({ // uni.$u.route({
// url: '/pages/train_management/face_authentication', // url: '/pages/train_management/face_authentication',
// params: { // params: {
// type: 'learning_certification' // type: 'facial_input'
// }
// })
// } else if (res.cancel) {
// uni.navigateBack({ delta: 1 });
// }
// } // }
// }) // })
// } // }
// }, // },
// fail: function(error) {
// console.log("error :>> ", error)
// },
// complete: function(result) {
// console.log("扫码完成,正在跳转功能页!")
// }
// });
},
handleCalcTaskStatus(type) { handleCalcTaskStatus(type) {
return this.taskStatusMap[type] return this.taskStatusMap[type]
}, },

202
pages/train_management/realname_info_auth.vue
View File

@ -10,43 +10,31 @@
<u--input v-model="ruleFormData.userInfo.name" placeholder="请输入姓名..." border="none"></u--input> <u--input v-model="ruleFormData.userInfo.name" placeholder="请输入姓名..." border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="80" label="联系电话" prop="userInfo.phone" borderBottom required> <u-form-item labelWidth="80" label="联系电话" prop="userInfo.phone" borderBottom required>
<u--input v-model="ruleFormData.userInfo.phone" type="number" placeholder="请输入联系电话..." <u--input v-model="ruleFormData.userInfo.phone" type="number" placeholder="请输入联系电话..." border="none"></u--input>
border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="80" label="身份证号" prop="userInfo.userIdCard" borderBottom required> <u-form-item labelWidth="80" label="身份证号" prop="userInfo.userIdCard" borderBottom required>
<u--input v-model="ruleFormData.userInfo.userIdCard" placeholder="请输入身份证号..." border="none"></u--input> <u--input v-model="ruleFormData.userInfo.userIdCard" placeholder="请输入身份证号..." border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="70" label="性别" prop="userInfo.sex" borderBottom required> <u-form-item labelWidth="70" label="性别" prop="userInfo.sex" borderBottom required>
<u-radio-group v-model="ruleFormData.userInfo.sex" placement="row" class="radio-group__style" <u-radio-group v-model="ruleFormData.userInfo.sex" placement="row" class="radio-group__style">
@change="groupChange"> <u-radio v-for="(item, index) in sexsList" :key="index" :label="item.name" :name="item.name"> </u-radio>
<u-radio v-for="(item, index) in sexsList" :key="index" :label="item.name" :name="item.name">
</u-radio>
</u-radio-group> </u-radio-group>
</u-form-item> </u-form-item>
<u-form-item labelWidth="70" label="学历" prop="userInfo.degreeOfEducation" borderBottom required <u-form-item labelWidth="70" label="学历" prop="userInfo.degreeOfEducation" borderBottom required @click="handleEducationClick">
@click="handleEducationClick">
<u--input v-model="ruleFormData.userInfo.degreeOfEducation" readonly placeholder="请选择学历..." border="none"></u--input> <u--input v-model="ruleFormData.userInfo.degreeOfEducation" readonly placeholder="请选择学历..." border="none"></u--input>
<!-- <u-action-sheet :show="showEducationPopper" :actions="educationActions" title="请选择学历"
@close="showEducationPopper = false" @select="handleSelectEducation">
</u-action-sheet> -->
</u-form-item> </u-form-item>
<u-form-item labelWidth="70" label="职业" prop="userInfo.job" borderBottom required> <u-form-item labelWidth="70" label="职业" prop="userInfo.job" borderBottom required>
<u--input v-model="ruleFormData.userInfo.job" placeholder="请输入职业..." border="none"></u--input> <u--input v-model="ruleFormData.userInfo.job" placeholder="请输入职业..." border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item labelWidth="125" label="职业资格等级证书" prop="userInfo.gradeCertificate" borderBottom required> <u-form-item labelWidth="125" label="职业资格等级证书" prop="userInfo.gradeCertificate" borderBottom required>
<u-upload :fileList="ruleFormData.userInfo.gradeCertificate" :previewFullImage="true" @afterRead="afterRead" <u-upload :fileList="ruleFormData.userInfo.gradeCertificate" previewFullImage @afterRead="afterRead" @delete="deletePic" name="1" multiple :maxCount="1"></u-upload>
@delete="deletePic" name="1" multiple :maxCount="1"></u-upload>
</u-form-item> </u-form-item>
<u-form-item labelWidth="120" label="获得证书时间" prop="userInfo.certificateAcquisitionTime" borderBottom required <u-form-item labelWidth="120" label="获得证书时间" prop="userInfo.certificateAcquisitionTime" borderBottom required @click="showCertificateGetTime">
@click="showCertificateGetTime"> <u--input v-model="ruleFormData.userInfo.certificateAcquisitionTime" readonly placeholder="请选择获得证书时间..." border="none"></u--input>
<u--input v-model="ruleFormData.userInfo.certificateAcquisitionTime" readonly placeholder="请选择获得证书时间..."
border="none"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="手写签字" prop="userInfo.writeSign" borderBottom required labelPosition="top" labelWidth="auto"> <u-form-item label="手写签字" prop="userInfo.writeSign" borderBottom required labelPosition="top" labelWidth="auto">
<view style="flex: 1;"> <view style="flex: 1">
<u-button type="primary" size="mini" text="签字" <u-button type="primary" size="mini" text="签字" :customStyle="{ position: 'absolute', top: '-46upx', right: '20upx', width: '100upx' }" @click="signVisible = true" />
:customStyle="{ position: 'absolute', top: '-46upx', right: '20upx', width: '100upx' }"
@click="signVisible = true" />
<view v-if="ruleFormData.userInfo.writeSign"> <view v-if="ruleFormData.userInfo.writeSign">
<u-image width="400rpx" height="200rpx" :src="ruleFormData.userInfo.writeSign" /> <u-image width="400rpx" height="200rpx" :src="ruleFormData.userInfo.writeSign" />
</view> </view>
@ -57,19 +45,25 @@
<view class="mt-10"> <view class="mt-10">
<u-button type="primary" text="下一步" @click="$u.debounce(fnSubmit, 1000, true)" /> <u-button type="primary" text="下一步" @click="$u.debounce(fnSubmit, 1000, true)" />
</view> </view>
</view> </view>
<sign :signShow.sync="signVisible" @confirm="handleSign" /> <sign :signShow.sync="signVisible" @confirm="handleSign" />
<u-datetime-picker :show="showCertificateGetTimePopper" mode="date" :round="12" :custom-style="{ <u-datetime-picker
:show="showCertificateGetTimePopper"
mode="datetime"
v-model="defaultDatetimePicker"
:round="12"
:custom-style="{
borderRadius: '24rpx', borderRadius: '24rpx',
overflow: 'hidden', overflow: 'hidden',
'--picker-header-radius': '24rpx 24rpx 0 0', '--picker-header-radius': '24rpx 24rpx 0 0',
'--picker-confirm-radius': '12rpx' '--picker-confirm-radius': '12rpx'
}" @confirm="handleCertificateGetTimeConfirm" @cancel="handleCertificateGetTimeCancel"></u-datetime-picker> }"
@confirm="handleCertificateGetTimeConfirm"
@cancel="handleCertificateGetTimeCancel"
></u-datetime-picker>
<u-picker ref="uPicker" :show="singleChoice" :columns="singleChoiceColumns" keyName="NAME" <u-picker ref="uPicker" :show="singleChoice" :columns="singleChoiceColumns" keyName="NAME" @confirm="fnSingleChoiceConfirm" @cancel="fnSingleChoiceCancel"></u-picker>
@confirm="fnSingleChoiceConfirm" @cancel="fnSingleChoiceCancel"></u-picker>
</view> </view>
</template> </template>
@ -81,7 +75,7 @@ import { validateFieldPhone, validateFieldIdCard } from '@/utils/formValidateFie
export default { export default {
data() { data() {
return { return {
routeQuery: {}, routeQuery: {}, // 上一个页面带过来的路由参数
sexsList: [ sexsList: [
{ {
label: '1', label: '1',
@ -95,40 +89,7 @@ export default {
singleChoice: false, singleChoice: false,
showCertificateGetTimePopper: false, showCertificateGetTimePopper: false,
signVisible: false, signVisible: false,
educationActions: [ defaultDatetimePicker: Number(new Date()),
{
id: '0',
name: '小学',
},
{
id: '1',
name: '初中',
},
{
id: '2',
name: '高中',
},
{
id: '3',
name: '大学专科',
},
{
id: '4',
name: '大学本科',
},
{
id: '5',
name: '研究生',
},
{
id: '6',
name: '博士',
},
{
id: '7',
name: '其他',
}
],
singleChoiceColumns: [], singleChoiceColumns: [],
ruleFormData: { ruleFormData: {
userInfo: { userInfo: {
@ -140,7 +101,7 @@ export default {
job: '', // 职业 job: '', // 职业
gradeCertificate: [], // 等级证书 gradeCertificate: [], // 等级证书
certificateAcquisitionTime: '', // 获取证书时间 certificateAcquisitionTime: '', // 获取证书时间
writeSign: '', // 手写签字 writeSign: '' // 手写签字
} }
}, },
rules: { rules: {
@ -154,11 +115,11 @@ export default {
{ {
required: true, required: true,
message: '请输入手机号', message: '请输入手机号',
trigger: ['change', 'blur'], trigger: ['change', 'blur']
}, },
{ {
validator: validateFieldPhone, validator: validateFieldPhone,
trigger: ['change', 'blur'], trigger: ['change', 'blur']
} }
], ],
'userInfo.userIdCard': [ 'userInfo.userIdCard': [
@ -170,7 +131,7 @@ export default {
}, },
{ {
validator: validateFieldIdCard, validator: validateFieldIdCard,
trigger: ['change', 'blur'], trigger: ['change', 'blur']
} }
], ],
'userInfo.sex': { 'userInfo.sex': {
@ -218,16 +179,10 @@ export default {
}, },
onLoad(query) { onLoad(query) {
this.routeQuery = query; this.routeQuery = query // 接收上一个页面传递过来的路由参数
}, },
methods: { methods: {
groupChange(n) {
console.log('groupChange', n);
},
radioChange(n) {
console.log('radioChange', n);
},
handleEducationClick() { handleEducationClick() {
this.$refs.uPicker.setIndexs([0]) this.$refs.uPicker.setIndexs([0])
this.fnGetDataDictionary('d7d80f08d73a4accbccf4fd3d8d1d867') this.fnGetDataDictionary('d7d80f08d73a4accbccf4fd3d8d1d867')
@ -238,6 +193,21 @@ export default {
this.$set(this.ruleFormData.userInfo, 'degreeOfEducation' + '_BIANMA', event.value[0].BIANMA) this.$set(this.ruleFormData.userInfo, 'degreeOfEducation' + '_BIANMA', event.value[0].BIANMA)
this.singleChoice = false this.singleChoice = false
}, },
methods: {
handleEducationClick() {
this.$refs.uPicker.setIndexs([0])
this.fnGetDataDictionary('d7d80f08d73a4accbccf4fd3d8d1d867')
this.singleChoice = true
},
fnSingleChoiceConfirm(event) {
this.$set(this.ruleFormData.userInfo, 'degreeOfEducation', event.value[0].NAME)
this.$set(this.ruleFormData.userInfo, 'degreeOfEducation' + '_BIANMA', event.value[0].BIANMA)
this.fnSingleChoiceCancel()
},
fnSingleChoiceCancel() {
this.singleChoice = false
},
async fnGetDataDictionary(DICTIONARIES_ID) { async fnGetDataDictionary(DICTIONARIES_ID) {
let resData = await getDataDictionary({ let resData = await getDataDictionary({
DICTIONARIES_ID DICTIONARIES_ID
@ -245,71 +215,77 @@ export default {
this.singleChoiceColumns = [resData.list] this.singleChoiceColumns = [resData.list]
}, },
handleSelectEducation(event) { handleSelectEducation(event) {
this.ruleFormData.userInfo.degreeOfEducation = event.name; this.ruleFormData.userInfo.degreeOfEducation = event.name
}, },
async afterRead(event) { async afterRead(event) {
// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式 let lists = [].concat(event.file)
let lists = [].concat(event.file);
let fileListLen = this.ruleFormData.userInfo.gradeCertificate.length;
lists.map((item) => { lists.map((item) => {
this.ruleFormData.userInfo.gradeCertificate.push({ this.ruleFormData.userInfo.gradeCertificate.push({
...item, ...item,
status: "uploading", status: 'success',
message: "上传中", message: ''
}); })
}); })
// console.log('this.ruleFormData.userInfo.gradeCertificate :>> ', this.ruleFormData.userInfo.gradeCertificate);
// for (let i = 0; i < lists.length; i++) {
// const result = await this.uploadFilePromise(lists[i].url);
// let item = this.ruleFormData.userInfo.gradeCertificate[fileListLen];
// this.ruleFormData.userInfo.gradeCertificate.splice(
// fileListLen,
// 1,
// Object.assign(item, {
// status: "success",
// message: "",
// url: result,
// })
// );
// fileListLen++;
// }
}, },
deletePic(event) { deletePic(event) {
this.gradeCertificateList.splice(event.index, 1); this.ruleFormData.userInfo.gradeCertificate.splice(event.index, 1)
}, },
showCertificateGetTime() { showCertificateGetTime() {
this.showCertificateGetTimePopper = true; this.showCertificateGetTimePopper = true
}, },
handleCertificateGetTimeConfirm(event) { handleCertificateGetTimeConfirm(event) {
this.ruleFormData.userInfo.certificateAcquisitionTime = uni.$u.timeFormat(event.value, 'yyyy-mm-dd') this.ruleFormData.userInfo.certificateAcquisitionTime = uni.$u.timeFormat(event.value, 'yyyy-mm-dd hh:MM')
this.handleCertificateGetTimeCancel() this.handleCertificateGetTimeCancel()
}, },
handleCertificateGetTimeCancel() { handleCertificateGetTimeCancel() {
this.showCertificateGetTimePopper = false; this.showCertificateGetTimePopper = false
}, },
handleSign(event) { handleSign(event) {
this.ruleFormData.userInfo.writeSign = event.filePath; this.ruleFormData.userInfo.writeSign = event.filePath
}, },
async fnSubmit() { async fnSubmit() {
try { const classId = this.routeQuery.classId
await this.$refs.uFormRef.validate() await this.$refs.uFormRef
try { .validate()
console.log("this.ruleFormData.userInfo : >>", this.ruleFormData.userInfo); .then(async () => {
let files = []
await joinClass({ if (this.ruleFormData.userInfo.gradeCertificate[0]) {
form: this.form, files.push({
calssId: this.routeQuery.calssId, name: 'certificatefile',
file: this.ruleFormData.userInfo.gradeCertificate[0],
uri: this.ruleFormData.userInfo.gradeCertificate[0].url
}) })
}
if (this.ruleFormData.userInfo.writeSign) {
files.push({
name: 'signfile',
uri: this.ruleFormData.userInfo.writeSign
})
}
// const certificatefileLists = this.ruleFormData.userInfo.gradeCertificate.map(so => so.url); // 接入组合多个证书的上传, 返回数组
const params = { ...this.ruleFormData.userInfo }
delete params.gradeCertificate
delete params.writeSign
await joinClass({
files,
formData: { ...params, classId }
})
.then(() => {
uni.$u.toast('保存成功') uni.$u.toast('保存成功')
setTimeout(() => {
uni.$u.route({ uni.$u.route({
url: '/pages/train_management/face_authentication', url: '/pages/train_management/face_authentication',
params: { ...this.routeQuery } params: { ...this.routeQuery, type: 'scan_face' }
}) })
} catch { }, 1500)
} })
} catch { .catch((err) => {
if (err) uni.$u.toast(err.msg)
})
})
.catch((e) => {
uni.$u.toast('请补全必填项') uni.$u.toast('请补全必填项')
} })
} }
} }
} }