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

src/xt_pages/dialysis/schedualPatient.vue

@@ -279,6 +279,11 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     },
     created() {
+      if(sessionStorage.getItem('signIn') != null){
+        setTimeout(() => {    
+          this.$router.replace({ path: '/signIn' })
+        },1000)
+      }
       var schedule_type_selected = this.$store.getters.schedule_type_selected
       var zone_selected = this.$store.getters.zone_selected
       var patient_state_selected = this.$store.getters.patient_state_selected

src/xt_pages/index/verify_token.vue

@@ -11,18 +11,19 @@ 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(() => {
-          // 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' })
+          
+            // 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' })
 
-          }else{
-            this.$router.replace({ path: '/home' })
+            }else{
+              this.$router.replace({ path: '/home' })
 
 
-          }
+            }
 
         })
       })

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -105,6 +105,12 @@ export default {
             data: {type:3},
         };
         this.websocketSend(unObj)
+
+        let unObj1 = {
+            cmd: "queue/unjoin",
+            data: {type:4},
+        };
+        this.websocketSend(unObj1)
     },
     methods:{
         websocketSend(data) {
@@ -170,6 +176,17 @@ export default {
                             this.waitingCalledPm = waitingCalledPm
                             this.called = calledArr
                         }
+                        if(res.data.type == 4){
+                            let arr = res.data.patientQueueList.data
+                            let calledArr = []
+                            arr.map(item => {
+                                if(item.status == 2){
+                                    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 = []
@@ -223,6 +240,13 @@ export default {
             //     }) 
             //     this.waitingCalledPm = newArr
             // }
+            if(index == 2){
+                let obj = {
+                    cmd: "queue/join",
+                    data: {type:4,page:0,size:0},
+                };
+                this.websocketSend(obj)
+            }
             let fisrtQueueInfo = []
             if(this.newFisrtQueueInfo != null){
                 if(this.patientStateVal == 0){

src/xt_pages/sign/components/called.vue

@@ -83,7 +83,7 @@ export default {
         padding: 9px 0;
         margin: 0 15px 15px 0;
         float: left;
-        width: 360px;
+        width: 400px;
         cursor: pointer;
         display: flex;
         justify-content: space-between;

src/xt_pages/sign/components/computerCalling.vue

@@ -145,6 +145,17 @@ export default {
                         this.waitingCalledPm = waitingCalledPm
                         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
+                    }
                 }else if(res.channel == 'allQueueList'){
                     let arr = res.data.queue_list.data
                     // let waitingCalledArr = []
@@ -197,6 +208,13 @@ export default {
             //     }) 
             //     this.waitingCalledPm = newArr
             // }
+            if(index == 2){
+                let obj = {
+                    cmd: "queue/join",
+                    data: {type:5,page:0,size:0},
+                };
+                this.websocketSend(obj)
+            }
             let fisrtQueueInfo = []
             if(this.newFisrtQueueInfo != null){
                 if(this.patientStateVal == 0){

src/xt_pages/sign/lineUp.vue

@@ -325,17 +325,17 @@ export default {
         this.timerID = setInterval(() => {
             this.updateTime()
         }, 1000);
-        this.newTimes = setInterval(() => {
-            this.reload()
-        }, 1000 * 60 * 30);
+        // this.newTimes = setInterval(() => {
+        //     this.reload()
+        // }, 1000 * 60 * 30);
     },
     beforeDestroy(){
         clearInterval(this.timer);　　// 清除定时器
         this.timer = null
         clearInterval(this.timerID);
         this.timerID = null;　　// 清除定时器
-        clearInterval(this.newTimes);　　// 清除定时器
-        this.newTimes = null
+        // clearInterval(this.newTimes);　　// 清除定时器
+        // this.newTimes = null
         let unObj = {
             cmd:'queue/unjoin',
             data:{type:2}

src/xt_pages/sign/signIn.vue

@@ -170,11 +170,17 @@ export default {
         },
     },
     created(){
-        if(sessionStorage.getItem('signInKey') != null){
-            if(sessionStorage.getItem('signInKey') == 1){
+        if(sessionStorage.getItem('signIn') != null){
+            if(sessionStorage.getItem('signIn') == 1){
                 this.dialogTableVisible = true
             }
+            sessionStorage.removeItem('signIn')
         }
+        // if(sessionStorage.getItem('signInKey') != null){
+        //     if(sessionStorage.getItem('signInKey') == 1){
+        //         this.dialogTableVisible = true
+        //     }
+        // }
         this.initData = {
             cmd: "queue/join",
             data: {type:1,page:1,size:10},
@@ -210,7 +216,9 @@ export default {
         }, 1000);
         // this.updateTime();
         this.newTimes = setInterval(() => {
-            this.reload()
+            // this.reload()
+            sessionStorage.setItem('signIn',1);
+            window.location.reload()
         }, 1000 * 60 * 30);
     },
     beforeDestroy(){