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

src/xt_pages/sign/lineUp.vue

@@ -53,7 +53,12 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">{{ item.queue_no }}</p>
+                                <p style="width:12%">
+                                    <span v-if="item.schedule_type == 1">上午</span>
+                                    <span v-if="item.schedule_type == 2">上午</span>
+                                    <span v-if="item.schedule_type == 3">上午</span>
+                                    {{ item.queue_no }}号
+                                </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
                                 <p style="width:14%">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
@@ -132,7 +137,12 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <p style="width:12%">{{ item.queue_no }}</p>
+                                <p style="width:12%">
+                                    <span v-if="item.schedule_type == 1">上午</span>
+                                    <span v-if="item.schedule_type == 2">上午</span>
+                                    <span v-if="item.schedule_type == 3">上午</span>
+                                    {{ item.queue_no }}号
+                                </p>
                                 <p style="width:14%">{{ item.patient_name }}</p>
                                 <p style="width:14%">{{ item.dialysis_no }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>

src/xt_pages/sign/signIn.vue

@@ -51,7 +51,12 @@
                             </div>
                             <div class="signInList">
                                 <div class="signInListOne" v-for="(item,index) in signInList" :key="index">
-                                    <p>{{ item.queue_no }}</p>
+                                    <p>
+                                        <span v-if="item.schedule_type == 1">上午</span>
+                                        <span v-if="item.schedule_type == 2">上午</span>
+                                        <span v-if="item.schedule_type == 3">上午</span>
+                                        {{ item.queue_no }}号
+                                    </p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -89,7 +94,12 @@
                             </div>
                             <div class="signInList">
                                 <div class="signInListOne" v-for="(item,index) in signInList" :key="index">
-                                    <p>{{ item.queue_no }}</p>
+                                    <p>
+                                        <span v-if="item.schedule_type == 1">上午</span>
+                                        <span v-if="item.schedule_type == 2">上午</span>
+                                        <span v-if="item.schedule_type == 3">上午</span>
+                                        {{ item.queue_no }}号
+                                    </p>
                                     <p>{{ item.patient_name }}</p>
                                     <p>{{ item.dialysis_no }}</p>
                                     <p>{{ item.create_time }}</p>
@@ -155,23 +165,25 @@ export default {
         this.websocketMess();
     },
     mounted(){
-        if(this.page < Math.ceil(this.count / 10)){
-            console.log('执行')
-            this.page++
-            let obj = {
-                cmd: "queue/queuelist",
-                data: {page:this.page,size:10,sort:1}
-            };
-            this.websocketSend(obj)
-        }else{
-            console.log('执行2222')
-            this.page = 1
-            let newobj = {
-                cmd: "queue/queuelist",
-                data: {page:this.page,size:10,sort:1}
-            };
-            this.websocketSend(newobj)
-        }
+        this.timer = setInterval(() => {
+            if(this.page < Math.ceil(this.count / 10)){
+                console.log('执行')
+                this.page++
+                let obj = {
+                    cmd: "queue/queuelist",
+                    data: {page:this.page,size:10,sort:1}
+                };
+                this.websocketSend(obj)
+            }else{
+                console.log('执行2222')
+                this.page = 1
+                let newobj = {
+                    cmd: "queue/queuelist",
+                    data: {page:this.page,size:10,sort:1}
+                };
+                this.websocketSend(newobj)
+            }
+        }, 5000);
         
         this.timerID = setInterval(() => {
             this.updateTime()
@@ -179,6 +191,7 @@ export default {
         // this.updateTime();
     },
     beforeDestroy(){
+        clearInterval(this.timer);　　// 清除定时器
         clearInterval(this.timerID);　　// 清除定时器
         let obj = {
             cmd: "queue/unjoin",
@@ -318,6 +331,15 @@ export default {
     .signInList{
         font-size: 36px;
         font-weight: 600;
+        >div:nth-child(1){
+            font-size: 50px;
+        }
+        >div:nth-child(2){
+            font-size: 50px;
+        }
+        >div:nth-child(3){
+            font-size: 50px;
+        }
         >div:nth-child(odd){
             background: #F9FDFF;
         }