diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 8ed2eaa..ecfb97f 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,16 +2,16 @@
- +

{{ $t('system.title') }}

- - + + - +
diff --git a/src/store/getters.js b/src/store/getters.js index df156c6..bc86946 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -17,6 +17,8 @@ const getters = { topbarRouters: (state) => state.permission.topbarRouters, defaultRoutes: (state) => state.permission.defaultRoutes, sidebarRouters: (state) => state.permission.sidebarRouters, - language: (state) => state.app.language + language: (state) => state.app.language, + + defaultUrl: (state) => state.user.defaultUrl } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2199cf7..94c5f0c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -13,7 +13,9 @@ const user = { nickName: '', avatar: '', roles: [], - permissions: [] + permissions: [], + + defaultUrl: '/user/work' }, mutations: { @@ -40,6 +42,9 @@ const user = { }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions + }, + SET_DEFAULTURL: (state, defaultUrl) => { + state.defaultUrl = defaultUrl } }, @@ -59,7 +64,8 @@ const user = { commit('SET_TOKEN', data.access_token) setExpiresIn(data.expires_in) commit('SET_EXPIRES_IN', data.expires_in) - resolve() + commit('SET_DEFAULTURL', data.defaultUrl) + resolve(data.defaultUrl) }) .catch((error) => { reject(error) diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index f715a3d..ef28805 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -129,9 +129,11 @@ export default { resource: [], //试验试剂信息 resourceWz: [], //物资信息 yqResource: [], //仪器信息 + jcbList: [], //检测板信息 resourceTmp:[],//试验试剂信息提交用 yqResourceTmp: [], //仪器信息提交用 + jcbListTmp: [], //检测板信息提交用 sysjColumns: [ { label: 'template.common.reagentName', prop: "mc" },//名称 { label: 'template.common.reagentCode', prop: "bh" },//编号 @@ -235,6 +237,9 @@ export default { getYqResource() { return this.yqResourceTmp }, + getJcbList() { + return this.jcbListTmp + }, //根据ref数组获取直接formData getFilledFormDataByRefs(refArr = []) { let result = {} diff --git a/src/views/business/form/nonTrial/comp/syff/Xq.vue b/src/views/business/form/nonTrial/comp/syff/Xq.vue index 01cc033..f742437 100644 --- a/src/views/business/form/nonTrial/comp/syff/Xq.vue +++ b/src/views/business/form/nonTrial/comp/syff/Xq.vue @@ -54,8 +54,6 @@