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/layouts/UserLayout.vue b/src/layouts/UserLayout.vue index fc04200..ff7548a 100644 --- a/src/layouts/UserLayout.vue +++ b/src/layouts/UserLayout.vue @@ -3,7 +3,7 @@
- + 安全培训平台 diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5578f77..f127cb1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -39,7 +39,7 @@ const user = { actions: { // 登录 - Login({ commit }, userInfo) { + Login ({ commit }, userInfo) { return new Promise((resolve, reject) => { login(userInfo).then(response => { storage.set(ACCESS_TOKEN, response.token, 24 * 60 * 60 * 1000) @@ -52,7 +52,7 @@ const user = { }, // 获取用户信息 - GetInfo({ commit, state }) { + GetInfo ({ commit, state }) { return new Promise((resolve, reject) => { getLoginUser().then(response => { if (response.code === 200) { @@ -76,18 +76,25 @@ const user = { }, // 登出 - Logout({ commit, state }) { + Logout ({ commit, state }) { return new Promise((resolve) => { - logout().then(() => { - resolve() - }).catch(() => { - resolve() - }).finally(() => { + const clear = function () { commit('SET_TOKEN', '') commit('SET_ROLES', []) commit('SET_BUTTONS', []) commit('SET_ROUTERS', []) storage.remove(ACCESS_TOKEN) + } + logout().then(() => { + clear() + setTimeout(() => { + resolve() + }, 300) + resolve() + }).catch(() => { + resolve() + }).finally(() => { + clear() }) }) } 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/data/DataStatisticsList.vue b/src/views/data/DataStatisticsList.vue index f1237f8..37c8286 100644 --- a/src/views/data/DataStatisticsList.vue +++ b/src/views/data/DataStatisticsList.vue @@ -26,7 +26,7 @@
- +
- +
+
+ 按累计学时排序 + 按年度学时排序 +
前十统计排名
- 公司排名年度学时前十统计 + 公司排名年度学时前十统计 公司累计学时学时前十统计 -
+
- + - + @@ -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: '培训人数', @@ -175,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 }) }, @@ -200,10 +208,6 @@ title: '累计学时', dataIndex: 'sumClassHour' }, - { - title: '人均学时', - dataIndex: 'avgClassHour' - } ], loadData2: parameter => { return dataPersonalStatistics(Object.assign(parameter, this.queryParam)).then((res) => { @@ -241,7 +245,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 +280,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 +306,7 @@ this.getOrgTree() }, mounted () { - + }, methods: { tabsCallback (key) { @@ -347,10 +351,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/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(); } - "> + " + >
-