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

src/views/layout/components/Navbar.vue

               this.showWsErr = true;
               this.wsErrMsg = "网络已断开，请检查网络后重新打开页面";
               console.log('navigator',navigator)
+              let http = 'wss://socket.sgjyun.com?token=' 
+              // let http = 'ws://socket.szjkhd.com?token=' //测试
+              let token = localStorage.getItem("token")
+              this.$store.state.user.websocket = new ReconnectingWebSocket(
+                http + token
+              );
             } else if (
               navigator.onLine == true &&
               this.websocket.readyState == 1
               this.showWsErr = false;
             }
             this.websocket.send("1");
-          }, 55000);
+          }, 30000);
         }
         
       }).catch(error => {

src/xt_pages/dialysis/details/index.vue

         // let res = re.data;
         // console.log('res3333333333',res)
         if(res.channel == 'queue/join'){
-          if(res.data.fisrtQueueInfo != null){
-            if(res.data.fisrtQueueInfo.create_time){
-              res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+          let timeType = null
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
             }
           }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+          if(res.data.fisrtQueueInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
           this.queueConfig = res.data.queueConfig
-          this.fisrtQueueInfo = res.data.fisrtQueueInfo
+          // this.fisrtQueueInfo = res.data.fisrtQueueInfo
           let arr = res.data.patientQueueList.data
           let waitingCalledArr = []
           let calledArr = []
         }else if(res.channel == 'patientCallInfo'){
           res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
           this.fisrtQueueInfo = res.data.patientInfo
+        }else if(res.channel == 'fisrtQueueInfo'){
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
+            }
+          }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.patientInfo
+          if(res.data.patientInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.patientInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.patientInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
         }
       }
     },

src/xt_pages/dialysis/schedualPatient.vue

     created() {
       if(sessionStorage.getItem('signIn') != null){
         setTimeout(() => {    
-          this.$router.replace({ path: '/signIn' })
+          if(sessionStorage.getItem('signIn') == 1){
+            this.$router.replace({ path: '/signIn' })
+          }else if(sessionStorage.getItem('signIn') == 2){
+            this.$router.replace({ path: '/lineUp' })
+          }
         },1000)
       }
       var schedule_type_selected = this.$store.getters.schedule_type_selected
           console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
             let timeType = null
-            if(new Date().getHours() < 11){
+            if(this.schedule_type_selected == 1){
               timeType = 1
-            }else if(new Date().getHours() >= 11){
+            }else if(this.schedule_type_selected == 2){
               timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
             }
             let fisrtQueueInfo = []
             this.newFisrtQueueInfo = res.data.fisrtQueueInfo
           }else if(res.channel == 'patientCallInfo'){
             res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
             this.fisrtQueueInfo = res.data.patientInfo
+          }else if(res.channel == 'fisrtQueueInfo'){
+            if(this.schedule_type_selected == 1){
+              timeType = 1
+            }else if(this.schedule_type_selected == 2){
+              timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
+            }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.patientInfo
+            if(res.data.patientInfo != null){
+                if(timeType == 1){
+                    fisrtQueueInfo = res.data.patientInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(timeType == 2){
+                    fisrtQueueInfo = res.data.patientInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
           }
         }
       },

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

               :label="item.name"
               :name="item.name"
             >
+            <div class="RP">Rp
               <el-date-picker
                 v-model="item.pre_time"
                 type="datetime"
                 value-format="yyyy-MM-dd hh:mm"
                 placeholder="选择日期">
               </el-date-picker>
-
-            </el-tab-pane>
-            <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
-            </el-tab-pane>
-            <div class="RP">Rp
               <div style="float: right;margin-bottom:5px;margin-right:1%;">
                 <el-button
                   round
                 </el-button>
               </div>
             </div>
+              
 
-
-
+            </el-tab-pane>
+            <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
+            </el-tab-pane>
+            
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>

src/xt_pages/sign/components/beforeDialysisCalling.vue

                             // this.waitingCalled = waitingCalledArr
                             this.waitingCalledAm = waitingCalledAm
                             this.waitingCalledPm = waitingCalledPm
-                            this.called = calledArr
+                            // this.called = calledArr
                         }
                         if(res.data.type == 4){
                             let arr = res.data.patientQueueList.data
                         // this.waitingCalled = waitingCalledArr
                         this.waitingCalledAm = waitingCalledAm
                         this.waitingCalledPm = waitingCalledPm
-                        this.called = calledArr
+                        // this.called = calledArr
                     }else if(res.channel == 'patientCallInfo'){
                         res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')
                         this.fisrtQueueInfo = res.data.patientInfo
                         this.newFisrtQueueInfo = res.data.patientInfo
+                    }else if(res.channel == 'fisrtQueueInfo'){
+                        let fisrtQueueInfo = []
+                        this.newFisrtQueueInfo = res.data.patientInfo
+                        if(res.data.patientInfo != null){
+                            if(this.patientStateVal == 0){
+                                fisrtQueueInfo = res.data.patientInfo.morning
+                                if(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
+                                }
+                            }else if(this.patientStateVal == 1){
+                                fisrtQueueInfo = res.data.patientInfo.afternoon
+                                if(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
+                                }
+                            }
+                        }
+                        this.fisrtQueueInfo = fisrtQueueInfo
                     }
                 
             }

src/xt_pages/sign/components/computerCalling.vue

                         // this.waitingCalled = waitingCalledArr
                         this.waitingCalledAm = waitingCalledAm
                         this.waitingCalledPm = waitingCalledPm
-                        this.called = calledArr
+                        // this.called = calledArr
                     }
                     if(res.data.type == 5){
                         let arr = res.data.patientQueueList.data
                     // this.waitingCalled = waitingCalledArr
                     this.waitingCalledAm = waitingCalledAm
                     this.waitingCalledPm = waitingCalledPm
-                    this.called = calledArr
+                    // this.called = calledArr
                 }else if(res.channel == 'patientCallInfo'){
                     res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
                     this.fisrtQueueInfo = res.data.patientInfo

src/xt_pages/sign/components/waitingCalled.vue

                 </div>
             </div>
             <div class="waitingOneRight">
-                <span v-if="item.schedule_type == 1">上午</span>
-                <span v-if="item.schedule_type == 2">下午</span>
-                <span v-if="item.schedule_type == 3">晚上</span>
-                <span>{{ item.queue_no }}号</span>
+                <div>
+                    <span v-if="item.schedule_type == 1">上午</span>
+                    <span v-if="item.schedule_type == 2">下午</span>
+                    <span v-if="item.schedule_type == 3">晚上</span>
+                    <span>{{ item.queue_no }}号</span>
+                </div>
+                <i class="el-icon-delete deleteIcon" @click="deletePatient(item.patient_id)"></i>
             </div>
             <!-- <div class="waitingOneRight" @click="call(item.patient_id)" style="display: none;">
                 <img src="../../../assets/img/volume.png" alt="">
                 }
                 
             })
+        },
+        deletePatient(patient_id){
+            this.$confirm('是否删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let org_id =  parseInt(sessionStorage.getItem("org_id"));
+                let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
+                axios.get('/api/index/delpatient?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+                    console.log(res)
+                    // let patientArr = res.data.queue_list.data
+                    // this.patientArr = patientArr
+                    // this.$emit('child-event',this.patientArr)
+                    if(res.data.code == 200){
+                        this.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                    }
+                })
+                
+            }).catch(() => {
+                        
+            });
+
+
             
         }
+        
     }
     // watch:{
     //     waitingCalled:{
         }
         .waitingOneRight{
             color:#999;
+            text-align: center;
             img{
                 width: 30px;
                 margin-top: 6px;
             }
+            .deleteIcon{
+                font-size: 22px;
+                color:red;
+                margin-top: 10px;
+            }
         }
     }
 }

src/xt_pages/sign/lineUp.vue

         },
     },
     created(){
-        if(sessionStorage.getItem('lineUpKey') != null){
-            if(sessionStorage.getItem('lineUpKey') == 1){
+        if(sessionStorage.getItem('signIn') != null){
+            if(sessionStorage.getItem('signIn') == 2){
                 this.dialogTableVisible = true
             }
+            sessionStorage.removeItem('signIn')
         }
         this.initData = {
             cmd: "queue/join",
         this.timerID = setInterval(() => {
             this.updateTime()
         }, 1000);
-        // this.newTimes = setInterval(() => {
-        //     this.reload()
-        // }, 1000 * 60 * 30);
+        this.newTimes = setInterval(() => {
+            // this.reload()
+            sessionStorage.setItem('signIn',2);
+            window.location.reload()
+        }, 1000 * 60 * 30);
     },
     beforeDestroy(){
         clearInterval(this.timer);　　// 清除定时器