diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3020ca2..07d4d11 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -21,7 +21,7 @@ {{ name }} - 退出登录 + 退出登录 diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index ac0c8d8..21e0113 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -24,7 +24,7 @@ export default { }, data() { return { - title: 'Vue Element Admin', + title: '定点服务系统', logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' } } diff --git a/src/layout/components/SidebarBak/Logo.vue b/src/layout/components/SidebarBak/Logo.vue index ac0c8d8..21e0113 100644 --- a/src/layout/components/SidebarBak/Logo.vue +++ b/src/layout/components/SidebarBak/Logo.vue @@ -24,7 +24,7 @@ export default { }, data() { return { - title: 'Vue Element Admin', + title: '定点服务系统', logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png' } } diff --git a/src/settings.js b/src/settings.js index 1ebc7f2..3d85fb3 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,5 +1,5 @@ module.exports = { - title: 'Vue Element Admin', + title: '定点服务系统', /** * @type {boolean} true | false diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 15b4f20..ac9be02 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -72,9 +72,9 @@ const actions = { // user logout logout({ commit, state, dispatch }) { - return new Promise((resolve, reject) => { - logout(state.token) - .then(() => { + // return new Promise((resolve, reject) => { + // logout(state.token) + // .then(() => { commit('SET_TOKEN', '') commit('SET_ROLES', []) removeToken() @@ -84,12 +84,12 @@ const actions = { // 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) + // }) + // }) }, // remove token diff --git a/src/utils/get-page-title.js b/src/utils/get-page-title.js index cab7fd9..0f45c15 100644 --- a/src/utils/get-page-title.js +++ b/src/utils/get-page-title.js @@ -1,6 +1,6 @@ import defaultSettings from '@/settings' -const title = defaultSettings.title || 'Vue Element Admin' +const title = defaultSettings.title || '定点服务系统' export default function getPageTitle(pageTitle) { if (pageTitle) { diff --git a/src/views/convenience/list.vue b/src/views/convenience/list.vue index b7a2ee8..dd4e21a 100644 --- a/src/views/convenience/list.vue +++ b/src/views/convenience/list.vue @@ -5,7 +5,8 @@ type="primary" style="position:absolute;right:50px;top:120px" @click="$router.push('/convenience/add')" - > 直接建立工单 + > 直接建立工单
工单列表
@@ -15,20 +16,20 @@ 办理中 已办结 -
-
+
+
全部状态 我处理 已转交 - 转交超限审批中 + 转交超限审批中 已提交审批 待我审批 -
-
+
+
@@ -54,7 +55,17 @@

流水号:{{ item.serialNumber }}

-

阶段:{{ item.phase | phaseFilter }}

+

+ 阶段:{{ item.phase | phaseFilter }} + + {{ + timers && timers[index].status === null + ? "" + : timers&&timers[index].status + ? "已超时" + : "即将超时" + }} +

申办人:{{ item.residentInformation.name }}

@@ -62,6 +73,7 @@ 状态:{{ item.statusList[0].status | statusFilter }} +

@@ -80,7 +92,8 @@ type="primary" size="mini" @click="handleUpdate(item, 5)" - >接单 + >接单

@@ -174,10 +187,10 @@ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 6372c7d..93ebb7e 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -11,13 +11,13 @@ margin: 0 auto;" > - + + - @@ -70,7 +75,8 @@ type="primary" style="width:100%;margin-bottom:30px;border-radius:10px;height:54px" @click.native.prevent="handleLogin" - >登录 + >登录 @@ -79,12 +85,12 @@