From 47ffb6d9d8501410d6749ca0dfbf51490bb352c1 Mon Sep 17 00:00:00 2001 From: QuAoLi Date: Wed, 23 Feb 2022 16:40:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/data/DataStatisticsList.vue | 43 +++++++++++++++++++-------- src/views/notice/NoticeForm.vue | 21 +++++++++++-- src/views/person/PersonForm.vue | 17 ++++++++++- 3 files changed, 64 insertions(+), 17 deletions(-) diff --git a/src/views/data/DataStatisticsList.vue b/src/views/data/DataStatisticsList.vue index f1237f8..9c33779 100644 --- a/src/views/data/DataStatisticsList.vue +++ b/src/views/data/DataStatisticsList.vue @@ -85,6 +85,10 @@ +
+ 按累计学时排序 + 按年度学时排序 +
前十统计排名
- 公司排名年度学时前十统计 + 公司排名年度学时前十统计 公司累计学时学时前十统计 -
+ - + - + @@ -141,7 +145,7 @@ data () { return { // 查询参数 - queryParam: { orgId: undefined, orgName: '' }, + queryParam: { orgId: undefined, orgName: '', asc: 1, type: 1 }, // 表头1 columns1: [ { @@ -150,7 +154,7 @@ }, { title: '学员数量', - dataIndex: 'studentCount' + dataIndex: 'personCount' }, { title: '培训人数', @@ -200,10 +204,6 @@ title: '累计学时', dataIndex: 'sumClassHour' }, - { - title: '人均学时', - dataIndex: 'avgClassHour' - } ], loadData2: parameter => { return dataPersonalStatistics(Object.assign(parameter, this.queryParam)).then((res) => { @@ -241,7 +241,7 @@ } ], loadDataTop1: parameter => { - return dataClassHourTop(Object.assign(parameter, {type : 1})).then((res) => { + return dataClassHourTop(Object.assign(parameter, this.queryParam)).then((res) => { return res.data }) }, @@ -276,7 +276,7 @@ } ], loadDataTop2: parameter => { - return dataClassHourTop(Object.assign(parameter, {type : 2})).then((res) => { + return dataClassHourTop(Object.assign(parameter, this.queryParam)).then((res) => { return res.data }) }, @@ -302,7 +302,7 @@ this.getOrgTree() }, mounted () { - + }, methods: { tabsCallback (key) { @@ -347,10 +347,27 @@ } if (this.keyType === '2') { this.$refs.table2.refresh(true) + if (this.topType === 1) { + this.$refs.tableTop1.refresh(true) + } + if (this.topType === 2) { + this.$refs.tableTop2.refresh(true) + } } }, changeTopType (type) { this.topType = type + this.queryParam.type = type + if (this.topType === 1) { + this.$refs.tableTop1.refresh(true) + } + if (this.topType === 2) { + this.$refs.tableTop2.refresh(true) + } + }, + changeSort (type) { + this.queryParam.asc = type + this.$refs.table2.refresh(true) } } } diff --git a/src/views/notice/NoticeForm.vue b/src/views/notice/NoticeForm.vue index 920c840..d21019c 100644 --- a/src/views/notice/NoticeForm.vue +++ b/src/views/notice/NoticeForm.vue @@ -32,14 +32,23 @@ + + - 是 - 否 + 是 + 否 +
+ + + + + +
@@ -136,7 +145,8 @@ export default { rangeId: 0, rangeName: '', isTop: 0, - isCalculate: 0, + isCalculate: 1, + classHour: 0, isNowPublish: false, publishTime: '', type: 1, @@ -144,11 +154,13 @@ export default { }, fileList: [], timeShow: true, + classHourShow: true, rules: { title: [{ required: true, message: '请输入公告标题', trigger: 'blur' }], rangeName: [{ required: true, message: '请选择发布范围', trigger: 'blur' }], isTop: [{ required: true, message: '请选择是否置顶', trigger: 'change' }], isCalculate: [{ required: true, message: '请选择是否计算学时', trigger: 'change' }], + classHour: [{ required: true, message: '请填写学时', trigger: 'change' }], isNowPublish: [{ required: true, message: '请选择即时发布', trigger: 'change' }], publishTime: [{ required: true, message: '请选择发布时间', trigger: 'change' }], type: [{ required: true, message: '请选择发布类型', trigger: 'change' }], @@ -209,6 +221,9 @@ export default { }, onChangeNow(checked) { this.timeShow = !checked + }, + isCalculateFunc(type) { + this.classHourShow = type === 1 } } } diff --git a/src/views/person/PersonForm.vue b/src/views/person/PersonForm.vue index a1682bb..baa699c 100644 --- a/src/views/person/PersonForm.vue +++ b/src/views/person/PersonForm.vue @@ -177,6 +177,20 @@ + + + + + + + + + 上传身份证 @@ -330,7 +344,8 @@ workType: data.workType ? parseInt(data.workType) : undefined, degreeId: data.degreeId, orgId: data.orgId, - orgName: data.orgName + orgName: data.orgName, + planClassHour: data.planClassHour } ) // 动态赋值年龄和性别 From 9440f713051d12eabc070446a5353af8088f06cb Mon Sep 17 00:00:00 2001 From: QuAoLi Date: Wed, 23 Feb 2022 17:54:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/data/DataStatisticsList.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/data/DataStatisticsList.vue b/src/views/data/DataStatisticsList.vue index 9c33779..37c8286 100644 --- a/src/views/data/DataStatisticsList.vue +++ b/src/views/data/DataStatisticsList.vue @@ -26,7 +26,7 @@
- +
- +
@@ -179,6 +179,10 @@ ], loadData1: parameter => { return dataOrgStatistics(Object.assign(parameter, this.queryParam)).then((res) => { + const data = res.rows + data.forEach(function(val){ + val.trainRate = val.trainRate + '%' + }) return res }) }, From 15c636acd0241b9b1d13530840da071980faad7f Mon Sep 17 00:00:00 2001 From: cgd_mac <349008059@qq.com> Date: Wed, 23 Feb 2022 19:02:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E8=80=83=E8=AF=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DbExam/index.vue | 19 +++++-- src/views/course/CoursewarePreview.vue | 12 ++-- src/views/myexamDetail/index.vue | 10 ++-- src/views/myresource/index.vue | 77 ++++++++++++++++---------- 4 files changed, 76 insertions(+), 42 deletions(-) diff --git a/src/components/DbExam/index.vue b/src/components/DbExam/index.vue index 493bfb5..0be0c56 100644 --- a/src/components/DbExam/index.vue +++ b/src/components/DbExam/index.vue @@ -3,9 +3,9 @@
答题卡
-
+
倒计时: - +
@@ -89,12 +89,23 @@ export default { }, methods: { // 考试倒计时结束 - onFinish () {}, + onFinish () { + this.$emit('submit', this.data) + }, handlerBack () { this.$router.go(-1) }, handlerSubmit () { - this.$emit('submit', this.data) + const _this = this + this.$confirm({ + title: '安全培训', + content: '一但提交将不能修改,确定要现在提交吗?', + onOk () { + // change() + _this.$emit('submit', _this.data) + }, + onCancel () {} + }) } } } diff --git a/src/views/course/CoursewarePreview.vue b/src/views/course/CoursewarePreview.vue index 2fbb293..b930f95 100644 --- a/src/views/course/CoursewarePreview.vue +++ b/src/views/course/CoursewarePreview.vue @@ -163,10 +163,14 @@ export default { methods: { //返回 goback() { - this.$router.push({ - path: '/course/CoursewareList', - query: { id: this.$route.query.courseId, type: this.$route.query.types }, - }) + if(this.$route.query.isOther){ + this.$router.go(-1) + }else{ + this.$router.push({ + path: '/course/CoursewareList', + query: { id: this.$route.query.courseId, type: this.$route.query.types }, + }) + } }, //选择播放的文件/下载的文件 diff --git a/src/views/myexamDetail/index.vue b/src/views/myexamDetail/index.vue index 4e37b91..0b5994c 100644 --- a/src/views/myexamDetail/index.vue +++ b/src/views/myexamDetail/index.vue @@ -19,10 +19,12 @@ export default { data () { return { examData: {}, - query: {} + query: {}, + startTime: 0 } }, mounted () { + this.startTime = Date.now() this.query = this.$route.query this.$nextTick(() => { this.initData() @@ -134,7 +136,7 @@ export default { const params = { projectId: query.projectId, courseId: query.courseId, - answerTime: 0, + answerTime: Number.parseInt((Date.now() - this.startTime) / 1000), type: query.practiceType, questionList: this.formatSubmit(result) } @@ -149,7 +151,7 @@ export default { const params = { projectId: query.projectId, courseId: query.courseId, - answerTime: 0, + answerTime: Number.parseInt((Date.now() - this.startTime) / 1000), type: query.practiceType, questionList: this.formatSubmit(result) } @@ -164,7 +166,7 @@ export default { const params = { projectId: query.projectId, courseId: query.courseId, - answerTime: 0, + answerTime: Number.parseInt((Date.now() - this.startTime) / 1000), type: query.practiceType, examType: query.type === 'test' ? 1 : (query.type === 'operation' ? 3 : 2), questionList: this.formatSubmit(result) diff --git a/src/views/myresource/index.vue b/src/views/myresource/index.vue index 53264dd..4c44dc4 100644 --- a/src/views/myresource/index.vue +++ b/src/views/myresource/index.vue @@ -7,21 +7,42 @@ @search="handleRefresh" @reset=" () => { - queryParam = {} - handleRefresh() + queryParam = {}; + handleRefresh(); } - "> + " + >
-