diff --git a/src/permission.js b/src/permission.js index 9f560fff..2159d5eb 100644 --- a/src/permission.js +++ b/src/permission.js @@ -143,6 +143,22 @@ function getQueryVariable(variable,url){ } return null; } + + +function setIndexPath() { + var indexPath=null + var url=window.location.href; + if(url.indexOf("/login")<=0){ + var indexOf=url.indexOf("/#") + if(indexOf > 0){ + indexPath=url.substring(indexOf+2) + localStorage.setItem("index-path",indexPath); + }else{ + localStorage.setItem("index-path",null); + } + } +} +setIndexPath(); var accessToken=getQueryVariable('accessToken'); if(accessToken!=null){ //alert(access_token); diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index fab8b5e5..adf84321 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -267,12 +267,11 @@ export default { loginParams.branchId=params.branchId } this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { - debugger; + ; this.loading = false if(res.data.tips.isOk==true){ this.loading = true; - this.$store.dispatch('GetUserInfo').then((res2)=>{ - debugger; + this.$store.dispatch('GetUserInfo').then((res2)=>{ this.loading = false if(res2.data.tips.isOk==true){ this.userDeptid=res2.data.userInfo.deptid @@ -312,15 +311,16 @@ export default { }, //角色身份验证 rolesChecked(){ + var indexPath=localStorage.getItem("index-path"); + if(!indexPath){ + indexPath="/" + } if(this.userInfo.isSuperAdmin){ - this.$router.push({ path: '/' }); - this.$notify.info("欢迎登陆,超级管理员"); + this.$router.push({ path: indexPath }); }else if(this.userInfo.isPlatformAdmin){ - this.$router.push({ path: '/' }); - this.$notify.info("欢迎登陆,平台管理员"); + this.$router.push({ path: indexPath }); }else{ - this.$router.push({ path: '/' }); - this.$notify.info("欢迎登陆"); + this.$router.push({ path: indexPath }); } }, diff --git a/src/views/mdp/mo/moOrder/MoOrderEdit.vue b/src/views/mdp/mo/moOrder/MoOrderEdit.vue index 7b954bb0..912cd934 100644 --- a/src/views/mdp/mo/moOrder/MoOrderEdit.vue +++ b/src/views/mdp/mo/moOrder/MoOrderEdit.vue @@ -292,7 +292,7 @@ MoOrderModuleMng editSomeFields(row,fieldName,$event){ - debugger; + ; if(this.opType=='add'){ return; } diff --git a/src/views/mdp/mo/moOrderModule/MoOrderModuleEdit.vue b/src/views/mdp/mo/moOrderModule/MoOrderModuleEdit.vue index c02e600a..5501c654 100644 --- a/src/views/mdp/mo/moOrderModule/MoOrderModuleEdit.vue +++ b/src/views/mdp/mo/moOrderModule/MoOrderModuleEdit.vue @@ -173,7 +173,7 @@ }, editSomeFields(row,fieldName,$event){ - debugger; + ; if(this.opType=='add'){ return; } diff --git a/src/views/mdp/plat/bankAccount/BankAccountEdit.vue b/src/views/mdp/plat/bankAccount/BankAccountEdit.vue index bdfee33a..1d2d585b 100644 --- a/src/views/mdp/plat/bankAccount/BankAccountEdit.vue +++ b/src/views/mdp/plat/bankAccount/BankAccountEdit.vue @@ -115,7 +115,7 @@ this.load.edit=true let params = Object.assign({}, this.editForm); editBankAccount(params).then((res) => { - debugger; + ; this.load.edit=false var tips=res.data.tips; this.$notify({ message: tips.msg, type: tips.isOk?'success':'error' }); diff --git a/src/views/mdp/sys/module/ModuleEdit.vue b/src/views/mdp/sys/module/ModuleEdit.vue index af7862c2..72d788b4 100644 --- a/src/views/mdp/sys/module/ModuleEdit.vue +++ b/src/views/mdp/sys/module/ModuleEdit.vue @@ -169,7 +169,7 @@ }else{ } - debugger; + ; if(this.editForm.discount){ this.discount=JSON.parse(this.editForm.discount) } diff --git a/src/views/mdp/sys/user/MemMemberMng.vue b/src/views/mdp/sys/user/MemMemberMng.vue index 454fc5e8..69ce2286 100644 --- a/src/views/mdp/sys/user/MemMemberMng.vue +++ b/src/views/mdp/sys/user/MemMemberMng.vue @@ -238,7 +238,7 @@ users:this.users, memMembers:Object.assign({}, row), }; - // debugger + // console.log("查看params"); console.log(params); addSubacctAddForm(params).then((res) => { diff --git a/src/views/myWork/my/index.vue b/src/views/myWork/my/index.vue index 3f964ec6..4c19cd2b 100644 --- a/src/views/myWork/my/index.vue +++ b/src/views/myWork/my/index.vue @@ -93,7 +93,7 @@ export default { methods: { gotolink(context,path) { - debugger; + ; if(context==process.env.CONTEXT){ this.$router.push({path:path}); }else{ diff --git a/src/views/xm/core/xmQuestion/XmQuestionForTask.vue b/src/views/xm/core/xmQuestion/XmQuestionForTask.vue index 582ce5fb..4b013b3b 100644 --- a/src/views/xm/core/xmQuestion/XmQuestionForTask.vue +++ b/src/views/xm/core/xmQuestion/XmQuestionForTask.vue @@ -1099,7 +1099,7 @@ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el); - debugger; + ; this.getXmQuestions(); }); initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate']).then(res=>{ diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index 02fc3f66..74b46d7d 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -621,7 +621,7 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; Object.assign(row,params) this.editFormBak=Object.assign({},row) }else{ - debugger; + ; Object.assign(this.editForm,this.editFormBak) this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'}) } diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue index 807b9dc3..fd66a856 100644 --- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue @@ -273,7 +273,7 @@ export default { } editXmTaskSomeFields(params).then(res=>{ - debugger; + ; var tips = res.data.tips; if(tips.isOk){ if(this.sels.length>0){