Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -740,7 +740,6 @@
                 'record_time': this.record_date,
                 'admin_user_id':this.$store.getters.xt_user.user.id
 
-
               }
               axios.get('http://127.0.0.1:9532/api/refund/post', {
                 params: params

src/xt_pages/sign/signIn.vue

@@ -196,7 +196,7 @@ export default {
                 console.log('执行')
                 this.page++
                 let obj = {
-                    cmd: "queue/queuelistbyq",
+                    cmd: "queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(obj)
@@ -204,7 +204,7 @@ export default {
                 console.log('执行2222')
                 this.page = 1
                 let newobj = {
-                    cmd: "queue/queuelistbyq",
+                    cmd: "queuelistbyq",
                     data: {page:this.page,size:10,sort:1}
                 };
                 this.websocketSend(newobj)
@@ -263,7 +263,7 @@ export default {
                         this.queueInfo = res.data.queueInfo
                         this.page = 1
                         let obj = {
-                            cmd: "queue/queuelistbyq",
+                            cmd: "queue/queuelist",
                             data: {page:1,size:10,sort:1}
                         };
                         this.websocketSend(obj)
@@ -279,13 +279,6 @@ export default {
                         this.signInList.map(item => {
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                         })
-                    }else if(res.channel == 'queue/queuelistbyq'){
-                        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);