@@ -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 09/10] =?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 @@
+
-
倒计时:
-
+
@@ -32,7 +53,6 @@
{{ item.name }}
-下载次数{{ item.rightQuestions }}次预览次数：{{ item.submitTime }}次
+
+ 下载次数{{ item.downCount || 0 }}次
+ 预览次数：{{ item.viewCount }}次
+
-
+
安全培训平台
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/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()
})
})
}