1

src/xt_pages/medicalScheduling/index.vue

@@ -1316,7 +1316,212 @@ export default {
                 if(response.data.state == 1){
                     var  staffList =  response.data.data.staffList
                     // console.log("staffList",staffList)
+                    var sevenStr = ""
+                     var oneStr = ""
+                    var twoStr = ""
+                    var threeStr = ""
+                    var fourStr = ""
+                    var fiveStr = ""
+                    var sixStr = ""
+                    this.arrZero = []
+                    this.arrOne = []
+                    this.arrTwo = []
+                    this.arrThree = []
+                    this.arrFour = []
+                    this.arrFive = []
+                    this.arrSix = []
+                  for(let i=0;i<staffList.length;i++){
+                    if(staffList[i].schedule_week == 0){
+                        staffList[i].class_index = 0
+                         var arr = []
+                        this.arrZero.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrZero.length;i++){
+                           if(this.arrZero[i]!=''){
+                              arr.push(this.arrZero[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        var zeroStr = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            zeroStr += item + objVal[index] + '\n'
+                        })
+                        sevenStr = zeroStr
+                    }
+                    if(staffList[i].schedule_week == 1){
+                        staffList[i].class_index = 1
+                        var arr = []
+                        this.arrOne.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrOne.length;i++){
+                           if(this.arrOne[i]!=''){
+                              arr.push(this.arrOne[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        let strOne = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            strOne += item + objVal[index] + '\n'
+                        })
+                        oneStr  = strOne
+                    }
+                    if(staffList[i].schedule_week == 2){
+                        staffList[i].class_index = 2
+                         var arr = []
+                        this.arrTwo.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrTwo.length;i++){
+                           if(this.arrTwo[i]!=''){
+                              arr.push(this.arrTwo[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        let strTwo = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            strTwo += item + objVal[index] + '\n'
+                        })
+                         twoStr = strTwo
+                    }
+                    if(staffList[i].schedule_week == 3){
+                        staffList[i].class_index = 3
+                         var arr = []
+                        this.arrThree.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrThree.length;i++){
+                           if(this.arrThree[i]!=''){
+                              arr.push(this.arrThree[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        let strThree = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            strThree += item + objVal[index] + '\n'
+                        })
+                        threeStr = strThree
+                    }
+                    if(staffList[i].schedule_week == 4){
+                        staffList[i].class_index = 4
+                        var arr = []
+                        this.arrFour.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrFour.length;i++){
+                           if(this.arrFour[i]!=''){
+                              arr.push(this.arrFour[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        let strFour = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            strFour += item + objVal[index] + '\n'
+                        })
+                        fourStr = strFour
+                    }
+                    if(staffList[i].schedule_week == 5){
+                        staffList[i].class_index = 5
 
+                         var arr = []
+                        this.arrFive.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrFive.length;i++){
+                           if(this.arrFive[i]!=''){
+                              arr.push(this.arrFive[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        let strFive = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            strFive += item + objVal[index] + '\n'
+                        })
+                         fiveStr = strFive
+                    }
+                    if(staffList[i].schedule_week == 6){
+                        staffList[i].class_index = 6
+                         var arr = []
+                        this.arrSix.push(staffList[i].class_name)
+                        for(let i=0;i<this.arrSix.length;i++){
+                           if(this.arrSix[i]!=''){
+                              arr.push(this.arrSix[i])
+                           }
+                        }
+                        var countedNames = arr.reduce(function (allNames, name) {
+                            if (name in allNames) {
+                                allNames[name]++;
+                            }
+                            else {
+                                allNames[name] = 1;
+                            }
+                            return allNames;
+                        }, {});
+                        let objKey = Object.keys(countedNames)
+                        let objVal = Object.values(countedNames)
+                        let strSix = ''
+                        objKey.map((item,index) => {
+                        let objVal = Object.values(countedNames)
+                            strSix += item + objVal[index] + '\n'
+                        })
+                        sixStr = strSix
+                     }
+                    }
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) === -1) {
@@ -1387,9 +1592,29 @@ export default {
                         })
                         newDoctor.sort(this.compare('sort'))
                         
+                        // let data = []
+                        // data.push(...newNurse)
+                        // data.push(...newDoctor)
+                        // this.tableData = data
+                        let arr2 = []
+                        arr2.push({class_name:oneStr,schedule_week:1})
+                        arr2.push({class_name:twoStr,schedule_week:2})
+                        arr2.push({class_name:threeStr,schedule_week:3})
+                        arr2.push({class_name:fourStr,schedule_week:4})
+                        arr2.push({class_name:fiveStr,schedule_week:5})
+                        arr2.push({class_name:sixStr,schedule_week:6})
+                        arr2.push({class_name:zeroStr,schedule_week:0})
+                        var obj = {}
+                        obj.admin_user_id = "1000000"
+                        obj.user_name = "合计"
+                        obj.user_type = 10
+                        obj.list = arr2
+                        arr.push(obj)
+
                         let data = []
                         data.push(...newNurse)
                         data.push(...newDoctor)
+                        data.push(obj)
                         this.tableData = data
                     }
                     if(id == 2){
@@ -1409,7 +1634,26 @@ export default {
                             }
                         })
                         newDoctor.sort(this.compare('sort'))
-                        this.tableData = newDoctor
+                        // this.tableData = newDoctor
+                        let arr2 = []
+                        arr2.push({class_name:oneStr,schedule_week:1})
+                        arr2.push({class_name:twoStr,schedule_week:2})
+                        arr2.push({class_name:threeStr,schedule_week:3})
+                        arr2.push({class_name:fourStr,schedule_week:4})
+                        arr2.push({class_name:fiveStr,schedule_week:5})
+                        arr2.push({class_name:sixStr,schedule_week:6})
+                        arr2.push({class_name:zeroStr,schedule_week:0})
+                        var obj = {}
+                        obj.admin_user_id = "1000000"
+                        obj.user_name = "合计"
+                        obj.user_type = 10
+                        obj.list = arr2
+                        arr.push(obj)
+
+                        let data = []
+                        data.push(...newDoctor)
+                        data.push(obj)
+                        this.tableData = data
                     }
                     if(id == 3){
                         newNurse.sort(this.compare('admin_user_id'))
@@ -1428,7 +1672,26 @@ export default {
                             }
                         })
                         newNurse.sort(this.compare('sort'))
-                        this.tableData = newNurse
+                        // this.tableData = newNurse
+                        let arr2 = []
+                        arr2.push({class_name:oneStr,schedule_week:1})
+                        arr2.push({class_name:twoStr,schedule_week:2})
+                        arr2.push({class_name:threeStr,schedule_week:3})
+                        arr2.push({class_name:fourStr,schedule_week:4})
+                        arr2.push({class_name:fiveStr,schedule_week:5})
+                        arr2.push({class_name:sixStr,schedule_week:6})
+                        arr2.push({class_name:zeroStr,schedule_week:0})
+                        var obj = {}
+                        obj.admin_user_id = "1000000"
+                        obj.user_name = "合计"
+                        obj.user_type = 10
+                        obj.list = arr2
+                        arr.push(obj)
+
+                        let data = []
+                        data.push(...newNurse)
+                        data.push(obj)
+                        this.tableData = data
                     }
 
             }

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -2,9 +2,9 @@
     <div class="main-contain">
         <div class="position">
             <bread-crumb :crumbs="crumbs"></bread-crumb>
-            <div style="display:flex;align-items:center">
+            <!-- <div style="display:flex;align-items:center">
                 <el-button type="primary" icon="el-icon-printer" @click='toPrint'>打印</el-button>
-            </div>
+            </div> -->
         </div>
         <div class="app-container">
             <div class="cell clearfix">
@@ -32,9 +32,18 @@
                         :value="item.value">
                     </el-option>
                 </el-select>
-                <el-radio v-model="timeSlot" label="1">周</el-radio>
+                <!-- <el-radio v-model="timeSlot" label="1">周</el-radio>
                 <el-radio v-model="timeSlot" label="2">月</el-radio>
-                <el-radio v-model="timeSlot" label="3">自定义</el-radio>
+                <el-radio v-model="timeSlot" label="3">自定义</el-radio> -->
+                <el-radio-group v-model="timeSlot" @change="changeRadio">
+                <el-radio
+                  :label="gender.id"
+                  :value="gender.id"
+                  v-for="(gender, index) in faultPhase"
+                  :key="index"
+                  >{{ gender.name }}</el-radio
+                >
+               </el-radio-group>
                 <div style="display:flex;" v-if="timeSlot == '1'">
                     <el-button @click="lastclick" type="text" style="margin:0 10px;">&lt;上一周({{ weekNum - 1 }})</el-button>
                     <div class="dateBox">{{ weekDayArr[0] }}-{{ weekDayArr[6] }}({{ weekNum }})</div>
@@ -80,7 +89,7 @@
                 <line-chart :options="chart"></line-chart>
             </div>
             <div class="tableTitle">统计表</div>
-            <el-table class='statisticsTable' :data="tableData" height="250" border>
+            <el-table class='statisticsTable' :data="tableData" height="250" border ref="tab">
                 <el-table-column fixed align="center" prop="date" label="医护姓名" width="100">
                     <template slot-scope="scope">
                         <span>{{scope.row.user_name}}</span>
@@ -120,6 +129,11 @@ export default {
     },
     data(){
         return{
+          faultPhase: [
+              { id: "1", name: "周" },
+              { id: "2", name: "月" },
+              { id: "3", name: "自定义" },
+             ],
             pickerOptions: {
                 disabledDate(time) {
                     let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -284,7 +298,6 @@ export default {
                 this.doctorlist.push(...nurselist)
                 this.doctorlist.push(...doctorlist)
                 
-                console.log("医护列表",this.doctorlist)
                 //获取统计图数据
                 this.getchartlist()
              }
@@ -299,19 +312,44 @@ export default {
             }
             const params = {
               keyword:this.keywords, 
+              start_time:this.start_time,
+              end_time:this.end_time
             }
-            console.log("params",params)
+            // console.log("params",params)
             toSearchTotal(params).then(response=>{
              if(response.data.state == 1){
                 var scheudleTotal = response.data.data.scheduletotal 
-                console.log("scheduletotal",scheudleTotal) 
+                // console.log("scheduletotal",scheudleTotal) 
                 var list = response.data.data.list
-                console.log("list",list)
+                // console.log("list",list)
                 var workday = response.data.data.workDay
-                console.log("workday",workday)
+                // console.log("workday",workday)
                 var noWorkDay = response.data.data.noWorkDay
-                console.log("noworkday",noWorkDay)
-
+                // console.log("noworkday",noWorkDay)
+                  
+            //     var workdaylist = response.data.data.chartWorkDayMinute
+
+            //    let arrtwo = [...workdaylist]
+            //     arrtwo.sort(this.compare('doctor_id'))
+            //     this.doctorlist.sort(this.compare('admin_user_id'))
+            //     this.doctorlist.forEach((item, index) => {
+            //      if (arrtwo[index] && item.admin_user_id ==arrtwo[index].doctor_id) {
+                        
+            //         }else{
+            //         arrtwo.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id,workminute: 0})
+            //         }
+            //      })
+                   
+            //      let chartX = []
+            //      let chartY = []
+            //      arrtwo.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)                
 
                 let tempArr = [], newArr = []
                 for (let i = 0; i < scheudleTotal.length; i++) {
@@ -367,8 +405,11 @@ export default {
                         arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                       }
                     })
-                    console.log('newArr',arr)
+                   
                     this.tableData = arr
+                    this.$nextTick(() => {
+                      this.$refs.tab.doLayout()
+                    }) 
                 }
               }
           })  
@@ -404,6 +445,8 @@ export default {
                 this.nowYear = this.nowYear - 1
             }
             this.weekNum = this.weekNum - 1
+            this.getlist()
+            this.getchartlist()
         },
         //下一周
         nextclick(){
@@ -417,6 +460,8 @@ export default {
                 this.weekNum = this.getYearWeek(year, month, date)
                 this.nowYear = this.nowYear + 1
             }
+            this.getlist()
+            this.getchartlist()
         },
         getYearWeek(year,month,date){
             /*
@@ -436,7 +481,7 @@ export default {
 
         changeMonth(value){
             // console.log(value)
-            console.log('monthStartTime',value.getTime() / 1000)
+            // console.log('monthStartTime',value.getTime() / 1000)
             let monthStartTime = value.getTime() / 1000
             var nowDate = new Date(value);
             var cloneNowDate = new Date(value);
@@ -446,8 +491,9 @@ export default {
             let monthEndTime = this.getFullDate(cloneNowDate.setDate(endOfMonth))
             this.start_time = monthStartTime
             this.end_time = this.getTimestamp(monthEndTime)
-            console.log('monthEndTime',this.getTimestamp(monthEndTime))
+            // console.log('monthEndTime',this.getTimestamp(monthEndTime))
             this.getlist()
+            this.getchartlist()
         },
         getFullDate(targetDate) {
             var D, y, m, d;
@@ -474,7 +520,7 @@ export default {
           getScheduleList().then(response=>{
              if(response.data.state == 1){
                 var schedulelist = response.data.data.scheduleList
-                console.log("schedulelist",schedulelist)
+                // console.log("schedulelist",schedulelist)
                 this.scheduleList = schedulelist
              }
           })
@@ -490,19 +536,19 @@ export default {
                 start_time:this.start_time,
                 end_time:this.end_time,
             }
-            console.log("params",params)
+            // console.log("params",params)
             getScheduleListTotal(params).then(response=>{
                 if(response.data.state == 1){
                     //获取每个班次对应的次数
                     var scheudleTotal =  response.data.data.scheudletotal
-                    console.log("scheudletotal",scheudleTotal)
+                    // console.log("scheudletotal",scheudleTotal)
                     //获取总分钟数
                     var list = response.data.data.list
-                    console.log("list",list)
+                    // console.log("list",list)
                     var workday = response.data.data.workDay
-                    console.log("workday",workday)
+                    // console.log("workday",workday)
                     var noWorkDay = response.data.data.noWorkDay
-                    console.log("noWorkDay",noWorkDay)
+                    // console.log("noWorkDay",noWorkDay)
 
                     let tempArr = [], newArr = []
                     for (let i = 0; i < scheudleTotal.length; i++) {
@@ -559,6 +605,9 @@ export default {
 
                     // console.log('newArr',arr)
                     this.tableData = arr
+                    this.$nextTick(() => {
+                      this.$refs.tab.doLayout()
+                    }) 
                 }
             })
         },
@@ -570,19 +619,41 @@ export default {
             const params = {
               doctor_type: parseInt(val),
             }
-            console.log("params",params)
+            // console.log("params",params)
             changeOption(params).then(response=>{
               if(response.data.state == 1){
                 var scheudleTotal =  response.data.data.scheduletotal
-                console.log("scheduletotal",scheudleTotal)
+                // console.log("scheduletotal",scheudleTotal)
                 var list = response.data.data.list
-                console.log("list",list)
+                // console.log("list",list)
                 var workday = response.data.data.workday
-                console.log("workday",workday)
+                // console.log("workday",workday)
                 var noWorkDay = response.data.data.workday
-                console.log("worknoday",noWorkDay)
+                // console.log("worknoday",noWorkDay)
 
+            //    var workdaylist = response.data.data.chartworkdayminute
 
+            //    let arrtwo = [...workdaylist]
+            //     arrtwo.sort(this.compare('doctor_id'))
+            //     this.doctorlist.sort(this.compare('admin_user_id'))
+            //     this.doctorlist.forEach((item, index) => {
+            //      if (arrtwo[index] && item.admin_user_id ==arrtwo[index].doctor_id) {
+                        
+            //         }else{
+            //         arrtwo.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id,workminute: 0})
+            //         }
+            //      })
+                   
+            //      let chartX = []
+            //      let chartY = []
+            //      arrtwo.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)    
                 let tempArr = [], newArr = []
                 for (let i = 0; i < scheudleTotal.length; i++) {
                     if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
@@ -634,10 +705,10 @@ export default {
                         arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                       }
                     })
-                    
-
-                    console.log('newArr',arr)
                     this.tableData = arr
+                    this.$nextTick(() => {
+                        this.$refs.tab.doLayout()
+                    }) 
                 }else if(val == 2){
                     arr.sort(this.compare('doctor_id'))
                     this.doctorArr.sort(this.compare('admin_user_id'))
@@ -648,10 +719,10 @@ export default {
                         arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                       }
                     })
-                    
-
-                    console.log('newArr',arr)
                     this.tableData = arr
+                    this.$nextTick(() => {
+                        this.$refs.tab.doLayout()
+                    }) 
                 }else if(val == 3){
                     arr.sort(this.compare('doctor_id'))
                     this.nurseArr.sort(this.compare('admin_user_id'))
@@ -662,12 +733,11 @@ export default {
                         arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
                       }
                     })
-                    
-
-                    console.log('newArr',arr)
                     this.tableData = arr
-                }
-                    
+                    this.$nextTick(() => {
+                        this.$refs.tab.doLayout()
+                    }) 
+                }   
               }
             })
         },
@@ -712,14 +782,19 @@ export default {
         },
         //获取统计图数据
         getchartlist(){
-           getchartlist().then(response=>{
+             if(this.timeSlot == 1){
+               this.start_time = this.getTimestamp(this.weekDayArr[0]),
+               this.end_time = this.getTimestamp(this.weekDayArr[6])
+            }
+             const params = {
+                start_time:this.start_time,
+                end_time:this.end_time
+             }
+            //  console.log("params",params)
+           getchartlist(params).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) => {
@@ -729,8 +804,7 @@ export default {
                           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 => {
@@ -752,6 +826,10 @@ export default {
                 var dataZoom_end = 100;
                 this.chart.dataZoom[0].end = dataZoom_end
             }
+        },
+        changeRadio(){
+          this.getlist()
+          this.getchartlist()
         }
     }
 }