1

package-lock.json

         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
           "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
           "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": false,
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
           "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
           "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
           "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
           "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": false,
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/xt_pages/sign/components/beforeDialysisCalling.vue

         </div>
         <div style="display:flex;justify-content: space-between;">
             <div class="callingArea">
-                <waiting-called v-if="patientStateVal == 0" :waitingCalled='waitingCalled' ></waiting-called>
-                <called v-if="patientStateVal == 1" :called="called"></called>
+                <waiting-called v-if="patientStateVal == 0" :waitingCalled='waitingCalledAm' ></waiting-called>
+                <waiting-called v-if="patientStateVal == 1" :waitingCalled='waitingCalledPm' ></waiting-called>
+                <called v-if="patientStateVal == 2" :called="called"></called>
             </div>
-            <div class="nowCalling" v-if="patientStateVal == 0">
+            <div class="nowCalling" v-if="patientStateVal == 0 || patientStateVal == 1">
                 <p class="nowCallingTitle">当前叫号</p>
                 <p class="nowCallingName">{{ fisrtQueueInfo ? fisrtQueueInfo.patient_name : '' }}</p>
                 <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</p>
                 <el-button type="primary" @click="call(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')" style="margin-left:0;margin: 30px 0 20px 0;">&ensp;叫号&ensp;</el-button>
                 <!-- <el-button style="margin: 0px 0 20px 0;" @click="pass(fisrtQueueInfo.patient_id)">&ensp;过号&ensp;</el-button> -->
-                <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下一位</el-button>
+                <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下一位</el-button>
             </div>
         </div>
     </div>
     data(){
         return{
             patient_state:[
-                {value: 0,label: '待叫号'},
-                {value: 1,label: '已叫号'},
+                {value: 0,label: '上午待叫号'},
+                {value: 1,label: '下午待叫号'},
+                {value: 2,label: '已叫号'},
             ],
             patientStateVal: 0,
             waitingCalled:[],
             fisrtQueueInfo:{},
             timer:null,
 
+            waitingCalledAm:[],
+            waitingCalledPm:[],
+            newFisrtQueueInfo:{}
+
         }
     },
     computed: {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res3333333333',res)
-                if(res.channel == 'queue/join'){
-                    if(res.data.fisrtQueueInfo != null){
-                        if(res.data.fisrtQueueInfo.create_time){
-                            res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                if(res.data.type == 3){
+                    if(res.channel == 'queue/join'){
+                        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')
+                                }
+                            }
                         }
-                        
+                        this.fisrtQueueInfo = fisrtQueueInfo
+                        let arr = res.data.patientQueueList.data
+                        // 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)
+                                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)
+                            }
+                        })
+                        console.log('waitingCalledArr待叫号',waitingCalledArr)
+                        console.log('waitingCalledArr以较好',calledArr)
+                        // this.waitingCalled = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledArr
+                        this.waitingCalledPm = waitingCalledArr
+                        this.called = calledArr
+                    }else if(res.channel == 'allQueueList'){
+                        let arr = res.data.queue_list.data
+                        let waitingCalledArr = []
+                        let calledArr = []
+                        arr.map(item => {
+                            if(item.status == 1){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                waitingCalledArr.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.called = calledArr
+                    }else if(res.channel == 'patientCallInfo'){
+                        res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')
+                        this.fisrtQueueInfo = res.data.patientInfo
                     }
-                    this.fisrtQueueInfo = res.data.fisrtQueueInfo
-                    let arr = res.data.patientQueueList.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 1){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
-                        }else if(item.status == 2){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            calledArr.push(item)
-                        }
-                    })
-                    console.log('waitingCalledArr待叫号',waitingCalledArr)
-                    console.log('waitingCalledArr以较好',calledArr)
-                    this.waitingCalled = waitingCalledArr
-                    this.called = calledArr
-                }else if(res.channel == 'allQueueList'){
-                    let arr = res.data.queue_list.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 1){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.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.called = calledArr
-                }else if(res.channel == 'patientCallInfo'){
-                    res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')
-                    this.fisrtQueueInfo = res.data.patientInfo
                 }
             }
         },
         handleStateChange: function(index) {
             this.patientStateVal = index
+            // if(index == 0){
+            //     let arr = this.waitingCalledAm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 1){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledAm = newArr
+            // }else if(index == 1){
+            //     let arr = this.waitingCalledPm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 2){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledPm = newArr
+            // }
+            let fisrtQueueInfo = []
+            if(this.newFisrtQueueInfo != null){
+                if(this.patientStateVal == 0){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(this.patientStateVal == 1){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
         },
         call(patient_id){
             if(patient_id == undefined || patient_id == ""){
                 }
             })
         },
-        next(patient_id){
+        next(patient_id,schedule_type){
             if(patient_id == undefined || patient_id == ""){
                 this.$message.error('已经是最后一位了');
                 return
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
             let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
-            axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+            axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
                 console.log(res)
                 // let patientArr = res.data.queue_list.data
                 // this.patientArr = patientArr

src/xt_pages/sign/components/computerCalling.vue

         </div>
         <div style="display:flex;justify-content: space-between;">
             <div class="callingArea">
-                <called v-if="patientStateVal == 0" :index='1' :called='waitingCalled'></called>
-                <called v-if="patientStateVal == 1" :called="called"></called>
+                <called v-if="patientStateVal == 0" :index='1' :called='waitingCalledAm'></called>
+                <called v-if="patientStateVal == 1" :index='1' :called='waitingCalledPm'></called>
+                <called v-if="patientStateVal == w" :called="called"></called>
             </div>
             <div class="nowCalling" v-if="patientStateVal == 0">
                 <p class="nowCallingTitle">当前叫号</p>
                 <p class="nowCallingName">{{ fisrtQueueInfo ? fisrtQueueInfo.patient_name : '' }}</p>
                 <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</p>
                 <p><el-button type="primary" @click="call(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')" style="margin-left:0;margin: 30px 0 20px 0;">&ensp;叫号&ensp;</el-button></p>
-                <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下一位</el-button>
+                <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下一位</el-button>
             </div>
         </div>
     </div>
     data(){
         return{
             patient_state:[
-                {value: 0,label: '待叫号'},
-                {value: 1,label: '已叫号'},
+                {value: 0,label: '上午待叫号'},
+                {value: 1,label: '下午待叫号'},
+                {value: 2,label: '已叫号'},
             ],
             patientStateVal: 0,
             waitingCalled:[],
             fisrtQueueInfo:{},
             timer:null,
 
+            waitingCalledAm:[],
+            waitingCalledPm:[],
+            newFisrtQueueInfo:{}
+
         }
     },
     computed: {
         },
         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.fisrtQueueInfo != null){
-                        if(res.data.fisrtQueueInfo.create_time){
-                            res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
-                        }
-                    }
-                    this.fisrtQueueInfo = res.data.fisrtQueueInfo
-                    let arr = res.data.patientQueueList.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 2){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
-                        }else if(item.status == 3){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            calledArr.push(item)
-                        }
-                    })
-                    console.log('waitingCalledArr',waitingCalledArr)
-                    console.log('waitingCalledArr',calledArr)
-                    this.waitingCalled = waitingCalledArr
-                    this.called = calledArr
-                }else if(res.channel == 'allQueueList'){
-                    let arr = res.data.queue_list.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 2){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
-                        }else if(item.status == 3){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            calledArr.push(item)
+                if(res.data.type == 4){
+                    if(res.channel == 'queue/join'){
+                        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')
+                                }
+                            }
                         }
-                    })
-                    this.waitingCalled = waitingCalledArr
-                    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
+                        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)
+                            }
+                        })
+                        console.log('waitingCalledArr',waitingCalledArr)
+                        console.log('waitingCalledArr',calledArr)
+                        // this.waitingCalled = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledArr
+                        this.waitingCalledPm = waitingCalledArr
+                        this.called = calledArr
+                    }else if(res.channel == 'allQueueList'){
+                        let arr = res.data.queue_list.data
+                        let waitingCalledArr = []
+                        let calledArr = []
+                        arr.map(item => {
+                            if(item.status == 2){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                waitingCalledArr.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.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) {
             this.patientStateVal = index
+            // if(index == 0){
+            //     let arr = this.waitingCalledAm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 1){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledAm = newArr
+            // }else if(index == 1){
+            //     let arr = this.waitingCalledPm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 2){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledPm = newArr
+            // }
+            let fisrtQueueInfo = []
+            if(this.newFisrtQueueInfo != null){
+                if(this.patientStateVal == 0){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(this.patientStateVal == 1){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
         },
         call(patient_id){
             if(patient_id == undefined || patient_id == ""){
                 }
             })
         },
-        next(patient_id){
+        next(patient_id,schedule_type){
             if(patient_id == undefined || patient_id == ""){
                 this.$message.error('已经是最后一位了');
                 return
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
             let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
-            axios.get('/api/index/nextupcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+            axios.get('/api/index/nextupcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
                 console.log(res)
                 // let patientArr = res.data.queue_list.data
                 // this.patientArr = patientArr

src/xt_pages/sign/lineUp.vue

                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.channel == 'queue/join'){
-                    this.queueConfig = res.data.queueConfig
-                    this.lineUpList = res.data.patientQueueList.data
-                    this.receivingPatient = res.data.receivingPatient
-                    this.waitDoctorList = res.data.waitDoctorList
-                    this.upPatientList = res.data.upPatientList
-                    this.count = res.data.patientQueueList.count
-                    // this.lineUpList.map(item => {
-                    //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
-                    // })
-                }else if(res.channel == 'queue/queuelist'){
-                    this.lineUpList = res.data.patientQueueList.data
-                    this.count = res.data.patientQueueList.count
-                    // this.lineUpList.map(item => {
-                    //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
-                    //     if(item.start_time != null){
-                    //         item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
-                    //     }
-                    //     if(item.status == 5 || item.end_time){
-                    //         item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
-                    //     }
-                    // })
-                }else if(res.channel == 'patientCallInfo'){
-                    console.log(999999999999,res.data)
-                    
-                    
-                    console.log('执行几次',this.voiceNum)
-                    if(this.voice == true){
-                        this.patient_id = res.data.patientInfo.patient_id
-                        this.voice = false
-                        // let time1 = null
-                        this.voicePrompt(res.data.callVolUrl)
-                        this.voiceTime = setInterval(() => {
-                            let num = null
-                            if(res.data.patientInfo.status == 2){
-                                num = parseInt(this.queueConfig.jzdcbbcs)
-                            }else if(res.data.patientInfo.status == 3){
-                                num = parseInt(this.queueConfig.sjdcbbcs)
-                            }
-                            if(this.voiceNum < num){
-                                this.voiceNum++
-                                this.voicePrompt(res.data.callVolUrl)
-                            }else{
-                                this.voiceNum = 1;
-                                this.voice = true 
-                                let obj = {
-                                    cmd: "queue/callreturn",
-                                    data: {patient_id:this.patient_id},
-                                };
-                                this.websocketSend(obj)
-                                clearInterval(this.voiceTime);
-                                this.voiceTime = null
-                            }
-                        },6000)
-                    }else {
-                        // this.$message({
-                        //     message: '警告哦，这是一条警告消息',
-                        //     type: 'warning'
-                        // });
+                if(res.data.type == 2){
+                    if(res.channel == 'queue/join'){
+                        this.queueConfig = res.data.queueConfig
+                        this.lineUpList = res.data.patientQueueList.data
+                        this.receivingPatient = res.data.receivingPatient
+                        this.waitDoctorList = res.data.waitDoctorList
+                        this.upPatientList = res.data.upPatientList
+                        this.count = res.data.patientQueueList.count
+                        // this.lineUpList.map(item => {
+                        //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
+                        // })
+                    }else if(res.channel == 'queue/queuelist'){
+                        this.lineUpList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        // this.lineUpList.map(item => {
+                        //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
+                        //     if(item.start_time != null){
+                        //         item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
+                        //     }
+                        //     if(item.status == 5 || item.end_time){
+                        //         item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
+                        //     }
+                        // })
+                    }else if(res.channel == 'patientCallInfo'){
+                        console.log(999999999999,res.data)
+                        
+                        
+                        console.log('执行几次',this.voiceNum)
+                        if(this.voice == true){
+                            this.patient_id = res.data.patientInfo.patient_id
+                            this.voice = false
+                            // let time1 = null
+                            this.voicePrompt(res.data.callVolUrl)
+                            this.voiceTime = setInterval(() => {
+                                let num = null
+                                if(res.data.patientInfo.status == 2){
+                                    num = parseInt(this.queueConfig.jzdcbbcs)
+                                }else if(res.data.patientInfo.status == 3){
+                                    num = parseInt(this.queueConfig.sjdcbbcs)
+                                }
+                                if(this.voiceNum < num){
+                                    this.voiceNum++
+                                    this.voicePrompt(res.data.callVolUrl)
+                                }else{
+                                    this.voiceNum = 1;
+                                    this.voice = true 
+                                    let obj = {
+                                        cmd: "queue/callreturn",
+                                        data: {patient_id:this.patient_id},
+                                    };
+                                    this.websocketSend(obj)
+                                    clearInterval(this.voiceTime);
+                                    this.voiceTime = null
+                                }
+                            },6000)
+                        }else {
+                            // this.$message({
+                            //     message: '警告哦，这是一条警告消息',
+                            //     type: 'warning'
+                            // });
+                        }
+                    }else if(res.channel == 'updateCallList'){
+                        this.receivingPatient = res.data.queue_list
+                        
+                    }else if(res.channel == 'updateWaitCallList'){
+                        this.waitDoctorList = res.data.queue_list
+                    }else if(res.channel == 'updateUpCallList'){
+                        this.upPatientList = res.data.queue_list
                     }
-                }else if(res.channel == 'updateCallList'){
-                    this.receivingPatient = res.data.queue_list
-                    
-                }else if(res.channel == 'updateWaitCallList'){
-                    this.waitDoctorList = res.data.queue_list
-                }else if(res.channel == 'updateUpCallList'){
-                    this.upPatientList = res.data.queue_list
                 }
                 // else if(res.channel == "patientQueueInfo"){
                 //     this.queueInfo = res.data.queueInfo

src/xt_pages/sign/signIn.vue

                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.channel == 'queue/join'){
-                    this.signInList = res.data.patientQueueList.data
-                    this.count = res.data.patientQueueList.count
-                    this.signInList.map(item => {
-                        item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    })
-                }else if(res.channel == "patientQueueInfo"){
-                    clearTimeout(this.ds)
-                    this.ds = null
-                    this.queueInfo = res.data.queueInfo
-                    this.page = 1
-                    let obj = {
-                        cmd: "queue/queuelist",
-                        data: {page:1,size:10,sort:1}
-                    };
-                    this.websocketSend(obj)
-                    
-                    this.ds = setTimeout(() => { 
-                       this.queueInfo = {} 
-                    }, 60000);
-                    
-                }else if(res.channel == 'queue/queuelist'){
-                    console.log(11111111111,res.data)
-                    this.signInList = res.data.patientQueueList.data
-                    this.count = res.data.patientQueueList.count
-                    this.signInList.map(item => {
-                        item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    })
+                if(res.data.type == 1){
+                    if(res.channel == 'queue/join'){
+                        this.signInList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        this.signInList.map(item => {
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        })
+                    }else if(res.channel == "patientQueueInfo"){
+                        clearTimeout(this.ds)
+                        this.ds = null
+                        this.queueInfo = res.data.queueInfo
+                        this.page = 1
+                        let obj = {
+                            cmd: "queue/queuelist",
+                            data: {page:1,size:10,sort:1}
+                        };
+                        this.websocketSend(obj)
+                        
+                        this.ds = setTimeout(() => { 
+                        this.queueInfo = {} 
+                        }, 60000);
+                        
+                    }else if(res.channel == 'queue/queuelist'){
+                        console.log(11111111111,res.data)
+                        this.signInList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        this.signInList.map(item => {
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        })
+                    }
                 }
                 // console.log("action", re.action);
                 // console.log("data", JSON.stringify(res));