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

@@ -42,7 +42,7 @@
                 </div>
                 <div class="signInMain">
                     <div style="display: flex;justify-content: space-between;padding:10px;">
-                        <div class="signInMainLeft">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
                                 <p>姓名</p>
@@ -63,7 +63,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="signInMainRight">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainRight' : 'noneSignInMainRight'" v-if='Object.keys(queueInfo).length>0'>
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
                             <div class="signInMainRightContent">
                                 <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排队号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
@@ -85,7 +85,7 @@
                 </div>
                 <div class="signInMain">
                     <div style="display: flex;justify-content: space-between;padding:10px;">
-                        <div class="signInMainLeft">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
                                 <p>姓名</p>
@@ -106,7 +106,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="signInMainRight">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainRight' : 'noneSignInMainRight'">
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
                             <div class="signInMainRightContent">
                                 <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排队号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
@@ -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 = {
@@ -231,6 +233,10 @@ export default {
                     };
                     this.websocketSend(obj)
                     
+                    this.ds = setTimeout(() => { 
+                       this.queueInfo = {} 
+                    }, 60000);
+                    
                 }else if(res.channel == 'queue/queuelist'){
                     console.log(11111111111,res.data)
                     this.signInList = res.data.patientQueueList.data
@@ -284,7 +290,7 @@ export default {
                 this.showSetting = false;
             }
         },
-    }
+    },
 }
 </script>
 
@@ -313,6 +319,11 @@ export default {
         height: 980px;
         border-radius: 15px;
     }
+    .signInMainLeft100{
+        width:100%;
+        height: 980px;
+        border-radius: 15px;
+    }
     .signInMainLeftTitle{
         display: flex;
         justify-content: space-between;
@@ -365,6 +376,9 @@ export default {
         width: 30%;
         height: 980px;
     }
+    .noneSignInMainRight{
+        display: none;
+    }
     .signInMainRightTitle{
         height: 260px;
         border-radius: 15px 15px 0 0;