|
|
@@ -74,7 +74,7 @@
|
|
74
|
74
|
<p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
|
|
75
|
75
|
</div>
|
|
76
|
76
|
</div>
|
|
77
|
|
- </div>
|
|
|
77
|
+ </div>
|
|
78
|
78
|
<div class="callingBox">
|
|
79
|
79
|
<div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
|
|
80
|
80
|
<div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
|
|
|
@@ -123,10 +123,10 @@
|
|
123
|
123
|
</div>
|
|
124
|
124
|
</div>
|
|
125
|
125
|
</div>
|
|
126
|
|
- </div>
|
|
127
|
|
-
|
|
|
126
|
+ </div>
|
|
|
127
|
+
|
|
128
|
128
|
</div>
|
|
129
|
|
-
|
|
|
129
|
+
|
|
130
|
130
|
<!-- <div class="page_lineUp">
|
|
131
|
131
|
<div class="lineUpTitle">
|
|
132
|
132
|
<div>{{ this.$store.getters.xt_user.org.org_name }}<span> 温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
|
|
|
@@ -159,7 +159,7 @@
|
|
159
|
159
|
<p style="width:16%">07:38:00</p>
|
|
160
|
160
|
</div>
|
|
161
|
161
|
</div>
|
|
162
|
|
- </div>
|
|
|
162
|
+ </div>
|
|
163
|
163
|
<div class="callingBox">
|
|
164
|
164
|
<div class="callingBoxLeft">
|
|
165
|
165
|
<div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
|
|
|
@@ -209,7 +209,7 @@
|
|
209
|
209
|
</div>
|
|
210
|
210
|
</div>
|
|
211
|
211
|
</div>
|
|
212
|
|
-
|
|
|
212
|
+
|
|
213
|
213
|
</div> -->
|
|
214
|
214
|
</div>
|
|
215
|
215
|
<div class="app-container">
|
|
|
@@ -251,7 +251,7 @@
|
|
251
|
251
|
<p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
|
|
252
|
252
|
</div>
|
|
253
|
253
|
</div>
|
|
254
|
|
- </div>
|
|
|
254
|
+ </div>
|
|
255
|
255
|
<div class="callingBox">
|
|
256
|
256
|
<div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
|
|
257
|
257
|
<div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
|
|
|
@@ -301,9 +301,9 @@
|
|
301
|
301
|
</div>
|
|
302
|
302
|
</div>
|
|
303
|
303
|
</div>
|
|
304
|
|
-
|
|
|
304
|
+
|
|
305
|
305
|
</div>
|
|
306
|
|
-
|
|
|
306
|
+
|
|
307
|
307
|
<!-- <div class="page_lineUp">
|
|
308
|
308
|
<div class="lineUpTitle">
|
|
309
|
309
|
<div>{{ this.$store.getters.xt_user.org.org_name }}<span> 温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
|
|
|
@@ -336,7 +336,7 @@
|
|
336
|
336
|
<p style="width:16%">07:38:00</p>
|
|
337
|
337
|
</div>
|
|
338
|
338
|
</div>
|
|
339
|
|
- </div>
|
|
|
339
|
+ </div>
|
|
340
|
340
|
<div class="callingBox">
|
|
341
|
341
|
<div class="callingBoxLeft">
|
|
342
|
342
|
<div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
|
|
|
@@ -386,7 +386,7 @@
|
|
386
|
386
|
</div>
|
|
387
|
387
|
</div>
|
|
388
|
388
|
</div>
|
|
389
|
|
-
|
|
|
389
|
+
|
|
390
|
390
|
</div> -->
|
|
391
|
391
|
</div>
|
|
392
|
392
|
</div>
|
|
|
@@ -410,7 +410,7 @@ export default {
|
|
410
|
410
|
dialogTableVisible:false,
|
|
411
|
411
|
showSetting: false,
|
|
412
|
412
|
lineUpList:[],
|
|
413
|
|
- count:0,
|
|
|
413
|
+ // count:0,
|
|
414
|
414
|
page:1,
|
|
415
|
415
|
timer:null,
|
|
416
|
416
|
queueConfig:{
|
|
|
@@ -428,8 +428,8 @@ export default {
|
|
428
|
428
|
|
|
429
|
429
|
voice:true,
|
|
430
|
430
|
a:1,
|
|
431
|
|
- newTimes:null
|
|
432
|
|
-
|
|
|
431
|
+ newTimes:null,
|
|
|
432
|
+
|
|
433
|
433
|
}
|
|
434
|
434
|
},
|
|
435
|
435
|
computed: {
|
|
|
@@ -445,10 +445,19 @@ export default {
|
|
445
|
445
|
sessionStorage.removeItem('lineUpKey')
|
|
446
|
446
|
sessionStorage.removeItem('signInKey')
|
|
447
|
447
|
}
|
|
448
|
|
- this.initData = {
|
|
449
|
|
- cmd: "queue/join",
|
|
450
|
|
- data: {type:2,page:1,size:6},
|
|
451
|
|
- };
|
|
|
448
|
+ if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
|
|
|
449
|
+ this.initData = {
|
|
|
450
|
+ cmd: "queue/join",
|
|
|
451
|
+ data: {type:2,page:1,size:6},
|
|
|
452
|
+ };
|
|
|
453
|
+ }else{
|
|
|
454
|
+ this.initData = {
|
|
|
455
|
+ cmd: "queue/join",
|
|
|
456
|
+ data: {type:2,page:1,size:10},
|
|
|
457
|
+ };
|
|
|
458
|
+ }
|
|
|
459
|
+ console.log('11111111222',this.initData);
|
|
|
460
|
+
|
|
452
|
461
|
this.websocketSend(this.initData)
|
|
453
|
462
|
let newobj = {
|
|
454
|
463
|
cmd: "queue/callreturn",
|
|
|
@@ -483,33 +492,61 @@ export default {
|
|
483
|
492
|
// this.websocketMess();
|
|
484
|
493
|
},
|
|
485
|
494
|
mounted(){
|
|
486
|
|
-
|
|
|
495
|
+ console.log('queueConfig.jzjhyc1111',this.queueConfig.jzjhyc,this.queueConfig.sjjhyc);
|
|
|
496
|
+
|
|
487
|
497
|
this.timer = setInterval(() => {
|
|
|
498
|
+
|
|
|
499
|
+ if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
|
|
488
|
500
|
if(this.page < Math.ceil(this.count / 6)){
|
|
489
|
|
- console.log('执行',Math.ceil(this.count / 6),this.page)
|
|
490
|
|
- this.page++
|
|
491
|
|
- let obj = {
|
|
|
501
|
+ console.log('执行',Math.ceil(this.count / 6),this.page)
|
|
|
502
|
+ this.page++
|
|
|
503
|
+ let obj = {
|
|
|
504
|
+ cmd: "queue/queuelist",
|
|
|
505
|
+ data: {page:this.page,size:6,sort:0}
|
|
|
506
|
+ };
|
|
|
507
|
+ this.websocketSend(obj)
|
|
|
508
|
+ setTimeout(() => {
|
|
|
509
|
+ this.websocketMess();
|
|
|
510
|
+ }, 1000);
|
|
|
511
|
+ }else{
|
|
|
512
|
+ console.log('执行22223333')
|
|
|
513
|
+ this.page = 1
|
|
|
514
|
+ let a = {
|
|
492
|
515
|
cmd: "queue/queuelist",
|
|
493
|
516
|
data: {page:this.page,size:6,sort:0}
|
|
494
|
517
|
};
|
|
495
|
|
- this.websocketSend(obj)
|
|
|
518
|
+ this.websocketSend(a)
|
|
496
|
519
|
setTimeout(() => {
|
|
497
|
520
|
this.websocketMess();
|
|
498
|
521
|
}, 1000);
|
|
|
522
|
+
|
|
|
523
|
+ }
|
|
|
524
|
+ }else{
|
|
|
525
|
+ if(this.page < Math.ceil(this.count / 10)){
|
|
|
526
|
+ console.log('执行',Math.ceil(this.count / 10),this.page)
|
|
|
527
|
+ this.page++
|
|
|
528
|
+ let obj = {
|
|
|
529
|
+ cmd: "queue/queuelist",
|
|
|
530
|
+ data: {page:this.page,size:10,sort:0}
|
|
|
531
|
+ };
|
|
|
532
|
+ this.websocketSend(obj)
|
|
|
533
|
+ setTimeout(() => {
|
|
|
534
|
+ this.websocketMess();
|
|
|
535
|
+ }, 1000);
|
|
499
|
536
|
}else{
|
|
500
|
|
- console.log('执行22223333')
|
|
|
537
|
+ console.log('执行22223333444444')
|
|
501
|
538
|
this.page = 1
|
|
502
|
539
|
let a = {
|
|
503
|
540
|
cmd: "queue/queuelist",
|
|
504
|
|
- data: {page:this.page,size:6,sort:0}
|
|
|
541
|
+ data: {page:this.page,size:10,sort:0}
|
|
505
|
542
|
};
|
|
506
|
543
|
this.websocketSend(a)
|
|
507
|
544
|
setTimeout(() => {
|
|
508
|
545
|
this.websocketMess();
|
|
509
|
546
|
}, 1000);
|
|
510
|
|
-
|
|
511
|
547
|
}
|
|
512
|
|
- console.log('切换时间',this.queueConfig)
|
|
|
548
|
+ }
|
|
|
549
|
+ console.log('切换时间11',this.queueConfig)
|
|
513
|
550
|
}, 1000 * parseInt(this.queueConfig.qhsj));
|
|
514
|
551
|
this.timerID = setInterval(() => {
|
|
515
|
552
|
this.updateTime()
|
|
|
@@ -543,7 +580,7 @@ export default {
|
|
543
|
580
|
websocketSend(data) {
|
|
544
|
581
|
try {
|
|
545
|
582
|
this.websocket.send(JSON.stringify(data))
|
|
546
|
|
-
|
|
|
583
|
+
|
|
547
|
584
|
} catch (error) {
|
|
548
|
585
|
this.showError = true;
|
|
549
|
586
|
this.showIndex = 4;
|
|
|
@@ -551,12 +588,12 @@ export default {
|
|
551
|
588
|
}
|
|
552
|
589
|
},
|
|
553
|
590
|
websocketMess() {
|
|
554
|
|
- console.log('测试')
|
|
|
591
|
+ console.log('测试',this.websocket)
|
|
555
|
592
|
this.websocket.onmessage = e => {
|
|
556
|
593
|
let res = JSON.parse(e.data);
|
|
557
|
594
|
// let res = re.data;
|
|
558
|
595
|
console.log('res',res)
|
|
559
|
|
-
|
|
|
596
|
+
|
|
560
|
597
|
if(res.channel == 'queue/join'){
|
|
561
|
598
|
if(res.data.type == 2){
|
|
562
|
599
|
this.queueConfig = res.data.queueConfig
|
|
|
@@ -587,7 +624,7 @@ export default {
|
|
587
|
624
|
console.log(999999999999,res.data)
|
|
588
|
625
|
let second = res.data.second
|
|
589
|
626
|
let newType = res.data.type
|
|
590
|
|
-
|
|
|
627
|
+
|
|
591
|
628
|
console.log('执行几次',this.voiceNum)
|
|
592
|
629
|
if(this.voice == true){
|
|
593
|
630
|
this.patient_id = res.data.patientInfo.patient_id
|
|
|
@@ -606,7 +643,7 @@ export default {
|
|
606
|
643
|
this.voicePrompt(res.data.callVolUrl)
|
|
607
|
644
|
}else{
|
|
608
|
645
|
this.voiceNum = 1;
|
|
609
|
|
- this.voice = true
|
|
|
646
|
+ this.voice = true
|
|
610
|
647
|
let obj = {
|
|
611
|
648
|
cmd: "queue/callreturn",
|
|
612
|
649
|
data: {patient_id:this.patient_id,type:newType},
|
|
|
@@ -624,13 +661,13 @@ export default {
|
|
624
|
661
|
}
|
|
625
|
662
|
}else if(res.channel == 'updateCallList'){
|
|
626
|
663
|
this.receivingPatient = res.data.queue_list
|
|
627
|
|
-
|
|
|
664
|
+
|
|
628
|
665
|
}else if(res.channel == 'updateWaitCallList'){
|
|
629
|
666
|
this.waitDoctorList = res.data.queue_list
|
|
630
|
667
|
}else if(res.channel == 'updateUpCallList'){
|
|
631
|
668
|
this.upPatientList = res.data.queue_list
|
|
632
|
669
|
}
|
|
633
|
|
-
|
|
|
670
|
+
|
|
634
|
671
|
// else if(res.channel == "patientQueueInfo"){
|
|
635
|
672
|
// this.queueInfo = res.data.queueInfo
|
|
636
|
673
|
// let obj = {
|
|
|
@@ -638,7 +675,7 @@ export default {
|
|
638
|
675
|
// data: {page:1,size:10}
|
|
639
|
676
|
// };
|
|
640
|
677
|
// this.websocketSend(obj)
|
|
641
|
|
-
|
|
|
678
|
+
|
|
642
|
679
|
// }
|
|
643
|
680
|
}
|
|
644
|
681
|
},
|
|
|
@@ -719,7 +756,7 @@ export default {
|
|
719
|
756
|
border-radius: 15px;
|
|
720
|
757
|
display: flex;
|
|
721
|
758
|
flex-direction: column;
|
|
722
|
|
-
|
|
|
759
|
+
|
|
723
|
760
|
}
|
|
724
|
761
|
.lineUpMainLeftTitle{
|
|
725
|
762
|
display: flex;
|
28169