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/components/beforeDialysisCalling.vue

@@ -159,26 +159,33 @@ export default {
                                 calledArr.push(item)
                             }
                         })
-                        // console.log('waitingCalledArr待叫号',waitingCalledArr)
-                        // console.log('waitingCalledArr以较好',calledArr)
                         // this.waitingCalled = waitingCalledArr
-                        this.waitingCalledAm = waitingCalledArr
-                        this.waitingCalledPm = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledAm
+                        this.waitingCalledPm = waitingCalledPm
                         this.called = calledArr
                     }else if(res.channel == 'allQueueList'){
                         let arr = res.data.queue_list.data
-                        let waitingCalledArr = []
+                        // let waitingCalledArr = []
+                        let waitingCalledAm = []
+                        let waitingCalledPm = []
                         let calledArr = []
                         arr.map(item => {
                             if(item.status == 1){
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                waitingCalledArr.push(item)
+                                // waitingCalledArr.push(item)
+                                if(item.schedule_type == 1){
+                                    waitingCalledAm.push(item)
+                                }else if(item.schedule_type == 2){
+                                    waitingCalledPm.push(item)
+                                }
                             }else if(item.status == 2){
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                                 calledArr.push(item)
                             }
                         })
-                        this.waitingCalled = waitingCalledArr
+                        // this.waitingCalled = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledAm
+                        this.waitingCalledPm = waitingCalledPm
                         this.called = calledArr
                     }else if(res.channel == 'patientCallInfo'){
                         res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')

src/xt_pages/sign/components/computerCalling.vue

@@ -136,26 +136,33 @@ export default {
                                 calledArr.push(item)
                             }
                         })
-                        // console.log('waitingCalledArr',waitingCalledArr)
-                        // console.log('waitingCalledArr',calledArr)
                         // this.waitingCalled = waitingCalledArr
-                        this.waitingCalledAm = waitingCalledArr
-                        this.waitingCalledPm = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledAm
+                        this.waitingCalledPm = waitingCalledPm
                         this.called = calledArr
                     }else if(res.channel == 'allQueueList'){
                         let arr = res.data.queue_list.data
-                        let waitingCalledArr = []
+                        // let waitingCalledArr = []
+                        let waitingCalledAm = []
+                        let waitingCalledPm = []
                         let calledArr = []
                         arr.map(item => {
-                            if(item.status == 2){
+                            if(item.status == 1){
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                                waitingCalledArr.push(item)
-                            }else if(item.status == 3){
+                                // waitingCalledArr.push(item)
+                                if(item.schedule_type == 1){
+                                    waitingCalledAm.push(item)
+                                }else if(item.schedule_type == 2){
+                                    waitingCalledPm.push(item)
+                                }
+                            }else if(item.status == 2){
                                 item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                                 calledArr.push(item)
                             }
                         })
-                        this.waitingCalled = waitingCalledArr
+                        // 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')