1

src/views/layout/components/Navbar.vue

@@ -312,7 +312,7 @@ export default {
               this.showWsErr = false;
             }
             this.websocket.send("1");
-          }, 3000);
+          }, 55000);
         }
         
       }).catch(error => {

src/xt_pages/dialysis/schedualPatient.vue

@@ -346,17 +346,13 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         clearInterval(timer)
       })
 
-      this.timers = setInterval(() => {
-        let obj = {
-            cmd: "queue/join",
-            data: {type:3,page:0,size:0},
-        };
-        this.websocketSend(obj)
-      }, 1000*50);
+      let obj = {
+          cmd: "queue/join",
+          data: {type:3,page:0,size:0},
+      };
+      this.websocketSend(obj)
     },
     beforeDestroy(){
-      clearInterval(this.timers);　　// 清除定时器
-      this.timers = null
 
       let unObj = {
           cmd: "queue/unjoin",
@@ -380,7 +376,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
         this.websocket.onmessage = e => {
           let res = JSON.parse(e.data);
           // let res = re.data;
-          // console.log('res3333333333',res)
+          console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
             if(res.data.fisrtQueueInfo != null){
               if(res.data.fisrtQueueInfo.create_time){

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -535,14 +535,16 @@
                       </td>
                       <td>{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}
                       </td>
-                      <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time ) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
-                        {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
-                      </td>
-                      <td v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
-                        {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
+                      <td>
+                        <span v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time ) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
+                          {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}
+                        </span>
+                        <span v-if="(dialysisOrder && monitor.operate_time <= dialysisOrder.end_time) && (dialysisOrder && monitor.operate_time >= dialysisOrder.start_time)">
+                          {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : 0 }}
+                        </span>
                       </td>
                       <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                      <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
+                      <td>{{ monitor.conductivity ? monitor.conductivity : "" }}
                       </td>
                       <td v-if="(dialysisOrder && monitor.operate_time > dialysisOrder.end_time) || (dialysisOrder && monitor.operate_time < dialysisOrder.start_time)">
                         {{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}

src/xt_pages/sign/lineUp.vue

@@ -43,7 +43,7 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排号</p>
+                            <p style="width:12%">排队号</p>
                             <p style="width:14%">姓名</p>
                             <p style="width:14%">病例号</p>
                             <p style="width:14%">床位号</p>
@@ -122,7 +122,7 @@
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
                         <div class="lineUpMainLeftTitle">
-                            <p style="width:12%">排号</p>
+                            <p style="width:12%">排队号</p>
                             <p style="width:14%">姓名</p>
                             <p style="width:14%">病例号</p>
                             <p style="width:14%">床位号</p>
@@ -284,7 +284,7 @@ export default {
                 this.page++
                 let obj = {
                     cmd: "queue/queuelist",
-                    data: {page:this.page,size:6}
+                    data: {page:this.page,size:6,sort:0}
                 };
                 this.websocketSend(obj)
                 setTimeout(() => {
@@ -295,7 +295,7 @@ export default {
                 this.page = 1
                 let a = {
                     cmd: "queue/queuelist",
-                    data: {page:this.page,size:6}
+                    data: {page:this.page,size:6,sort:0}
                 };
                 this.websocketSend(a)
                 setTimeout(() => {

src/xt_pages/sign/signIn.vue

@@ -44,7 +44,7 @@
                     <div style="display: flex;justify-content: space-between;padding:10px;">
                         <div class="signInMainLeft">
                             <div class="signInMainLeftTitle">
-                                <p>排号</p>
+                                <p>排队号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
                                 <p>签到时间</p>
@@ -61,7 +61,7 @@
                         <div class="signInMainRight">
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
                             <div class="signInMainRightContent">
-                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排队号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
                         </div>
@@ -82,7 +82,7 @@
                     <div style="display: flex;justify-content: space-between;padding:10px;">
                         <div class="signInMainLeft">
                             <div class="signInMainLeftTitle">
-                                <p>排号</p>
+                                <p>排队号</p>
                                 <p>姓名</p>
                                 <p>病历号</p>
                                 <p>签到时间</p>
@@ -99,7 +99,7 @@
                         <div class="signInMainRight">
                             <div class="signInMainRightTitle"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>{{ queueInfo.patient_name }}</span></div>
                             <div class="signInMainRightContent">
-                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
+                                <p style="margin: 0 auto;display:flex;align-items: center;" v-if='Object.keys(queueInfo).length>0'><span>排队号&nbsp;</span><span style="font-size:180px;">{{ queueInfo.queue_no }}</span></p>
                             </div>
                             <div class="signInMianRightBottom"><span style="margin:0 auto;" v-if='Object.keys(queueInfo).length>0'>签到成功</span></div>
                         </div>
@@ -160,7 +160,7 @@ export default {
             this.page++
             let obj = {
                 cmd: "queue/queuelist",
-                data: {page:this.page,size:10}
+                data: {page:this.page,size:10,sort:1}
             };
             this.websocketSend(obj)
         }else{
@@ -168,7 +168,7 @@ export default {
             this.page = 1
             let newobj = {
                 cmd: "queue/queuelist",
-                data: {page:this.page,size:10}
+                data: {page:this.page,size:10,sort:1}
             };
             this.websocketSend(newobj)
         }
@@ -211,9 +211,10 @@ export default {
                 }else if(res.channel == "patientQueueInfo"){
 
                     this.queueInfo = res.data.queueInfo
+                    this.page = 1
                     let obj = {
                         cmd: "queue/queuelist",
-                        data: {page:1,size:10}
+                        data: {page:1,size:10,sort:1}
                     };
                     this.websocketSend(obj)