diff --git a/1.html b/1.html deleted file mode 100644 index faa04c6..0000000 --- a/1.html +++ /dev/null @@ -1,42 +0,0 @@ - - -
- - -normal: This is an English text with عربى text embedded.
- -isolate: This is an English text with عربى text embedded.
-bidi-override: This is an English text with عربى text embedded.
-isolate-override: This is an English text with عربى text embedded.
-plaintext: This is an English text with عربى text embedded.
- - diff --git a/src/views/waitList/index.vue b/src/views/waitList/index.vue index 7642838..021681c 100644 --- a/src/views/waitList/index.vue +++ b/src/views/waitList/index.vue @@ -130,7 +130,7 @@ export default { queryCondition: [], logoUrl: "", logoUrlBackup: "", - groupIndex: 0, + groupIndex: -1, roomNameList: [], }; }, @@ -233,6 +233,7 @@ export default { try { if (frame.body) { let data = JSON.parse(frame.body); + data['msg'] = JSON.parse(data['msg']); if (this.groupIndex >= 0) { if (this.roomNameList[this.groupIndex]) { if (!this.roomNameList[this.groupIndex].includes(data['msg']['patientRoomName'])) { @@ -251,7 +252,9 @@ export default { } }, onFailed: function (frame) { - console.warn('MQ Failed: ' + frame); + console.group("MQ Failed:") + console.log(frame); + console.groupEnd(); setTimeout(() => { this.client = Stomp.client(MQTT_SERVICE); Stomp.over(this.client); @@ -264,6 +267,7 @@ export default { this.popupMag = this.popupMsgList[0].replace(/[,,]/g, '').split('#'); this.showPopup = true; this.playNum++; + if (this.synth) { const utterance = new SpeechSynthesisUtterance(this.popupMsgList[0].replace(/#/g, '')); utterance.rate = 0.6; @@ -340,9 +344,6 @@ export default { this.getDataTimer = setInterval(() => { this.onGetPageData(); }, 35000); - this.popupTimer = setInterval(() => { - this.onPopupPlay(); - }, 2000); window.addEventListener('resize', this.onCalculate); this.setRabitMQ(); }); @@ -356,8 +357,14 @@ export default { this.dateTimer = setInterval(() => { this.currentDateTime = dayjs().format('YYYY-MM-DD HH:mm dddd'); }, 10000); - - + this.popupTimer = setInterval(() => { + this.onPopupPlay(); + }, 2000); + // setTimeout(() => { + // this.popupMsgList.push('请,金尧仙,的家属#到,手术室门口接病人'); + // this.popupMsgList.push('请,金尧仙,的家属#到,手术室门口接病人'); + // this.popupMsgList.push('请,金尧仙,的家属#到,手术室门口接病人'); + // }, 1000); }); }, components: {