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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -371,13 +371,13 @@
     data() {
       return {
         register: [
-          {value: 1, label: "普通"},
-          {value: 2, label: '急诊'},
-          {value: 3, label: "儿科"},
-          {value: 4, label: "麻醉"},
-          {value: 5, label: "精一"},
-          {value: 6, label: "精二"},
-          {value: 7, label: "其他"},
+          {value: 11, label: "普通门诊"},
+          {value: 12, label: '门诊挂号'},
+          {value: 13, label: "急诊"},
+          {value: 14, label: "门诊慢性病"},
+          {value: 15, label: "门诊统筹"},
+          {value: 16, label: "门诊特殊病"},
+          {value: 21, label: "普通住院"},
 
         ],
         isLastOrNextVisible: false,

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -85,11 +85,11 @@ export default {
         }
     },
     mounted(){
-        let obj = {
-            cmd: "queue/join",
-            data: {type:3,page:0,size:0},
-        };
-        this.websocketSend(obj)
+        // let obj = {
+        //     cmd: "queue/join",
+        //     data: {type:3,page:0,size:0},
+        // };
+        // this.websocketSend(obj)
     },
     beforeDestroy(){
 

src/xt_pages/sign/components/computerCalling.vue

@@ -63,11 +63,11 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        let obj = {
-            cmd: "queue/join",
-            data: {type:4,page:0,size:0},
-        };
-        this.websocketSend(obj)
+        // let obj = {
+        //     cmd: "queue/join",
+        //     data: {type:4,page:0,size:0},
+        // };
+        // this.websocketSend(obj)
     },
     beforeDestroy(){
         let unObj = {