1

src/xt_pages/sign/components/computerCalling.vue

@@ -95,61 +95,34 @@ export default {
         },
         websocketMess() {
             this.websocket.onmessage = e => {
-                
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                
-                    if(res.channel == 'queue/join'){
-                        if(res.data.type == 4){
-                            let fisrtQueueInfo = []
-                            this.newFisrtQueueInfo = res.data.fisrtQueueInfo
-                            if(res.data.fisrtQueueInfo != null){
-                                if(this.patientStateVal == 0){
-                                    fisrtQueueInfo = res.data.fisrtQueueInfo.morning
-                                    if(fisrtQueueInfo.create_time){
-                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
-                                    }
-                                }else if(this.patientStateVal == 1){
-                                    fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
-                                    if(fisrtQueueInfo.create_time){
-                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
-                                    }
+                if(res.channel == 'queue/join'){
+                    if(res.data.type == 4){
+                        let fisrtQueueInfo = []
+                        this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+                        if(res.data.fisrtQueueInfo != null){
+                            if(this.patientStateVal == 0){
+                                fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                                if(fisrtQueueInfo.create_time){
+                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
                                 }
-                            }
-                            this.fisrtQueueInfo = fisrtQueueInfo
-                            let arr = res.data.patientQueueList.data
-                            // let waitingCalledArr = []
-                            let waitingCalledAm = []
-                            let waitingCalledPm = []
-                            let calledArr = []
-                            arr.map(item => {
-                                if(item.status == 2){
-                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                    // waitingCalledArr.push(item)
-                                    if(item.schedule_type == 1){
-                                        waitingCalledAm.push(item)
-                                    }else if(item.schedule_type == 2){
-                                        waitingCalledPm.push(item)
-                                    }
-                                }else if(item.status == 3){
-                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                    calledArr.push(item)
+                            }else if(this.patientStateVal == 1){
+                                fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                                if(fisrtQueueInfo.create_time){
+                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
                                 }
-                            })
-                            // this.waitingCalled = waitingCalledArr
-                            this.waitingCalledAm = waitingCalledAm
-                            this.waitingCalledPm = waitingCalledPm
-                            this.called = calledArr
+                            }
                         }
-                    }else if(res.channel == 'allQueueList'){
-                        let arr = res.data.queue_list.data
+                        this.fisrtQueueInfo = fisrtQueueInfo
+                        let arr = res.data.patientQueueList.data
                         // let waitingCalledArr = []
                         let waitingCalledAm = []
                         let waitingCalledPm = []
                         let calledArr = []
                         arr.map(item => {
-                            if(item.status == 1){
+                            if(item.status == 2){
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                                 // waitingCalledArr.push(item)
                                 if(item.schedule_type == 1){
@@ -157,7 +130,7 @@ export default {
                                 }else if(item.schedule_type == 2){
                                     waitingCalledPm.push(item)
                                 }
-                            }else if(item.status == 2){
+                            }else if(item.status == 3){
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                                 calledArr.push(item)
                             }
@@ -166,11 +139,35 @@ export default {
                         this.waitingCalledAm = waitingCalledAm
                         this.waitingCalledPm = waitingCalledPm
                         this.called = calledArr
-                    }else if(res.channel == 'patientCallInfo'){
-                        res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
-                        this.fisrtQueueInfo = res.data.patientInfo
-                    } 
-                
+                    }
+                }else if(res.channel == 'allQueueList'){
+                    let arr = res.data.queue_list.data
+                    // let waitingCalledArr = []
+                    let waitingCalledAm = []
+                    let waitingCalledPm = []
+                    let calledArr = []
+                    arr.map(item => {
+                        if(item.status == 2){
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            // waitingCalledArr.push(item)
+                            if(item.schedule_type == 1){
+                                waitingCalledAm.push(item)
+                            }else if(item.schedule_type == 2){
+                                waitingCalledPm.push(item)
+                            }
+                        }else if(item.status == 3){
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            calledArr.push(item)
+                        }
+                    })
+                    // this.waitingCalled = waitingCalledArr
+                    this.waitingCalledAm = waitingCalledAm
+                    this.waitingCalledPm = waitingCalledPm
+                    this.called = calledArr
+                }else if(res.channel == 'patientCallInfo'){
+                    res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
+                    this.fisrtQueueInfo = res.data.patientInfo
+                }
             }
         },
         handleStateChange: function(index) {