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

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -544,7 +544,7 @@
                         </span>
                       </td>
                       <td>{{ monitor.dialysate_temperature ? monitor.dialysate_temperature : "" }}</td>
-                      <td>{{ monitor.conductivity ? monitor.conductivity : "" }}
+                      <td>{{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}
                       </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/signIn.vue

@@ -42,7 +42,7 @@
                 </div>
                 <div class="signInMain">
                     <div style="display: flex;justify-content: space-between;padding:10px;">
-                        <div class="signInMainLeft">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
                                 <p>姓名</p>
@@ -63,7 +63,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="signInMainRight">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainRight' : 'noneSignInMainRight'" v-if='Object.keys(queueInfo).length>0'>
                             <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>
@@ -85,7 +85,7 @@
                 </div>
                 <div class="signInMain">
                     <div style="display: flex;justify-content: space-between;padding:10px;">
-                        <div class="signInMainLeft">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainLeft' : 'signInMainLeft100'">
                             <div class="signInMainLeftTitle">
                                 <p>排队号</p>
                                 <p>姓名</p>
@@ -106,7 +106,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="signInMainRight">
+                        <div :class="Object.keys(queueInfo).length>0 ? 'signInMainRight' : 'noneSignInMainRight'">
                             <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>
@@ -230,6 +230,9 @@ export default {
                         data: {page:1,size:10,sort:1}
                     };
                     this.websocketSend(obj)
+                    setTimeout(() => { 
+                       this.queueInfo = {} 
+                    }, 10000);
                     
                 }else if(res.channel == 'queue/queuelist'){
                     console.log(11111111111,res.data)
@@ -284,7 +287,7 @@ export default {
                 this.showSetting = false;
             }
         },
-    }
+    },
 }
 </script>
 
@@ -313,6 +316,11 @@ export default {
         height: 980px;
         border-radius: 15px;
     }
+    .signInMainLeft100{
+        width:99%;
+        height: 980px;
+        border-radius: 15px;
+    }
     .signInMainLeftTitle{
         display: flex;
         justify-content: space-between;
@@ -365,6 +373,9 @@ export default {
         width: 30%;
         height: 980px;
     }
+    .noneSignInMainRight{
+        display: none;
+    }
     .signInMainRightTitle{
         height: 260px;
         border-radius: 15px 15px 0 0;