1

src/xt_pages/medicalScheduling/index.vue

@@ -1509,19 +1509,19 @@ export default {
 
         copyStaffSchedule(){
             this.newVisible = true
-            // const params = {
-            //     start_time:this.getTimestamp(this.weekDayArr[0]),
-            //     end_time:this.getTimestamp(this.weekDayArr[6])
-            // }
-            // copyStaffSchedule(params).then(response=>{
-            //     if(response.data.state == 1){
-            //     var msg =  response.data.data.msg
-            //     console.log("msg",msg)
-            //     this.$message.success("复制成功")
-            //     }else{
-            //     this.$message.error("排班已存在")
-            //     }
-            // })
+            const params = {
+                start_time:this.getTimestamp(this.weekDayArr[0]),
+                end_time:this.getTimestamp(this.weekDayArr[6])
+            }
+            copyStaffSchedule(params).then(response=>{
+                if(response.data.state == 1){
+                var msg =  response.data.data.msg
+                console.log("msg",msg)
+                this.$message.success("复制成功")
+                }else{
+                this.$message.error("排班已存在")
+                }
+            })
         },
         toContinuous(){
             var is_status = 0
@@ -1600,9 +1600,6 @@ export default {
             if (week.length == 14) {
                 weeks = week[4]+week[5]+week[6]+week[7]+week[8]+week[9]+week[10]+week[11]+week[12]
             }
-
-            //  console.log("week",week)
-            //  console.log("weeks",weeks)
             var weekdate =  this.getTimestamp(weeks)
             if(weekdate  < this.timeNow){
             return 'background-color:#e5e5e5;'
@@ -1621,13 +1618,13 @@ export default {
               id:val.id,
             }
             console.log("params",params)
-          // SaveNurseSort(params).then(response=>{
-          //    if(response.data.state == 1){
-          //      var role = response.data.data.role
-          //      this.$message.success("保存成功")
-          //      this.getDoctorList()
-          //    }
-          // })
+          SaveNurseSort(params).then(response=>{
+             if(response.data.state == 1){
+               var role = response.data.data.role
+               this.$message.success("保存成功")
+               this.getDoctorList()
+             }
+          })
         },
        changeRadio(val){
           console.log("val",val)
@@ -1635,13 +1632,13 @@ export default {
               id:val.id,
               is_sort:val.is_sort,
            }
-         // SaveIsSchedule(params).then(response=>{
-         //    if(response.data.state == 1){
-         //      var role =  response.data.data.role
-         //      this.$message.success("保存成功")
-         //      this.getDoctorList()
-         //    }
-         // })
+         SaveIsSchedule(params).then(response=>{
+            if(response.data.state == 1){
+              var role =  response.data.data.role
+              this.$message.success("保存成功")
+              this.getDoctorList()
+            }
+         })
        }
     },
     created(){

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -94,7 +94,7 @@
                 <el-table-column align="center" prop="address" label="总工时/小时">
                    <template slot-scope="scope">
                         <span v-if="scope.row.totalminute">{{ scope.row.totalminute / 60 }}</span>
-                    </template> 
+                    </template>
                 </el-table-column>
                 <el-table-column align="center" prop="attendance" label="出勤/天">
                     <!-- <span v-if='scope.row.attendance'>{{ scope.row.attendance ? scope.row.attendance : '' }}</span> -->
@@ -178,10 +178,21 @@ export default {
                         data: [],
                         barWidth: 30,
                         label: {
-                            normal: {
-                                show: true,
-                                position: "top",
+                        normal: {
+                            show: true,
+                            position: "top",
+                            formatter: (params) => {
+                            if(this.percent.length > 0){
+                                let str = ''
+                                str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                                return str
+                            }else{
+                                let str = ''
+                                str = params.data
+                                return str
                             }
+                            }
+                        }
                         },
                         //配置样式
                         itemStyle: {
@@ -264,12 +275,13 @@ export default {
 
         //获取所有排班种
         this.getScheduleList()
-    
+
         // 获取统计表的数据
         this.getlist()
-        
-        
-      
+
+        //获取统计图数据
+        this.getchartlist()
+
     },
     methods:{
         getDoctorList(){
@@ -283,12 +295,10 @@ export default {
 
                 this.doctorlist.push(...nurselist)
                 this.doctorlist.push(...doctorlist)
-                
+
                 console.log("医护列表",this.doctorlist)
-                //获取统计图数据
-                this.getchartlist()
              }
-               
+
            })
         },
         //搜索
@@ -298,13 +308,15 @@ export default {
                this.end_time = this.getTimestamp(this.weekDayArr[6])
             }
             const params = {
-              keyword:this.keywords, 
+              keyword:this.keywords,
+              start_time:this.start_time,
+              end_time:this.end_time,
             }
             console.log("params",params)
             toSearchTotal(params).then(response=>{
              if(response.data.state == 1){
-                var scheudleTotal = response.data.data.scheduletotal 
-                console.log("scheduletotal",scheudleTotal) 
+                var scheudleTotal = response.data.data.scheduletotal
+                console.log("scheduletotal",scheudleTotal)
                 var list = response.data.data.list
                 console.log("list",list)
                 var workday = response.data.data.workDay
@@ -352,9 +364,9 @@ export default {
                         }
                     })
                 })
-                
+
                 let arr = [...newArr]
-                
+
                 if(this.keywords != ''){
                     this.tableData = arr
                 }else {
@@ -362,7 +374,7 @@ export default {
                     this.doctorlist.sort(this.compare('admin_user_id'))
                     this.doctorlist.forEach((item, index) => {
                       if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                    
+
                       }else{
                         arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                       }
@@ -371,7 +383,7 @@ export default {
                     this.tableData = arr
                 }
               }
-          })  
+          })
         },
         formatDate(date){
             var year = date.getFullYear()+'.'
@@ -404,6 +416,7 @@ export default {
                 this.nowYear = this.nowYear - 1
             }
             this.weekNum = this.weekNum - 1
+            this.getlist()
         },
         //下一周
         nextclick(){
@@ -417,6 +430,7 @@ export default {
                 this.weekNum = this.getYearWeek(year, month, date)
                 this.nowYear = this.nowYear + 1
             }
+           this.getlist()
         },
         getYearWeek(year,month,date){
             /*
@@ -543,19 +557,19 @@ export default {
                             }
                         })
                     })
-                    
+
                     let arr = [...newArr]
 
                     arr.sort(this.compare('doctor_id'))
                     this.doctorlist.sort(this.compare('admin_user_id'))
                     this.doctorlist.forEach((item, index) => {
                       if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                    
+
                       }else{
                         arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                       }
                     })
-                    
+
 
                     console.log('newArr',arr)
                     this.tableData = arr
@@ -569,8 +583,10 @@ export default {
             }
             const params = {
               doctor_type: parseInt(val),
+              start_time:this.start_time,
+              end_time:this.end_time
             }
-            console.log("params",params)
+            // console.log("params",params)
             changeOption(params).then(response=>{
               if(response.data.state == 1){
                 var scheudleTotal =  response.data.data.scheduletotal
@@ -622,19 +638,19 @@ export default {
                             }
                         })
                     })
-                    
+
                     let arr = [...newArr]
                     if(val == 0){
                         arr.sort(this.compare('doctor_id'))
                         this.doctorlist.sort(this.compare('admin_user_id'))
                         this.doctorlist.forEach((item, index) => {
                           if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                           }
                         })
-                        
+
 
                         console.log('newArr',arr)
                         this.tableData = arr
@@ -643,12 +659,12 @@ export default {
                         this.doctorArr.sort(this.compare('admin_user_id'))
                         this.doctorArr.forEach((item, index) => {
                           if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                           }
                         })
-                        
+
 
                         console.log('newArr',arr)
                         this.tableData = arr
@@ -657,17 +673,17 @@ export default {
                         this.nurseArr.sort(this.compare('admin_user_id'))
                         this.nurseArr.forEach((item, index) => {
                           if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
+
                           }else{
                             arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                           }
                         })
-                        
+
 
                         console.log('newArr',arr)
                         this.tableData = arr
                     }
-                    
+
               }
             })
         },
@@ -698,60 +714,26 @@ export default {
                                 }
                             })
                         }
-                        
+
                     }
                 })
                 return Count
-            }   
+            }
         },
         toPrint(){
             this.$router.push({
                 path: '/medicalScheduling/statistics/print',
                 // query: { date: date }
-            }) 
+            })
         },
         //获取统计图数据
         getchartlist(){
            getchartlist().then(response=>{
-                if(response.data.state == 1){
-                    var workdaylist =  response.data.data.workDaylist
-                    console.log("早年公共",workdaylist)
-
-
-                    let arr = [...workdaylist]
-
-                    arr.sort(this.compare('doctor_id'))
-                    this.doctorlist.sort(this.compare('admin_user_id'))
-                    this.doctorlist.forEach((item, index) => {
-                        if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
-                        
-                        }else{
-                          arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id,workminute: 0})
-                        }
-                    })
-                    console.log('arrrrrrrrrrrrrrr',arr)
-
-                    let chartX = []
-                    let chartY = []
-                    arr.map(item => {
-                        chartX.push(item.user_name)
-                        chartY.push(item.workminute / 60)
-                    })
-                    this.chart.xAxis.data = chartX
-                    this.chart.series[0].data = chartY
-
-                    this.getArrLength(this.chart.xAxis.data)
-                }
+               if(response.data.state == 1){
+                 var workdaylist =  response.data.data.workDaylist
+                 console.log("早年公共",workdaylist)
+               }
            })
-        },
-        getArrLength(result){
-            if(result.length > 10){
-                var dataZoom_end = (10/result.length)*100;
-                this.chart.dataZoom[0].end = dataZoom_end
-            }else{
-                var dataZoom_end = 100;
-                this.chart.dataZoom[0].end = dataZoom_end
-            }
         }
     }
 }
@@ -787,10 +769,4 @@ export default {
 .pointTitle {
   font-size: 13px;
 }
-.statisticsTable{
-    ::-webkit-scrollbar{
-        height:15px !important;
-    }
-}
-
 </style>