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

src/xt_pages/sign/signIn.vue

@@ -146,7 +146,8 @@ export default {
             timer:null,
             timerID:null,
             time:'',
-            newdate:''
+            newdate:'',
+            ds:null
         }
     },
     computed: {
@@ -222,7 +223,8 @@ export default {
                         item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                     })
                 }else if(res.channel == "patientQueueInfo"){
-
+                    clearTimeout(this.ds)
+                    this.ds = null
                     this.queueInfo = res.data.queueInfo
                     this.page = 1
                     let obj = {
@@ -230,7 +232,8 @@ export default {
                         data: {page:1,size:10,sort:1}
                     };
                     this.websocketSend(obj)
-                    setTimeout(() => { 
+                    
+                    this.ds = setTimeout(() => { 
                        this.queueInfo = {} 
                     }, 60000);