Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/patient.js

@@ -752,3 +752,11 @@ export function getPatientDialysisInfor(params){
     params:params
   })
 }
+
+export function getContextScheduleList(params){
+  return request({
+    url:"/api/patient/getcontextschedulelist",
+    method:"get",
+    params:params
+  })
+}

src/xt_pages/sign/Contextowner.vue

@@ -48,7 +48,7 @@
                             <p style="width:10%">姓名</p>
                             <p style="width:14%">透析号</p>
                             <p style="width:55%">透析时间</p>
-                            
+
                         </div>
                         <!-- <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
@@ -72,7 +72,7 @@
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div> -->
-                    </div> 
+                    </div>
                     <!-- <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
@@ -121,10 +121,10 @@
                             </div>
                         </div>
                     </div> -->
-                </div> 
-                
+                </div>
+
              </div>
-        
+
         </div>
         <div class="app-container">
             <div class="page_lineUp">
@@ -142,23 +142,23 @@
                         </div>
                         <div class="lineUpList">
                             <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
-                                <!-- <p style="width:12%" > {{ item.xuhao }} </p>
+                                <p style="width:12%" > {{ item.xuhao }} </p>
                                 <p style="width:14%">{{ item.name }}</p>
                                 <p style="width:14%">{{ item.toux }}</p>
-                                <p style="width:55%">{{ item.touxtime }}</p> -->
-                                
+                                <p style="width:55%">{{ item.touxtime }}</p>
+
                                 <!-- <p style="width:14%">{{ item.patient_name }}</p>
                                 <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
                                 <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p> -->
                             </div>
                         </div>
-                    </div> 
-                    
+                    </div>
+
                 </div>
-                
+
             </div>
-             
+
         </div>
     </div>
 </template>
@@ -213,7 +213,7 @@ export default {
             voice:true,
             a:1,
             newTimes:null
-            
+
         }
     },
     computed: {
@@ -267,45 +267,45 @@ export default {
         // this.websocketMess();
     },
     mounted(){
-        
-        this.timer = setInterval(() => {
-            if(this.page < Math.ceil(this.count / 6)){
-                console.log('执行',Math.ceil(this.count / 6),this.page)
-                this.page++
-                let obj = {
-                    cmd: "queue/queuelist",
-                    data: {page:this.page,size:6,sort:0}
-                };
-                this.websocketSend(obj)
-                setTimeout(() => {
-                    this.websocketMess();
-                }, 1000);
-            }
-            else{
-                console.log('执行22223333')
-                this.page = 1
-                let a = {
-                    cmd: "queue/queuelist",
-                    data: {page:this.page,size:6,sort:0}
-                };
-                this.websocketSend(a)
-                setTimeout(() => {
-                    // this.websocketMess();
-                    this.lineUpList
-                }, 1000);
-                
-            }
-            console.log('切换时间',this.queueConfig)
-        }, 1000 * parseInt(this.queueConfig.qhsj));
-        this.timerID = setInterval(() => {
-            this.updateTime()
-        }, 1000);
-        this.newTimes = setInterval(() => {
-            // this.reload()
-            console.log('1222222333333333');
-            sessionStorage.setItem('lineUpKey',1);
-            window.location.reload()
-        }, 1000 * 60 * 30);
+
+        // this.timer = setInterval(() => {
+        //     if(this.page < Math.ceil(this.count / 6)){
+        //         console.log('执行',Math.ceil(this.count / 6),this.page)
+        //         this.page++
+        //         let obj = {
+        //             cmd: "queue/queuelist",
+        //             data: {page:this.page,size:6,sort:0}
+        //         };
+        //         this.websocketSend(obj)
+        //         setTimeout(() => {
+        //             this.websocketMess();
+        //         }, 1000);
+        //     }
+        //     else{
+        //         console.log('执行22223333')
+        //         this.page = 1
+        //         let a = {
+        //             cmd: "queue/queuelist",
+        //             data: {page:this.page,size:6,sort:0}
+        //         };
+        //         this.websocketSend(a)
+        //         setTimeout(() => {
+        //             // this.websocketMess();
+        //             this.lineUpList
+        //         }, 1000);
+
+        //     }
+        //     console.log('切换时间',this.queueConfig)
+        // }, 1000 * parseInt(this.queueConfig.qhsj));
+        // this.timerID = setInterval(() => {
+        //     this.updateTime()
+        // }, 1000);
+        // this.newTimes = setInterval(() => {
+        //     // this.reload()
+        //     console.log('1222222333333333');
+        //     sessionStorage.setItem('lineUpKey',1);
+        //     window.location.reload()
+        // }, 1000 * 60 * 30);
     },
     beforeDestroy(){
         clearInterval(this.timer);// 清除定时器
@@ -342,7 +342,7 @@ export default {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                
+
                     if(res.channel == 'queue/join'){
                         if(res.data.type == 2){
                             this.queueConfig = res.data.queueConfig
@@ -373,7 +373,7 @@ export default {
                         console.log(999999999999,res.data)
                         let second = res.data.second
                         let newType = res.data.type
-                    
+
                         console.log('执行几次',this.voiceNum)
                         if(this.voice == true){
                             this.patient_id = res.data.patientInfo.patient_id
@@ -392,7 +392,7 @@ export default {
                                     this.voicePrompt(res.data.callVolUrl)
                                 }else{
                                     this.voiceNum = 1;
-                                    this.voice = true 
+                                    this.voice = true
                                     let obj = {
                                         cmd: "queue/callreturn",
                                         data: {patient_id:this.patient_id,type:newType},
@@ -410,13 +410,13 @@ export default {
                         }
                     }else if(res.channel == 'updateCallList'){
                         this.receivingPatient = res.data.queue_list
-                        
+
                     }else if(res.channel == 'updateWaitCallList'){
                         this.waitDoctorList = res.data.queue_list
                     }else if(res.channel == 'updateUpCallList'){
                         this.upPatientList = res.data.queue_list
                     }
-                
+
                 // else if(res.channel == "patientQueueInfo"){
                 //     this.queueInfo = res.data.queueInfo
                 //     let obj = {
@@ -424,7 +424,7 @@ export default {
                 //         data: {page:1,size:10}
                 //     };
                 //     this.websocketSend(obj)
-                    
+
                 // }
             }
         },
@@ -505,7 +505,7 @@ export default {
         border-radius: 15px;
         display: flex;
         flex-direction: column;
-        
+
     }
     .lineUpMainLeftTitle{
         // display: flex;
@@ -539,13 +539,13 @@ export default {
         .lineUpListOne{
             height:16%;
             padding: 0.5%;
-            // 
+            //
             // display: flex;
             // justify-content: space-between;
             align-items: center;
             color:#1C6895;
             >p{
-                
+
                 width:25%;
                 text-align: center;
                 display: inline-block;