1

src/router/index.js

@@ -777,8 +777,8 @@ router.beforeEach(async (to, from, next) => {
     }
 
     //单个页面设置权限
-    if(to.path=='/project/patentCollection'){
-      var projectId = to.query.id
+    if(to.path=='/project/patentCollection' || to.path=='/reportDetails'){
+      var projectId = to.query.id || to.query.projectId
       if(!projectId){
         next({ path: '/404' })
         return

src/views/login/index.vue

@@ -268,17 +268,17 @@ export default {
           if(redirectUrl){
             redirectUrl = JSON.parse(redirectUrl)
             localStorage.removeItem('redirectUrl')
-            if(redirectUrl.userName && redirectUrl.userName != this.ruleForm.username){
-              this.$router.push({
-                path: '/home'
-              })
-            }else{
+            // if(redirectUrl.userName && redirectUrl.userName != this.ruleForm.username){
+            //   this.$router.push({
+            //     path: '/home'
+            //   })
+            // }else{
               this.$router.replace({
                 path:redirectUrl.path!='/login'?redirectUrl.path:'/home',
                 query:redirectUrl.query,
                 params:redirectUrl.params
               })
-            }
+            // }
           }else{
             this.$router.push({
               path: '/home'