1

src/xt_pages/index/verify_token.vue

@@ -11,22 +11,23 @@ export default {
     this.$store.dispatch('VerifyToken', this.$route.query.token).then(() => {
       this.$store.dispatch('xt_GenerateRoutes', this.$store.getters.current_role_urls).then(() => {
         this.$store.dispatch('VerifyConfigList').then(() => {
-          if(sessionStorage.getItem('signIn') != null){
-            this.$router.replace({ path: '/signIn' })
-          }else{
+          
             // alert('token 验证成功')
             // console.log(this.$store.getters.xt_permission.addRouters)
             this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
     //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-            if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
-              this.$router.replace({ path: '/dialysis/dialysisrecord' })
-
+            if(sessionStorage.getItem('signIn') != null){
+              this.$router.replace({ path: '/signIn' })
             }else{
-              this.$router.replace({ path: '/home' })
+              if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
+                this.$router.replace({ path: '/dialysis/dialysisrecord' })
+
+              }else{
+                this.$router.replace({ path: '/home' })
 
 
+              }
             }
-          }
 
         })
       })

src/xt_pages/sign/components/computerCalling.vue

@@ -146,16 +146,16 @@ export default {
                         this.called = calledArr
                     }
                     if(res.data.type == 5){
-                            let arr = res.data.patientQueueList.data
-                            let calledArr = []
-                            arr.map(item => {
-                                if(item.status == 3){
-                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                    calledArr.push(item)
-                                }
-                            })
-                            this.called = calledArr
-                        }
+                        let arr = res.data.patientQueueList.data
+                        let calledArr = []
+                        arr.map(item => {
+                            if(item.status == 3){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                calledArr.push(item)
+                            }
+                        })
+                        this.called = calledArr
+                    }
                 }else if(res.channel == 'allQueueList'){
                     let arr = res.data.queue_list.data
                     // let waitingCalledArr = []