7月5日杨青

src/api/patient.js

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

src/xt_pages/Dialysisanalysis/albumin/albuminall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -429,12 +433,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/bloodPhosphorus/phosphorusall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -508,12 +512,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/bloodPotassium/potassiumall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -428,12 +432,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/calcium/calciumall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -429,12 +433,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/hemoglobin/hemoglobinall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -508,12 +512,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/otherIndicators/otherall.vue

@@ -73,6 +73,10 @@
             :data="tableData"
             :show-summary = true
             border
+            :header-cell-style="{
+              backgroundColor: 'rgb(245, 247, 250)',
+              color: '#606266'
+            }"
             style="width: 100%;">
                 <el-table-column
                     prop="date"
@@ -82,7 +86,6 @@
                 </el-table-column>
                 <el-table-column
                     prop="name"
-
                     label="人数"
                     >
                 </el-table-column>
@@ -181,12 +184,25 @@ export default{
           {
             type: "pie",
             label: {
-              show: true,
-              formatter:"{b} : {d}% ({c})"
+              normal : {
+                formatter: '{b}:{c}: ({d}%)',
+                textStyle : {
+                    fontWeight : 'normal',
+                    fontSize : 15,
+                    color : "black"
+                }
+              }
               // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
             },
             radius: "65%", //饼图半径
-            data: this.pieData
+            data: this.pieData,
+            itemStyle : {
+              emphasis: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
           }
         ]
       };

src/xt_pages/Dialysisanalysis/platelets/plateletsall.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -65,6 +69,7 @@
         </el-table-column>
         <el-table-column
           prop="count"
+          align="center"
           label="人数"
         >
         </el-table-column>
@@ -427,12 +432,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }

src/xt_pages/Dialysisanalysis/qualitycontrol/totalSstatistics.vue

@@ -55,6 +55,10 @@
       <el-table
         :data="tableData"
         border
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
         style="width: 100%;">
         <el-table-column
           prop="name"
@@ -64,6 +68,7 @@
         </el-table-column>
         <el-table-column
           prop="count"
+          align="center"
           label="人数"
         >
         </el-table-column>
@@ -428,12 +433,25 @@ export default {
               {
                 type: 'pie',
                 label: {
-                  show: true,
-                  formatter: '{b} : {d}% ({c})'
+                  normal : {
+                    formatter: '{b}:{c}: ({d}%)',
+                    textStyle : {
+                        fontWeight : 'normal',
+                        fontSize : 15,
+                        color : "black"
+                    }
+                  }
                   // b代表名称，c代表对应值，d代表百分比"{b} : {d}% ({c})"
                 },
                 radius: '65%', //饼图半径
-                data: this.pieData
+                data: this.pieData,
+                itemStyle : {
+                  emphasis: {
+                      shadowBlur: 10,
+                      shadowOffsetX: 0,
+                      shadowColor: 'rgba(0, 0, 0, 0.5)'
+                  }
+                }
               }
             ]
           }
@@ -669,5 +687,7 @@ export default {
   display: flex;
   justify-content: space-around;
   color: #1e5feb;
+  
 }
+
 </style>

src/xt_pages/dialysis/details/dialog/treatmentSummaryDialog.vue

@@ -569,9 +569,6 @@ export default {
 
       }
   
-
-    
-     
      
      var doc_str = ""
       console.log("医嘱2333333333333",this.predialysis_evaluation)

src/xt_pages/dialysis/dialysisFlow.vue

@@ -143,7 +143,9 @@
           :label="item.name"
         >
           <template slot-scope="scope">
-            <span>{{getModeFinish(scope.row.dialysis_finish,item.id)}}</span>
+            <span :class="edtf(scope.row.dialysis_finish,item.id) ? 'lv' : 'hong' ">
+              {{getModeFinish(scope.row.dialysis_finish,item.id)}}
+            </span>
           </template>
 
         </el-table-column>
@@ -317,8 +319,6 @@
                 </span>
            </template>
          </el-table-column> -->
-  
-
         </el-table>
   
         <el-pagination
@@ -473,7 +473,7 @@
         complicationList: [],
         template_id:0,
         org_id:0,
-  
+        names:'',
       };
     },
     created() {
@@ -778,14 +778,27 @@
       var name = "×"
        if(val!=null){
          for(let i=0;i<val.length;i++){
+        
             if(val[i].module == id){
                name = "√"
             }
          }
        }
+     
        return name
-     }
-      
+     },
+      edtf(val,id){
+        var name
+        if(val!=null){
+         for(let i=0;i<val.length;i++){
+          
+            if(val[i].module == id){
+               name = "√"
+            }
+         }
+       }
+       return name
+      }
       
     },
     components: {
@@ -883,6 +896,14 @@
     width: 20px;
     height: 20px;
   }
+  .hong{
+    color: red;
+    font-size: 18px;
+  }
+  .lv{
+    color: rgb(26, 240, 115);
+    font-size: 18px;
+  }
   </style>
   <style scoped>
    /* 合并表格线样式 */

src/xt_pages/sign/Contextowner.vue

@@ -38,8 +38,6 @@
             </el-row>
             <div class="page_lineUp">
                 <div class="lineUpTitle">
-                    <!-- <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
-                    <div>{{ newdate }}&nbsp;&nbsp;{{ time }}</div> -->
                 </div>
                 <div class="lineUpMain">
                     <div class="lineUpMainLeft">
@@ -48,83 +46,21 @@
                             <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">
-                                <p style="width:12%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id!=10440">
-                                    <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%" v-if="$store.getters.xt_user.org.id !=0 && $store.getters.xt_user.org.id !=10440">{{ item.dialysis_no }}</p>
-                                <p style="width:14%">{{ item.partition_name + item.bed_name }}</p>
-                                <p style="width:14%">
-                                    <span v-if="item.status == 1">待接诊</span>
-                                    <span v-if="item.status == 2">接诊中</span>
-                                    <span v-if="item.status == 3">待上机</span>
-                                    <span v-if="item.status == 4">透析中</span>
-                                    <span v-if="item.status == 5">已下机</span>
-                                </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 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>
-                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
-                                <div class="callingTop" style="margin-bottom:10px;">
-                                    <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
-                                    <div class="callingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
-                                    <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
-                                    <div class="callingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div :class="(queueConfig.jzjhyc == 0 && queueConfig.sjjhyc == 1) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.sjjhyc == 1">
-                            <div class="callingTitle newCallingTitle"><span style="margin: 0 auto;">上<br />机<br />叫<br />号</span></div>
-                            <div style="flex: 1;justify-content: space-between;display: flex;flex-direction: column;">
-                                <div class="callingTop" style="margin-bottom:10px;">
-                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
-                                    <div class="callingContent newCallingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="callingTop" style="border-radius: 0 0 15px 0;">
-                                    <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
-                                    <div class="callingContent newCallingContent">
-                                        <div>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                            <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+                    </div> 
+                    <div class="lineUpList">
+                        <div class="lineUpListOne" v-for="(item,index) in lineUpList" :key="index">
+                            <p style="width:12%" > {{ index+1 }} </p>
+                            <p style="width:14%">{{ getPatientName(item.patient_id)}}</p>
+                            <p style="width:14%">{{ getDialysisNo(item.patient_id) }}</p>
+                            <p style="width:55%">{{getContent(item.child) }}</p>
                         </div>
-                    </div> -->
-                </div>
-
+                    </div>
+                </div> 
+                
              </div>
-
+        
         </div>
         <div class="app-container">
             <div class="page_lineUp">
@@ -142,31 +78,28 @@
                         </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:14%">{{ item.name }}</p>
-                                <p style="width:14%">{{ item.toux }}</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> -->
+                                <p style="width:12%" > {{ index+1 }} </p>
+                                <p style="width:14%">{{ getPatientName(item.patient_id)}}</p>
+                                <p style="width:14%">{{ getDialysisNo(item.patient_id) }}</p>
+                                <p style="width:55%">{{getContent(item.child) }}</p>
                             </div>
                         </div>
-                    </div>
-
+                    </div> 
+                    
                 </div>
-
+                
             </div>
-
+             
         </div>
     </div>
 </template>
 
 <script>
+import {getContextScheduleList} from "@/api/patient"
 const moment = require('moment')
 import BreadCrumb from "../components/bread-crumb";
 import screenfull from "screenfull";
+import { uParseTime } from '@/utils/tools'
 export default {
     components:{
         BreadCrumb
@@ -180,20 +113,7 @@ export default {
             ],
             dialogTableVisible:false,
             showSetting: false,
-            lineUpList:[
-                {xuhao:1,name:'张三',toux:1001,touxtime:'07-05 周一上午 HD 8号床  周三上午HD 9号床 周六上午HD 9号床'},
-                {xuhao:2,name:'李四',toux:1002,touxtime:'07-05 周一上午 HD 8号床  周三上午HD 9号床 周六上午HD 9号床'},
-                // {xuhao:3,name:'王五',toux:1003,touxtime:'2023-07-03'},
-                // {xuhao:4,name:'赵六',toux:1004,touxtime:'2023-07-03'},
-                // {xuhao:1,name:'肖雪',toux:1001,touxtime:'2023-07-03'},
-                // {xuhao:2,name:'小舞',toux:1002,touxtime:'2023-07-03'},
-                // {xuhao:3,name:'小明',toux:1003,touxtime:'2023-07-03'},
-                // {xuhao:4,name:'小红',toux:1004,touxtime:'2023-07-03'},
-                // {xuhao:1,name:'小雪',toux:1001,touxtime:'2023-07-03'},
-                // {xuhao:2,name:'小王',toux:1002,touxtime:'2023-07-03'},
-                // {xuhao:3,name:'小爱同学',toux:1003,touxtime:'2023-07-03'},
-                // {xuhao:4,name:'小亦',toux:1004,touxtime:'2023-07-03'},
-            ],
+            lineUpList:[],
             count:0,
             page:1,
             timer:null,
@@ -212,8 +132,13 @@ export default {
 
             voice:true,
             a:1,
-            newTimes:null
-
+            newTimes:null,
+            limit:6,
+            page:1,
+            total:0,
+            patientList:[],
+            deviceNumberList:[],
+            schedule:[],
         }
     },
     computed: {
@@ -222,6 +147,7 @@ export default {
         },
     },
     created(){
+        this.getlist()
         if(sessionStorage.getItem('lineUpKey') != null){
             if(sessionStorage.getItem('lineUpKey') == 1){
                 this.dialogTableVisible = true
@@ -264,67 +190,51 @@ export default {
                 }
             }, 1000);
         }
-        // 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++
+                 this.getlist()
+                setTimeout(() => {
+                    this.websocketMess();
+                }, 1000);
+            }
+            else{
+                console.log('执行22223333')
+                this.page = 1
+                this.getlist()
+                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);// 清除定时器
         this.timer = null
         clearInterval(this.timerID);
         this.timerID = null;// 清除定时器
-        // clearInterval(this.newTimes);　　// 清除定时器
-        // this.newTimes = null
         let unObj = {
             cmd:'queue/unjoin',
             data:{type:2}
         }
         this.websocketSend(unObj)
-        // this.timer = null;
-        // let obj = {
-        //     cmd: "queue/join",
-        //     data: {type:1},
-        // };
-        // this.websocketSend(obj)
     },
     methods:{
         websocketSend(data) {
@@ -342,7 +252,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 +283,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 +302,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 +320,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 +334,7 @@ export default {
                 //         data: {page:1,size:10}
                 //     };
                 //     this.websocketSend(obj)
-
+                    
                 // }
             }
         },
@@ -473,7 +383,389 @@ export default {
         },
         getDates(time){
             return moment(time * 1000).format('HH:mm:ss')
-        }
+        },
+        getlist(){
+            var params = {
+              limit:this.limit,
+              page:this.page,
+              start_time:"2023-07-03",
+              end_time:"2023-07-09"
+            }
+          getContextScheduleList(params).then(response=>{
+             if(response.data.state ==1){
+               var schedule = response.data.data.schedule
+               
+               this.lineUpList = schedule
+               var list = response.data.data.list
+               console.log("list232322323",list)
+               for(let i=0;i<schedule.length;i++){
+                  if(schedule[i].mode_id ==1){
+                    schedule[i].mode_name = "HD"
+                  }
+                  if(schedule[i].mode_id ==2){
+                    schedule[i].mode_name = "HDF"
+                  }
+                  if(schedule[i].mode_id ==3){
+                    schedule[i].mode_name = "HD+HP"
+                  }
+
+                  if(schedule[i].mode_id ==4){
+                    schedule[i].mode_name = "HP"
+                  }
+
+                  if(schedule[i].mode_id ==5){
+                    schedule[i].mode_name = "HF"
+                  }
+
+                  
+                  if(schedule[i].mode_id ==6){
+                    schedule[i].mode_name = "SCUF"
+                  }
+
+                  if(schedule[i].mode_id ==7){
+                    schedule[i].mode_name = "IUF"
+                  }
+
+                  if(schedule[i].mode_id ==8){
+                    schedule[i].mode_name = "HFHD"
+                  }
+
+                  if(schedule[i].mode_id ==9){
+                    schedule[i].mode_name = "HFHD+HP"
+                  }
+                  
+                  if(schedule[i].mode_id ==10){
+                    schedule[i].mode_name = "PHF"
+                  }
+
+                  if(schedule[i].mode_id ==11){
+                    schedule[i].mode_name = "HFR"
+                  }
+
+                  if(schedule[i].mode_id ==12){
+                    schedule[i].mode_name = "HDF+HP"
+                  }
+
+                  if(schedule[i].mode_id ==13){
+                    schedule[i].mode_name = "CRRT"
+                  }
+
+                  if(schedule[i].mode_id ==14){
+                    schedule[i].mode_name = "腹水回输"
+                  }
+
+                  if(schedule[i].mode_id ==15){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==19){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==20){
+                    schedule[i].mode_name = "UF"
+                  }
+                  if(schedule[i].mode_id ==21){
+                    schedule[i].mode_name = "HD+"
+                  }
+
+                  if(schedule[i].mode_id ==22){
+                    schedule[i].mode_name = "血浆胆红素吸附+HDF"
+                  }
+
+                  if(schedule[i].mode_id ==23){
+                    schedule[i].mode_name = "血浆胆红素吸附"
+                  }
+
+                  if(schedule[i].mode_id ==24){
+                    schedule[i].mode_name = "I-HDF"
+                  }
+
+                  if(schedule[i].mode_id ==25){
+                    schedule[i].mode_name = "HD高通"
+                  }
+
+                  if(schedule[i].mode_id ==26){
+                    schedule[i].mode_name = "CVVH"
+                  }
+
+                  if(schedule[i].mode_id ==27){
+                    schedule[i].mode_name = "CVVHD"
+                  }
+
+                  if(schedule[i].mode_id ==28){
+                    schedule[i].mode_name = "CVVHDF"
+                  }
+                  
+                  if(schedule[i].mode_id ==29){
+                    schedule[i].mode_name = "PE"
+                  }
+
+                  if(schedule[i].mode_id ==30){
+                    schedule[i].mode_name = "血浆胆红素吸附+HP"
+                  }
+
+                  if(schedule[i].mode_id ==31){
+                    schedule[i].mode_name = "HPD"
+                  }
+
+                  if(schedule[i].mode_id ==32){
+                    schedule[i].mode_name = "HDP"
+                  }
+
+
+
+
+
+                  if(schedule[i].schedule_week ==1){
+                    schedule[i].schedule_week_name = "周一"
+                  }
+                  if(schedule[i].schedule_week ==2){
+                    schedule[i].schedule_week_name = "周二"
+                  }
+                  if(schedule[i].schedule_week ==3){
+                    schedule[i].schedule_week_name = "周三"
+                  }
+                  if(schedule[i].schedule_week ==4){
+                    schedule[i].schedule_week_name = "周四"
+                  }
+                  if(schedule[i].schedule_week ==5){
+                    schedule[i].schedule_week_name = "周五"
+                  }
+                  if(schedule[i].schedule_week ==6){
+                    schedule[i].schedule_week_name = "周六"
+                  }
+                  if(schedule[i].schedule_week ==7){
+                    schedule[i].schedule_week_name = "周日"
+                  }
+
+                  if(schedule[i].schedule_type ==1){
+                    schedule[i].schedule_type_name = "上午"
+                  }
+                  if(schedule[i].schedule_type ==2){
+                    schedule[i].schedule_type_name = "下午"
+                  }
+                  if(schedule[i].schedule_type ==3){
+                    schedule[i].schedule_type_name = "晚上"
+                  }
+                
+                  schedule[i].child = []
+                 for(let j=0;j<list.length;j++){
+                    
+                    if(schedule[i].patient_id == list[j].patient_id){
+                       schedule[i].child.push(list[j])
+                    }
+                 }
+               } 
+               console.log("schedule",schedule)
+               this.schedule = schedule
+             
+               var total = response.data.data.total
+               console.log("total+23323223",total)
+               var patients =  response.data.data.patients
+               console.log("patinets",patients)
+               this.patientList = patients
+
+               this.deviceNumberList =  response.data.data.devicenumber
+
+
+             }
+          })  
+        },
+        getPatientName(patient_id){
+          var name = ""
+          for(let i=0;i<this.patientList.length;i++){
+            if(patient_id == this.patientList[i].id){
+               name = this.patientList[i].name
+            }
+          }
+          return name
+        },
+        getDialysisNo(patient_id){
+          var dialysis_no = ""
+          for(let i=0;i<this.patientList.length;i++){
+            if(patient_id == this.patientList[i].id){
+                dialysis_no = this.patientList[i].dialysis_no
+            }
+          }
+          return dialysis_no
+        },
+        getContent(schedule){
+          var str = ""
+          if(schedule!=null && schedule.length >0){
+            for(let i=0;i<schedule.length;i++){
+                schedule[i].bed_number = this.getNumberName(schedule[i].bed_id)
+                if(schedule[i].mode_id ==1){
+                    schedule[i].mode_name = "HD"
+                  }
+                  if(schedule[i].mode_id ==2){
+                    schedule[i].mode_name = "HDF"
+                  }
+                  if(schedule[i].mode_id ==3){
+                    schedule[i].mode_name = "HD+HP"
+                  }
+
+                  if(schedule[i].mode_id ==4){
+                    schedule[i].mode_name = "HP"
+                  }
+
+                  if(schedule[i].mode_id ==5){
+                    schedule[i].mode_name = "HF"
+                  }
+
+                  
+                  if(schedule[i].mode_id ==6){
+                    schedule[i].mode_name = "SCUF"
+                  }
+
+                  if(schedule[i].mode_id ==7){
+                    schedule[i].mode_name = "IUF"
+                  }
+
+                  if(schedule[i].mode_id ==8){
+                    schedule[i].mode_name = "HFHD"
+                  }
+
+                  if(schedule[i].mode_id ==9){
+                    schedule[i].mode_name = "HFHD+HP"
+                  }
+                  
+                  if(schedule[i].mode_id ==10){
+                    schedule[i].mode_name = "PHF"
+                  }
+
+                  if(schedule[i].mode_id ==11){
+                    schedule[i].mode_name = "HFR"
+                  }
+
+                  if(schedule[i].mode_id ==12){
+                    schedule[i].mode_name = "HDF+HP"
+                  }
+
+                  if(schedule[i].mode_id ==13){
+                    schedule[i].mode_name = "CRRT"
+                  }
+
+                  if(schedule[i].mode_id ==14){
+                    schedule[i].mode_name = "腹水回输"
+                  }
+
+                  if(schedule[i].mode_id ==15){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==19){
+                    schedule[i].mode_name = "IUF+HD"
+                  }
+
+                  if(schedule[i].mode_id ==20){
+                    schedule[i].mode_name = "UF"
+                  }
+                  if(schedule[i].mode_id ==21){
+                    schedule[i].mode_name = "HD+"
+                  }
+
+                  if(schedule[i].mode_id ==22){
+                    schedule[i].mode_name = "血浆胆红素吸附+HDF"
+                  }
+
+                  if(schedule[i].mode_id ==23){
+                    schedule[i].mode_name = "血浆胆红素吸附"
+                  }
+
+                  if(schedule[i].mode_id ==24){
+                    schedule[i].mode_name = "I-HDF"
+                  }
+
+                  if(schedule[i].mode_id ==25){
+                    schedule[i].mode_name = "HD高通"
+                  }
+
+                  if(schedule[i].mode_id ==26){
+                    schedule[i].mode_name = "CVVH"
+                  }
+
+                  if(schedule[i].mode_id ==27){
+                    schedule[i].mode_name = "CVVHD"
+                  }
+
+                  if(schedule[i].mode_id ==28){
+                    schedule[i].mode_name = "CVVHDF"
+                  }
+                  
+                  if(schedule[i].mode_id ==29){
+                    schedule[i].mode_name = "PE"
+                  }
+
+                  if(schedule[i].mode_id ==30){
+                    schedule[i].mode_name = "血浆胆红素吸附+HP"
+                  }
+
+                  if(schedule[i].mode_id ==31){
+                    schedule[i].mode_name = "HPD"
+                  }
+
+                  if(schedule[i].mode_id ==32){
+                    schedule[i].mode_name = "HDP"
+                  }
+
+
+                  if(schedule[i].schedule_week ==1){
+                    schedule[i].schedule_week_name = "周一"
+                  }
+                  if(schedule[i].schedule_week ==2){
+                    schedule[i].schedule_week_name = "周二"
+                  }
+                  if(schedule[i].schedule_week ==3){
+                    schedule[i].schedule_week_name = "周三"
+                  }
+                  if(schedule[i].schedule_week ==4){
+                    schedule[i].schedule_week_name = "周四"
+                  }
+                  if(schedule[i].schedule_week ==5){
+                    schedule[i].schedule_week_name = "周五"
+                  }
+                  if(schedule[i].schedule_week ==6){
+                    schedule[i].schedule_week_name = "周六"
+                  }
+                  if(schedule[i].schedule_week ==7){
+                    schedule[i].schedule_week_name = "周日"
+                  }
+
+                  if(schedule[i].schedule_type ==1){
+                    schedule[i].schedule_type_name = "上午"
+                  }
+                  if(schedule[i].schedule_type ==2){
+                    schedule[i].schedule_type_name = "下午"
+                  }
+                  if(schedule[i].schedule_type ==3){
+                    schedule[i].schedule_type_name = "晚上"
+                  }
+                
+              str += " "+this.getTime(schedule[i].schedule_date)+" "+schedule[i].schedule_week_name + " " +schedule[i].schedule_type_name +" " + schedule[i].mode_name+"," 
+            }
+          }
+          return str
+        },
+        getTime(val) {
+         if(val < 0){
+           return ""
+         }
+         if(val == ""){
+          return ""
+         }else {
+          return uParseTime(val, '{m}-{d}')
+         }
+      },
+      getNumberName(id){
+         var number = ""
+         for(let i=0;i<this.deviceNumberList.length;i++){
+           if(id == this.deviceNumberList[i].bed_id){
+             number = this.deviceNumberList[i].bed_number
+           }
+         }
+         return number
+      }
     }
 }
 </script>
@@ -505,7 +797,7 @@ export default {
         border-radius: 15px;
         display: flex;
         flex-direction: column;
-
+        
     }
     .lineUpMainLeftTitle{
         // display: flex;
@@ -539,13 +831,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;

src/xt_pages/user/components/PatientSidebar.vue

@@ -203,68 +203,68 @@ export default {
             },
           ]
         },
-        {
-          name: '5',
-          label: '评估工具',
-          children: [
-            {
-              name: '5-1',
-              label: '跌倒评估'
-            },
-            {
-              name: '5-2',
-              label: '小儿跌倒风险评估'
-            },
-            {
-              name: '5-3',
-              label: '压疮风险评估'
-            },
-            {
-              name: '5-4',
-              label: 'OH压疮评估'
-            },
-            {
-              name: '5-5',
-              label: '日常生活能力评估'
-            },
-            {
-              name: '5-6',
-              label: '导管脱离风险评估'
-            },
-            {
-              name: '5-7',
-              label: 'RASS及疼痛评估'
-            },
-            {
-              name: '5-8',
-              label: '营养状况评估'
-            },
-            {
-              name: '5-9',
-              label: '约束告知单'
-            },
-            {
-              name: '5-10',
-              label: '心理评估'
-            },
-            {
-              name: '5-11',
-              label: '瘙痒评估'
-            },
-            {
-              name: '5-12',
-              label: '血液透析患者评估'
-            },
-            {
-              name: '5-13',
-              label: 'Glasgow昏迷评分量表'
-            },
-            {
-              name: '5-14',
-              label: '肌力评估表'
-            },
-          ]
-        },
+        // {
+        //   name: '5',
+        //   label: '评估工具',
+        //   children: [
+        //     {
+        //       name: '5-1',
+        //       label: '跌倒评估'
+        //     },
+        //     {
+        //       name: '5-2',
+        //       label: '小儿跌倒风险评估'
+        //     },
+        //     {
+        //       name: '5-3',
+        //       label: '压疮风险评估'
+        //     },
+        //     {
+        //       name: '5-4',
+        //       label: 'OH压疮评估'
+        //     },
+        //     {
+        //       name: '5-5',
+        //       label: '日常生活能力评估'
+        //     },
+        //     {
+        //       name: '5-6',
+        //       label: '导管脱离风险评估'
+        //     },
+        //     {
+        //       name: '5-7',
+        //       label: 'RASS及疼痛评估'
+        //     },
+        //     {
+        //       name: '5-8',
+        //       label: '营养状况评估'
+        //     },
+        //     {
+        //       name: '5-9',
+        //       label: '约束告知单'
+        //     },
+        //     {
+        //       name: '5-10',
+        //       label: '心理评估'
+        //     },
+        //     {
+        //       name: '5-11',
+        //       label: '瘙痒评估'
+        //     },
+        //     {
+        //       name: '5-12',
+        //       label: '血液透析患者评估'
+        //     },
+        //     {
+        //       name: '5-13',
+        //       label: 'Glasgow昏迷评分量表'
+        //     },
+        //     {
+        //       name: '5-14',
+        //       label: '肌力评估表'
+        //     },
+        //   ]
+        // },
       ],
       name:""
     }
@@ -326,44 +326,45 @@ export default {
         this.$router.push({path:'/patients/inspection_check?id='+this.id})
       } else if(name == '4-3'){
         this.$router.push({path:'/patients/ktv?id='+this.id})
-      } else if (name == '5-1') {
-        this.$router.push({
-          path: '/patients/patient/'+ this.id +'/Fallassessment'
-        })
-      } else if (name == '5-2') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
-        })
-      } else if (name == '5-3') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/pressuresore'
-        })
-      } else if (name == '5-4') {
-        this.$router.push({
-          path: '/patients/patient/' + this.id + '/OHpressuresore'
-        })
-      } else if (name == '5-5'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
-      } else if (name == '5-6'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
-      } else if (name == '5-7'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
-      } else if(name == '5-8'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
-      } else if(name == '5-9'){
-        this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
-      } else if(name == '5-10'){
-        this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
-      } else if(name == '5-11'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
-
-      } else if(name == '5-12'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
-      } else if(name == '5-13'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
-      } else if(name == '5-14'){
-        this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
       } 
+      // else if (name == '5-1') {
+      //   this.$router.push({
+      //     path: '/patients/patient/'+ this.id +'/Fallassessment'
+      //   })
+      // } else if (name == '5-2') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/pediatricFallAssessment'
+      //   })
+      // } else if (name == '5-3') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/pressuresore'
+      //   })
+      // } else if (name == '5-4') {
+      //   this.$router.push({
+      //     path: '/patients/patient/' + this.id + '/OHpressuresore'
+      //   })
+      // } else if (name == '5-5'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/dailyLife'})
+      // } else if (name == '5-6'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/Cathetershedding'})
+      // } else if (name == '5-7'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/RassAssessment'})
+      // } else if(name == '5-8'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/nourishmentAssessment'})
+      // } else if(name == '5-9'){
+      //   this.$router.push({path:'/patients/patient/'+this.id+'/Constraintnotification'})
+      // } else if(name == '5-10'){
+      //   this.$router.push({ path: '/patients/patient/' + this.id+'/mindAssessment'})
+      // } else if(name == '5-11'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/pruritusAssessment'})
+
+      // } else if(name == '5-12'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/hemodialysis'})
+      // } else if(name == '5-13'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/Glasgow'})
+      // } else if(name == '5-14'){
+      //   this.$router.push({path:'/patients/patient/' + this.id+'/Muscleforce'})
+      // } 
     },
     changePatient(value) {
       console.log(value)

src/xt_pages/user/evaluationtool/Fallassessment.vue

@@ -30,66 +30,84 @@
                     <tr class="bg_color">
                       <td class="start">年龄</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox label="≥65岁（1分）"></el-checkbox>
-                          <el-checkbox label="<5（1分）"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in nianlin" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
+                          
                       </td>
                     </tr>
                     <tr>
                       <td class="start">既往史</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in jiwnag" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in jiwnag" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr class="bg_color">
                       <td class="start">意识状态</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in yishizt" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in yishizt" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td class="start">感官</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in ganguan" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in ganguan" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr class="bg_color">
                       <td class="start">身体状况</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in shentizk" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in shentizk" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr>
                       <td class="start">使用药物</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in syyaowu" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in syyaowu" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                     <tr class="bg_color">
                       <td class="start">排泄</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in paixie" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in paixie" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
+                        
                       </td>
                     </tr>
                     <tr>
                       <td class="start">自理能力</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in zilinl" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in zilinl" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
+                        
                       </td>
                     </tr>
                   </tbody>
@@ -111,9 +129,11 @@
                     <tr>
                       <td class="start">预防效果</td>
                       <td>
-                        <el-checkbox-group v-model="checkList">
-                          <el-checkbox v-for="item in xiaoguo" :label="item" :key="item"></el-checkbox>
-                        </el-checkbox-group>
+                        <div class="jiange">
+                          <span v-for="item in xiaoguo" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                        </div>
                       </td>
                     </tr>
                   </tbody>
@@ -153,15 +173,148 @@
                 <table class="table" border style="width: 100%;">
                   <thead>
                     <tr>
-                      <th>健康宣教</th>
-                      <th>护理措施</th>
+                      <th style="width: 50%;">健康宣教</th>
+                      <th style="width: 50%;">护理措施</th>
                     </tr>
                   </thead>
-                  <tbody>
-                    <tr>
-                      <td></td>
-                    </tr>
-                  </tbody>
+                  <tr>
+                    <td colspan="2" style="height: 40px;">
+                      <div style="width: 100%;height: 343px; overflow: auto;border: none;">
+                        <table class="table table2" border style="width: 100%;">
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;告知病人及家属病人有跌倒的危险</label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;在病人床头悬挂"防跌倒"、"防坠床"警示牌</label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr class="bg_color">
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                    告知家属24小时陪伴，尤其在患者活动锻炼时，应有人陪伴，若离开请与值班护士联系</label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;呼叫器及用物放置病人易取处，教会使用呼叫器</label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                  告知病人及家属病人关于药物作用的注意事项
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />
+                                  &nbsp;及时给予便器，床上（边）大小便
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr class="bg_color">
+                            <td>
+                              <div class="xiaojige">
+                                  <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                    穿合适的裤子，以免绊倒；穿防滑鞋</label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;使用床档 </label>
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;使用约束带 </label>
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;使用助行器 </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                  告知患者改变体位欲活动时应遵循“三步曲”，即平卧30秒→双腿下垂30秒→行走，避免突然改变体位，
+                                  引起体位性低血压，特别是夜间
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;需要时协助病人上、下床  
+                                </label>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;协助病人如厕
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr class="bg_color">
+                            <td>
+                              <div class="xiaojige">
+                                <label><input type="checkbox" name="ball" value="volleyball" />&nbsp;
+                                  如出现双眼发黑、下肢无力、行走不稳和不能移动时，立即原地坐/蹲下或靠墙，呼叫他人帮助
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;避免地面积水、湿滑  
+                                </label>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;消除床旁及通道障碍
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                          <tr>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;指导病人使用病房及卫生间扶手
+                                </label><br>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;其他有关告知
+                                </label>
+                              </div>
+                            </td>
+                            <td>
+                              <div class="xiaojige">
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;病床调至合适高度
+                                </label>
+                                <label>
+                                  <input type="checkbox" name="ball" value="volleyball" />&nbsp;及时锁上病床及轮椅的轮轴
+                                </label>
+                              </div>
+                            </td>
+                          </tr>
+                        </table>
+                      </div>
+                    </td> 
+                  </tr>        
+                  <tr>
+                    <td style="">
+                      <div class="jian">
+                        <el-button type="text" @click="add">+添加</el-button>
+                      </div>
+                      
+                    </td>
+                    <td style="">
+                      <div class="jian">
+                        <el-button type="text" @click="add">+添加</el-button>
+                      </div>
+                    </td>
+                  </tr>       
                 </table>
               </div>
 
@@ -184,10 +337,12 @@
                           <span>日期：</span>
                           <el-input v-model="input" style="width: 120px;"></el-input>
                         </div>
-                        <div style="display: inline-block;">
-                          <el-checkbox-group v-model="checkList">
-                            <el-checkbox v-for="item in touxidiedao" :label="item" :key="item"></el-checkbox>
-                          </el-checkbox-group>
+                        <div class="jiange" style="display: inline-block;">
+                          
+                          <span v-for="item in touxidiedao" class="rightjiange">
+                            <label><input type="checkbox" name="ball" value="volleyball" />&nbsp{{ item }}</label>
+                          </span>
+                       
                         </div>
                       </td>
                     </tr>
@@ -208,6 +363,25 @@
 
         </div>
       </div> 
+      <!-- 添加弹窗页面 -->
+      <el-dialog
+        title="添加"
+        :visible.sync="centerDialogVisible"
+        width="30%"
+        center>
+        <span>
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6}"
+            placeholder="请输入需要添加的内容.."
+            v-model="textarea2">
+          </el-input>
+        </span>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="centerDialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="centerDialogVisible = false">确 定</el-button>
+        </span>
+      </el-dialog>
     </div>
   </template>
 
@@ -228,6 +402,7 @@
           input:'',
           options:[],
           checkList:[],
+          nianlin:['≥65岁（1分）','<5（1分）'],
           jiwnag:['有跌倒史（2分）','有坠床史（2分）','晕厥（2分）','低血压（2分）'],
           yishizt:['烦躁（4分）','谵妄（3分）','嗜睡（2分）','模糊（2分）','痴呆（2分）','昏迷（1分）'],
           ganguan:['头晕（4分）','视觉障碍（2分）','听力障碍（2分）'],
@@ -237,6 +412,9 @@
           zilinl:['无（4分）','部分（3分）'],
           xiaoguo:['未发生跌倒','发生跌倒','发生坠床'],
           touxidiedao:['发生跌倒','发生坠床'],
+
+          centerDialogVisible:false,
+          textarea2:'',
         }
         
       },
@@ -245,6 +423,9 @@
 
       },
       methods: {
+        add(){
+          this.centerDialogVisible =true
+        }
       }
     }
   </script>
@@ -281,7 +462,13 @@
         }
         .jiange{
             margin-left: 20px;
-            color: black;
+            // color: black;
+        }
+        .xiaojige{
+          margin-left: 10px;
+        }
+        .rightjiange{
+          margin-right: 40px;
         }
         input{
             -webkit-appearance: checkbox;
@@ -297,7 +484,19 @@
       color: #0077ff9f;
       // background-color: '#409eff';
     }
-    
+    ::-webkit-scrollbar {
+        width: 5px;
+    }
+    ::-webkit-scrollbar-track {
+        /*background black*/
+        border-radius: 5px;
+        background-color: white;
+    }
+    .table2 tr td{
+      width: 50%;
+      height: 40px;
+      padding: 5px;
+    }
 
   </style>
   

src/xt_pages/user/inspection.vue

@@ -168,18 +168,20 @@
               <template v-for="(item, index) in items">
                 <el-col :span="7" :key="index">
                   <div style=" margin: 5px;">
-                    <el-row>
-                      <el-col :span="8" style="width: 100%;height: 100%;" >
-                        <div @click="imgClicks(item.value)">
-                          <el-tooltip
-                            class="item"
-                            effect="dark"
-                            :hide-after="2000"
-                            content="点击查看大图"
-                            placement="top-start"
-                            >
-                              <img :src="item.value" alt="">
-                            </el-tooltip>
+                    <el-row :gutter="20">
+                      <el-col :span="8" style="width: 100%;height: 150px;">
+                        <div style="width: 100%;height: 150px;" >
+                          <div @click="imgClicks(item.value)">
+                            <el-tooltip
+                              class="item"
+                              effect="dark"
+                              :hide-after="2000"
+                              content="点击查看大图"
+                              placement="top-start"
+                              >
+                                <img style="width: 300px;height: 150px;" :src="item.value" alt="">
+                              </el-tooltip>
+                          </div>
                         </div>
                       </el-col>
                     </el-row>

src/xt_pages/workforce/scheduleTablePrint.vue

@@ -225,11 +225,10 @@
                     </span>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
-                    <span v-if="item.Tue_M.patient_id">
-                        
+                    <p v-if="item.Tue_M.patient_id">
                         <span>{{ item.Tue_M.patient }}</span>
                         <span>{{ item.Tue_M.mode_name }}</span>
-                    </span>
+                    </p>
                 </td>
                 <td style="min-width:180px;" v-if="$route.query.week_date =='周二'">
                     <span v-if="item.Tue_A.patient_id ">