From 2493758943ee6d520aa34972f1cbc7705e96a93f Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 19 Mar 2021 09:13:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=B0=E6=8A=A5=E9=80=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/router/index.js | 9 +- client/src/store/modules/user.js | 30 +- client/src/views/ability/cma.vue | 2 +- client/src/views/ability/cma2.vue | 2 +- client/src/views/ability/inspection.vue | 2 +- client/src/views/ability/qualification.vue | 2 +- client/src/views/ability/queryrecord.vue | 2 +- client/src/views/dashboard/index.vue | 12 +- client/src/views/supervision/record.vue | 476 +++++++++++---------- client/src/views/supervision/task.vue | 2 +- client/src/views/system/file.vue | 2 +- client/src/views/system/user.vue | 2 +- 12 files changed, 281 insertions(+), 262 deletions(-) diff --git a/client/src/router/index.js b/client/src/router/index.js index 0d27e6e..7ad22f6 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -139,14 +139,7 @@ export const asyncRoutes = [ path: 'record', name: 'Record', component: () => import('@/views/supervision/record.vue'), - meta: { title: '材料列表', icon: 'guide', perms: ['record_all'] } - } - , - { - path: 'report', - name: 'Report', - component: () => import('@/views/supervision/report.vue'), - meta: { title: '材料报送', icon: 'guide', perms: ['record_view'] } + meta: { title: '材料报送列表', icon: 'guide', perms: ['record_view'] } } , { diff --git a/client/src/store/modules/user.js b/client/src/store/modules/user.js index 5e790c4..a886ba6 100644 --- a/client/src/store/modules/user.js +++ b/client/src/store/modules/user.js @@ -95,29 +95,15 @@ const actions = { return new Promise((resolve, reject) => { getInfo(state.token).then(response => { const { data } = response - if(data){ - const { perms, name, avatar } = data - // perms must be a non-empty array - if (!perms || perms.length <= 0) { - reject('没有任何权限!') - } - commit('SET_PERMS', perms) - commit('SET_NAME', name) - commit('SET_AVATAR', avatar) - resolve(data) - }else{ - getInfo(state.token).then(res=>{ - const { data } = response - if (!perms || perms.length <= 0) { - reject('没有任何权限!') - } - commit('SET_PERMS', perms) - commit('SET_NAME', name) - commit('SET_AVATAR', avatar) - resolve(data) - }) + const { perms, name, avatar } = data + // perms must be a non-empty array + if (!perms || perms.length <= 0) { + reject('没有任何权限!') } - + commit('SET_PERMS', perms) + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + resolve(data) diff --git a/client/src/views/ability/cma.vue b/client/src/views/ability/cma.vue index 24e90f5..3080c40 100644 --- a/client/src/views/ability/cma.vue +++ b/client/src/views/ability/cma.vue @@ -23,7 +23,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新重置 diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue index 8b4e756..88b4f25 100644 --- a/client/src/views/ability/cma2.vue +++ b/client/src/views/ability/cma2.vue @@ -41,7 +41,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新重置 diff --git a/client/src/views/ability/inspection.vue b/client/src/views/ability/inspection.vue index 6331d4f..8be2f46 100644 --- a/client/src/views/ability/inspection.vue +++ b/client/src/views/ability/inspection.vue @@ -41,7 +41,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新重置 diff --git a/client/src/views/ability/qualification.vue b/client/src/views/ability/qualification.vue index 2abb905..df5e5c0 100644 --- a/client/src/views/ability/qualification.vue +++ b/client/src/views/ability/qualification.vue @@ -32,7 +32,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新 + >重置
diff --git a/client/src/views/ability/queryrecord.vue b/client/src/views/ability/queryrecord.vue index a057bc5..2c97b4c 100644 --- a/client/src/views/ability/queryrecord.vue +++ b/client/src/views/ability/queryrecord.vue @@ -20,7 +20,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新重置 + >重置
待办任务提醒 -
+
您有 {{todos.toup}} @@ -66,13 +66,13 @@
- + 您有 {{todos.tozg}} 条记录待整改
-
+
您有 {{todos.toconfirm}} @@ -88,6 +88,7 @@ diff --git a/client/src/views/supervision/task.vue b/client/src/views/supervision/task.vue index 9030186..864e2ff 100644 --- a/client/src/views/supervision/task.vue +++ b/client/src/views/supervision/task.vue @@ -21,7 +21,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新重置重置
diff --git a/client/src/views/system/file.vue b/client/src/views/system/file.vue index a32523e..281d90f 100644 --- a/client/src/views/system/file.vue +++ b/client/src/views/system/file.vue @@ -35,7 +35,7 @@ type="primary" icon="el-icon-refresh-left" @click="resetFilter" - >刷新重置 + >重置
刷新重置重置