diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index abe57d8..eb33b42 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -151,7 +151,8 @@ module.exports = { departmentalLiaison: '部门联络人', deadlineForComments: '征求意见截止日期', workingGroup: '工作组', - deadlineNeedGreaterThan: '征求意见截止日期需要比征求意见稿计划完成日期晚' + deadlineNeedGreaterThan: '征求意见截止日期需要比征求意见稿计划完成日期晚', + noStandardTextLook: '暂无标准文本可查看' }, // 企标复审流程 esRecheck: { diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 8460f86..f92174a 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -106,9 +106,16 @@ export default { }, loginSuccess () { Toast('登录成功') - this.$router.push({ path: '/' }).catch((res) => { - console.log(res) - }) + const query = this.$route.query + if (query.redirect) { + this.$router.push({ path: query.redirect }).catch((res) => { + console.log(res) + }) + } else { + this.$router.push({ path: '/' }).catch((res) => { + console.log(res) + }) + } }, // 密码禁止粘贴 handleOperate () { diff --git a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevision.vue b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevision.vue index 00ecafd..19bb87e 100644 --- a/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevision.vue +++ b/src/views/workCenter/enterpriseStandardRevision/EnterpriseStandardRevision.vue @@ -519,6 +519,10 @@ export default { }, // 在线编辑的查看 onlineEditView (fileId) { + if (!fileId) { + this.$message(this.$t('enStandardRevision.noStandardTextLook')) + return + } queryFileInfoByEditId({ id: fileId }).then(res => { if (res.success) { const file = res.result @@ -534,6 +538,7 @@ export default { // 组件内路由拦截 beforeRouteEnter (to, from, next) { // 如果不是移动端支持的节点,就跳转NoMobile + console.log(EsRevisionNodes.propertyOfValue('isMobile', to.query.nodeId)) if (!EsRevisionNodes.propertyOfValue('isMobile', to.query.nodeId)) { next({ path: '/noMobile' }) }