lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

This commit is contained in:
18571350067 2022-03-22 15:09:32 +08:00
parent cac5ae0b5a 406cff8ef2
commit c8fa19d304
6 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/archives/user/Project.vue
View File

@ -88,8 +88,17 @@ export default {
queryParam: { projectName: this.$route.query.archivesUserProjectTable2projectName || '' },
columns: [
{ title: '项目名称', width: 'auto', align: 'center', dataIndex: 'projectName', key: 'projectName' },
{ title: '项目时间', width: 'auto', align: 'center', dataIndex: 'projectData', key: 'projectData' },
{ title: '受训角色', width: 'auto', align: 'center', dataIndex: 'roleName', key: 'roleName' },
{
title: '项目时间',
width: 'auto',
align: 'center',
dataIndex: 'startDate',
key: 'startDate',
customRender: (text, record, index) => {
return record.startDate + ' - ' + record.endDate
},
},
// { title: '受训角色', width: 'auto', align: 'center', dataIndex: 'roleName', key: 'roleName' },
{ title: '培训地址', width: 'auto', align: 'center', dataIndex: 'trainAddr', key: 'trainAddr' },
{ title: '签到时间', width: 'auto', align: 'center', dataIndex: 'signInTime', key: 'signInTime' },
{
@ -100,7 +109,7 @@ export default {
},
{ title: '操作', width: '90px', key: 'operation', align: 'center', scopedSlots: { customRender: 'action' } }
],
loadData: parameter => { return getArchivesUserTerminalTrainList(Object.assign(parameter, this.tabs2.queryParam)).then(res => { return res }) }
loadData: parameter => { return getArchivesUserTerminalTrainList(Object.assign(parameter, this.tabs2.queryParam, {personId : this.personId})).then(res => { return res }) }
}
}
},
@ -177,6 +186,8 @@ export default {
path: '/archives/user/TerminalTrainDetail', query: {
personId: this.personId,
projectId: record.id,
signInTime: record.signInTime,
state: record.finishState,
archivesUserName: this.$route.query.archivesUserName,
archivesUserOrgId: this.$route.query.archivesUserOrgId,
archivesUserPageNum: this.$route.query.archivesUserPageNum,

7
src/views/archives/user/ProjectAnswer.vue
View File

@ -19,9 +19,9 @@ export default {
components: { STable, SearchCom },
data() {
return {
userId: this.$route.query.userId,
personId: this.$route.query.personId,
projectId: this.$route.query.projectId,
queryParam: { userId: this.$route.query.userId, projectId: this.$route.query.projectId },
queryParam: { personId: this.$route.query.personId, projectId: this.$route.query.projectId },
columns: [
{ title: '交卷时间', width: 'auto', align: 'center', dataIndex: 'handDate', key: 'handDate' },
{ title: '考试时长', width: 'auto', align: 'center', dataIndex: 'testTime', key: 'testTime' },
@ -47,6 +47,9 @@ export default {
defaultActiveKey: this.$route.query.defaultActiveKey
}
});
},
trainDetail (record) {
this.$router.push({ path: '/myreport', query: { type: 'exam', reportId: record.reportId } })
}
}
}

8
src/views/archives/user/ProjectDetail.vue
View File

@ -18,7 +18,7 @@ export default {
components: { STable, SearchCom },
data() {
return {
queryParam: { userId: this.$route.query.userId, projectId: this.$route.query.projectId, courseName: '' },
queryParam: { personId: this.$route.query.personId, projectId: this.$route.query.projectId, courseName: '' },
columns: [
{ title: '课程名称', width: 'auto', align: 'center', dataIndex: 'courseName', key: 'courseName' },
{ title: '应修学时', width: 'auto', align: 'center', dataIndex: 'mustClassHour', key: 'mustClassHour' },
@ -26,7 +26,7 @@ export default {
{ title: '总题量', width: 'auto', align: 'center', dataIndex: 'addUpExercises', key: 'addUpExercises' },
{ title: '已答题量', width: 'auto', align: 'center', dataIndex: 'alreadyExercises', key: 'alreadyExercises' },
{ title: '答对题量', width: 'auto', align: 'center', dataIndex: 'yesExercises', key: 'yesExercises' },
{ title: '答对正确率', width: 'auto', align: 'center', dataIndex: 'yesTopic', key: 'yesTopic' },
{ title: '答对正确率', width: 'auto', align: 'center', dataIndex: 'yesRate', key: 'yesRate' },
{
title: '完成状态', width: 'auto', align: 'center', dataIndex: 'finishState', key: 'finishState', customRender: (text, record, index) => {
// 完成状态 0-未完成 1-已完成
@ -46,7 +46,7 @@ export default {
},
methods: {
handleRefresh() {
this.queryParam.userId = this.$route.query.userId;
this.queryParam.personId = this.$route.query.personId;
this.queryParam.projectId = this.$route.query.projectId;
this.$refs.table.refresh(true)
},
@ -54,7 +54,7 @@ export default {
close() {
this.$router.push({
path: '/archives/user/Project', query: {
id: this.$route.query.userId,
id: this.$route.query.personId,
archivesUserName: this.$route.query.archivesUserName,
archivesUserOrgId: this.$route.query.archivesUserOrgId,
archivesUserPageNum: this.$route.query.archivesUserPageNum,

4
src/views/archives/user/SelfStudy.vue
View File

@ -18,7 +18,7 @@ export default {
components: { STable, SearchCom },
data() {
return {
queryParam: { userId: this.$route.query.userId, courseName: '' },
queryParam: { personId: this.$route.query.personId, courseName: '' },
columns: [
{ title: '课程名称', width: 'auto', align: 'center', dataIndex: 'courseName', key: 'courseName' },
{ title: '课时（分）', width: 'auto', align: 'center', dataIndex: 'classHour', key: 'classHour' },
@ -36,7 +36,7 @@ export default {
},
methods: {
handleRefresh() {
this.queryParam.userId = this.$route.query.userId;
this.queryParam.personId = this.$route.query.personId;
this.$refs.table.refresh(true)
},
// 返回 按钮

11
src/views/archives/user/TerminalTrainDetail.vue
View File

@ -29,19 +29,24 @@ import { getArchivesUserTerminalTrainDetail } from '@/api/archives/user'
export default {
data() {
return {
queryParam: { userId: this.$route.query.userId, projectId: this.$route.query.projectId },
queryParam: { personId: this.$route.query.personId, projectId: this.$route.query.projectId },
detailData: {}
}
},
created: function () {
let parameter = {};
getArchivesUserTerminalTrainDetail(Object.assign(parameter, this.queryParam)).then(res => { this.detailData = res.data });
getArchivesUserTerminalTrainDetail(Object.assign(parameter, this.queryParam)).then(res => {
this.detailData = res.data
this.detailData.signInTime = this.$route.query.signInTime
this.detailData.state = this.$route.query.state == 1 ? '已完成' : '未完成'
});
},
methods: {
close() {
this.$router.push({
path: '/archives/user/Project', query: {
id: this.$route.query.userId,
id: this.$route.query.personId,
archivesUserName: this.$route.query.archivesUserName,
archivesUserOrgId: this.$route.query.archivesUserOrgId,
archivesUserPageNum: this.$route.query.archivesUserPageNum,

8
src/views/archives/user/Violation.vue
View File

@ -19,14 +19,15 @@ export default {
components: { STable, SearchCom },
data() {
return {
queryParam: { userId: this.$route.query.userId, courseName: '' },
personId: this.$route.query.id,
queryParam: { courseName: '' },
columns: [
{ title: '违章编号', width: 'auto', align: 'center', dataIndex: 'id', key: 'id' },
{ title: '违章编号', width: 'auto', align: 'center', dataIndex: 'violationCode', key: 'violationCode' },
{ title: '违章时间', width: 'auto', align: 'center', dataIndex: 'time', key: 'time' },
{ title: '违章内容', width: 'auto', align: 'center', dataIndex: 'content', key: 'content' },
{ title: '违章课时', width: 'auto', align: 'center', dataIndex: 'courseName', key: 'courseName' },
],
loadData: parameter => { return getArchivesUserViolationList(Object.assign(parameter, this.queryParam)).then(res => { return res }) }
loadData: parameter => { return getArchivesUserViolationList(Object.assign(parameter, this.queryParam, {personId : this.personId})).then(res => { return res }) }
}
},
computed: {
@ -38,7 +39,6 @@ export default {
},
methods: {
handleRefresh() {
this.queryParam.userId = this.userId;
this.$refs.table.refresh(true)
},
// 返回 按钮