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

src/xt_pages/qcd/basicInformationAnalysis.vue

                 </span>
                 <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
                  <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
-                </span> 
+                </span>
               </div>
             </div>
             <div class="infoOne">
       //获取本月当前机构的透析模式
       const startDate = moment().subtract('month', 0).format('YYYY-MM') + '-01'
       const endDate = moment(new Date()).format('YYYY-MM-DD')
-     
+
       var now = new Date()
       var nowMonth = now.getMonth(); //当前月
       var nowYear = now.getFullYear(); //当前年
       //本月的结束时间
       var monthEndDate = new Date(nowYear, nowMonth+1, 0);
       var timeEnd=Date.parse(monthEndDate)/1000-1;//s
-     // console.log("本月最后一天",timeEnd)
+      console.log("本月最后一天",timeEnd)
       //本月
       if(state == 0){
        //统计透析总量
         this.listQuery.start_time = ""
         this.listQuery.end_time = ""
         const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
-       
+
         var startunitx = Date.parse(startDate)/1000
         // console.log("开始时间搓",startunitx)
         const endDate = moment(new Date()).format('YYYY-MM-DD')
     },
     //统计转归
     getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
-   
+
        this.modesDataTwo.series = []
        this.modesDataTwo.xAxis = []
       getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
              {name:"转出",count:0}
            ]
           var patients =  response.data.data.patients
-      
+
           this.rollOutTotal = patients.length
 
           var patienttwo = response.data.data.patienttwo
           this.patientCount = count
 
           var rollout = response.data.data.rollout
-        
+
 
           for(let i=0;i<arr.length;i++){
             arr[0].count = this.rollOutTotal
       getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-        
+
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
       getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
-          
+
            this.dialysisAge = dataage
 
          }
           start_time:this.start,
           end_time:this.end,
           mode_id:this.mode_id,
-          
+
         }
         this.modesData.series = []
         this.modesData.xAxis = []

src/xt_pages/workforce/components/tableData.vue

     ScheduleItem
   },
   mounted() {
-    console.log('this.tableContainHeight,',this.$refs.table.$el.offsetTop);
-    this.tableContainHeight =
-      window.innerHeight - this.$refs.table.$el.offsetTop - 120;
+  
+    this.tableContainHeight = window.innerHeight - this.$refs.table.$el.offsetTop - 120;
     console.log(this.tableContainHeight);
     // var theType = this.weekType(this.weekTime);
     // this.getSchedules(theType);