Browse Source

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

XMLWAN 4 years ago
parent
commit
9b7f36a092
1 changed files with 21 additions and 7 deletions
  1. 21 7
      src/xt_pages/sign/signIn.vue

+ 21 - 7
src/xt_pages/sign/signIn.vue View File

42
                 </div>
42
                 </div>
43
                 <div class="signInMain">
43
                 <div class="signInMain">
44
                     <div style="display: flex;justify-content: space-between;padding:10px;">
44
                     <div style="display: flex;justify-content: space-between;padding:10px;">
45
-                        <div class="signInMainLeft">
45
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
46
                             <div class="signInMainLeftTitle">
46
                             <div class="signInMainLeftTitle">
47
                                 <p>排队号</p>
47
                                 <p>排队号</p>
48
                                 <p>姓名</p>
48
                                 <p>姓名</p>
63
                                 </div>
63
                                 </div>
64
                             </div>
64
                             </div>
65
                         </div>
65
                         </div>
66
-                        <div class="signInMainRight">
66
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainRight' : 'noneSignInMainRight'" v-if='Object.keys(queueInfo).length>0'>
67
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
67
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
68
                             <div class="signInMainRightContent">
68
                             <div class="signInMainRightContent">
69
                                 <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>
69
                                 <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
                 </div>
85
                 </div>
86
                 <div class="signInMain">
86
                 <div class="signInMain">
87
                     <div style="display: flex;justify-content: space-between;padding:10px;">
87
                     <div style="display: flex;justify-content: space-between;padding:10px;">
88
-                        <div class="signInMainLeft">
88
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
89
                             <div class="signInMainLeftTitle">
89
                             <div class="signInMainLeftTitle">
90
                                 <p>排队号</p>
90
                                 <p>排队号</p>
91
                                 <p>姓名</p>
91
                                 <p>姓名</p>
106
                                 </div>
106
                                 </div>
107
                             </div>
107
                             </div>
108
                         </div>
108
                         </div>
109
-                        <div class="signInMainRight">
109
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainRight' : 'noneSignInMainRight'">
110
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
110
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
111
                             <div class="signInMainRightContent">
111
                             <div class="signInMainRightContent">
112
                                 <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>
112
                                 <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
             timer:null,
146
             timer:null,
147
             timerID:null,
147
             timerID:null,
148
             time:'',
148
             time:'',
149
-            newdate:''
149
+            newdate:'',
150
+            ds:null
150
         }
151
         }
151
     },
152
     },
152
     computed: {
153
     computed: {
222
                         item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
223
                         item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
223
                     })
224
                     })
224
                 }else if(res.channel == "patientQueueInfo"){
225
                 }else if(res.channel == "patientQueueInfo"){
225
-
226
+                    clearTimeout(this.ds)
227
+                    this.ds = null
226
                     this.queueInfo = res.data.queueInfo
228
                     this.queueInfo = res.data.queueInfo
227
                     this.page = 1
229
                     this.page = 1
228
                     let obj = {
230
                     let obj = {
231
                     };
233
                     };
232
                     this.websocketSend(obj)
234
                     this.websocketSend(obj)
233
                     
235
                     
236
+                    this.ds = setTimeout(() => { 
237
+                       this.queueInfo = {} 
238
+                    }, 60000);
239
+                    
234
                 }else if(res.channel == 'queue/queuelist'){
240
                 }else if(res.channel == 'queue/queuelist'){
235
                     console.log(11111111111,res.data)
241
                     console.log(11111111111,res.data)
236
                     this.signInList = res.data.patientQueueList.data
242
                     this.signInList = res.data.patientQueueList.data
284
                 this.showSetting = false;
290
                 this.showSetting = false;
285
             }
291
             }
286
         },
292
         },
287
-    }
293
+    },
288
 }
294
 }
289
 </script>
295
 </script>
290
 
296
 
313
         height: 980px;
319
         height: 980px;
314
         border-radius: 15px;
320
         border-radius: 15px;
315
     }
321
     }
322
+    .signInMainLeft100{
323
+        width:100%;
324
+        height: 980px;
325
+        border-radius: 15px;
326
+    }
316
     .signInMainLeftTitle{
327
     .signInMainLeftTitle{
317
         display: flex;
328
         display: flex;
318
         justify-content: space-between;
329
         justify-content: space-between;
365
         width: 30%;
376
         width: 30%;
366
         height: 980px;
377
         height: 980px;
367
     }
378
     }
379
+    .noneSignInMainRight{
380
+        display: none;
381
+    }
368
     .signInMainRightTitle{
382
     .signInMainRightTitle{
369
         height: 260px;
383
         height: 260px;
370
         border-radius: 15px 15px 0 0;
384
         border-radius: 15px 15px 0 0;