From 3be98d89b3cd80a4bbfddcb14bab2e7a49a4845a Mon Sep 17 00:00:00 2001 From: jr719 <403209447@qq.com> Date: Tue, 13 Apr 2021 00:40:20 +0800 Subject: [PATCH] merge --- src/store/modules/user.js | 28 +-- src/views/convenience/list.vue | 312 ++++++++++++++++----------------- src/views/login/index.vue | 166 +++++++++--------- 3 files changed, 252 insertions(+), 254 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index ac9be02..c7b5697 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -73,22 +73,22 @@ const actions = { // user logout logout({ commit, state, dispatch }) { // return new Promise((resolve, reject) => { - // logout(state.token) - // .then(() => { - commit('SET_TOKEN', '') - commit('SET_ROLES', []) - removeToken() - resetRouter() + // logout(state.token) + // .then(() => { + commit('SET_TOKEN', '') + commit('SET_ROLES', []) + removeToken() + resetRouter() - // reset visited views and cached views - // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485 - dispatch('tagsView/delAllViews', null, { root: true }) + // reset visited views and cached views + // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2485 + dispatch('tagsView/delAllViews', null, { root: true }) - // resolve() - // }) - // .catch(error => { - // reject(error) - // }) + // resolve() + // }) + // .catch(error => { + // reject(error) + // }) // }) }, diff --git a/src/views/convenience/list.vue b/src/views/convenience/list.vue index dd4e21a..75f3d41 100644 --- a/src/views/convenience/list.vue +++ b/src/views/convenience/list.vue @@ -5,8 +5,7 @@ type="primary" style="position:absolute;right:50px;top:120px" @click="$router.push('/convenience/add')" - > 直接建立工单 + > 直接建立工单
流水号:{{ item.serialNumber }}
阶段:{{ item.phase | phaseFilter }} - + {{ timers && timers[index].status === null ? "" : timers&&timers[index].status - ? "已超时" - : "即将超时" + ? "已超时" + : "即将超时" }}