Browse Source

Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

See999 4 years ago
parent
commit
f049179e78
3 changed files with 14 additions and 4 deletions
  1. 4 4
      src/App.vue
  2. 9 0
      src/router/modules/dialysis.js
  3. 1 0
      src/xt_pages/index/verify_token.vue

+ 4 - 4
src/App.vue View File

17
       showWsErr: false,
17
       showWsErr: false,
18
     }
18
     }
19
   },
19
   },
20
-  
20
+
21
   created(){
21
   created(){
22
     // getOrgs().then(response => {
22
     // getOrgs().then(response => {
23
     //   if (response.data.state === 1) {
23
     //   if (response.data.state === 1) {
28
     //     this.getToken(creator.org_id,creator.admin_user_id)
28
     //     this.getToken(creator.org_id,creator.admin_user_id)
29
     //   }
29
     //   }
30
     // });
30
     // });
31
-    
31
+
32
   },
32
   },
33
   methods: {
33
   methods: {
34
     reload () {
34
     reload () {
37
         this.isRouterAlive = true
37
         this.isRouterAlive = true
38
       })
38
       })
39
     },
39
     },
40
-    
40
+
41
   },
41
   },
42
-  
42
+
43
 };
43
 };
44
 </script>
44
 </script>
45
 
45
 

+ 9 - 0
src/router/modules/dialysis.js View File

11
     icon: 'touxi'
11
     icon: 'touxi'
12
   },
12
   },
13
   children: [
13
   children: [
14
+    {
15
+      path: '/dialysis/home',
16
+      component: () => import('@/xt_pages/home/index'),
17
+      name: 'home',
18
+      meta: {
19
+        title: 'home',
20
+        noCache: true
21
+      }
22
+    },
14
     {
23
     {
15
       path: '/dialysis/watch',
24
       path: '/dialysis/watch',
16
       component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
25
       component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),

+ 1 - 0
src/xt_pages/index/verify_token.vue View File

16
           this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
16
           this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
17
   //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
17
   //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
18
           this.$router.replace({ path: '/dialysis/dialysisrecord' })
18
           this.$router.replace({ path: '/dialysis/dialysisrecord' })
19
+
19
         })
20
         })
20
       })
21
       })
21
     }).catch((error) => {
22
     }).catch((error) => {