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

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -283,7 +283,7 @@ export default {
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
           return time.getTime() > Date.now() || time.getTime() < threeMonths;;
         }
-      }, 
+      },
       crumbs: [
         { path: false, name: "质控管理" },
         { path: false, name: "基本信息统计" }
@@ -480,8 +480,8 @@ export default {
         //统计透析年龄
         this.getTotalDialysisCount(startunitx,endunitx)
      }
-   
- 
+
+
 
     },
     getDialysisModeType(startDate,endDate){
@@ -548,10 +548,10 @@ export default {
              if(infectious.length == 0){
                 this.InfectiousList = arr
                 return false
-                
+
              }
              this.InfectiousList = infectious
-            
+
            }
        })
     },
@@ -595,7 +595,7 @@ export default {
       getTotalDialysisCount(timeStar,timeEnd).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
-          //  console.log("dataage",dataage)
+           console.log("dataage",dataage)
            this.dialysisAge = dataage
 
          }

src/xt_pages/qcd/officesControlAnalysis/project.vue

@@ -562,13 +562,14 @@ export default {
           novStart:novStart,
           novEnd:novEnd,
           decStart:decStart,
-          decEnd:decEnd,    
+          decEnd:decEnd,
+          range_type:this.range_type,    
         }
     
        getMonthProjectList(params).then(response=>{
         if(response.data.state === 1){
             var monthlist = response.data.data.monthlist
-     
+            console.log("monthlist",monthlist)
             var newArr = [
               {Total:"一月",Count:1,NoCount: 0},
               {Total:"二月",Count:1,NoCount: 0},

src/xt_pages/qcd/officesControlAnalysis/time.vue

@@ -478,7 +478,7 @@ export default {
       getNormData().then(response=>{
          if(response.data.state === 1){
            var normdata = response.data.data.normdata
-          //  console.log("指标正常范围",normdata)
+           console.log("指标正常范围",normdata)
            this.normData = normdata
            this.getlist()
          }
@@ -591,7 +591,7 @@ export default {
       getFirstQuarter(params).then(response=>{
          if(response.data.state === 1){
             var count =  response.data.data.count
-            // console.log("count",count) 
+           console.log("count",count) 
             var countwo = response.data.data.countwo 
             // console.log("countwo",countwo)
             countwo.map(item=>{

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

@@ -216,13 +216,13 @@ export default {
     };
   },
   methods: {
-    changeTime() {
+    changeTime(val) {
         var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.end_time);
       if (time > 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.start_time = "";
       } else {
-       
+         this.getInspectionTotalCount()
       }
     },
     changeEndTime(val) {
@@ -232,6 +232,7 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
+          this.getInspectionTotalCount()
       }
     },
     getTimestamp(time) {