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

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

@@ -110,7 +110,18 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}次"
+                formatter: (params) => {
+                  if(this.obj.length > 0){
+                      let str = ''
+                      str = params.data +'次' + '\n(参考值'+ this.obj[params.dataIndex] +'次)'
+                      console.log(str)
+                    return str
+                  }else{
+                    let str = ''
+                    str = params.data+'次'
+                    return str
+                  }
+                }
               }
             },
             //配置样式
@@ -168,18 +179,11 @@ export default {
         xAxis: [],
         series: []
       },
+      obj:[]
     };
   },
   methods: {
-    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();
-      }
-    },
+    changeTime() {},
     changeEndTime(val) {
       var time =
         this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
@@ -187,13 +191,8 @@ export default {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
       } else {
-        this.getInspectionTotalCount()
       }
     },
-    getTimestamp(time) {
-      // 把时间日期转成时间戳
-      return new Date(time).getTime() / 1000;
-    },
     getCurrentOrgPatients(){
       getCurrentOrgPatients().then(response=>{
          var patients = response.data.data.patients
@@ -205,9 +204,9 @@ export default {
           if(response.data.state === 1){
             var Inspection = response.data.data.Inspection
             this.tableData = Inspection
-           // console.log("Inspection",Inspection)
+            console.log("Inspection",Inspection)
             var counts = response.data.data.counts
-           // console.log("counts",counts)
+            console.log("counts",counts)
             var arr = []
             for(let i=0;i<Inspection.length;i++){
                for(let j=0;j<counts.length;j++){
@@ -216,7 +215,7 @@ export default {
                  }
                }
             }
-           // console.log("arr",arr)
+            console.log("arr",arr)
             var hash = {};
             var i = 0;
             var res = [];
@@ -232,7 +231,7 @@ export default {
             res.map(item => {
              item.Count = eval(item.Count.join('+'))
             })
-           // console.log(11111,res)
+            console.log(11111,res)
 
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
@@ -243,19 +242,22 @@ export default {
                 this.modesData.series.push(0);
               }
             }
+            
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis
-           // console.log(2222,this.modesData)
+            console.log(2222,this.modesData)
           }
       })
     },
 
     //获取单个病人数据
     handleChange(val){
+      this.modesData.series = []
+      this.modesData.xAxis = []
        getInspectionDetailById(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var patientdetail = response.data.data.patientdetail
-           // console.log("patientdetail",patientdetail)
+            console.log("patientdetail",patientdetail)
             var arr=[]
             for(let i=0;i<this.tableData.length;i++){
               for(let j=0;j<patientdetail.length;j++){
@@ -264,7 +266,23 @@ export default {
                  }
               }
             }
-           // console.log("arr",arr)
+            console.log("arr",arr)
+           let time = new Date(this.listQuery.end_time) - new Date(this.listQuery.start_time)
+           let day = parseInt(time / (1000 * 60 * 60 * 24))
+           console.log("time",parseInt(time / (1000 * 60 * 60 * 24)))
+            for (const key in this.tableData) {
+              this.modesData.xAxis.push(this.tableData[key].project_name);
+              if (key in arr) {
+                this.modesData.series.push(parseInt(arr[key].Count));
+                this.obj.push(Math.round(day / arr[key].InspectionFrequency))
+                // batotal += parseInt(res[key].Count);
+              } else {
+                this.modesData.series.push(0);
+                this.obj.push(0)
+              }
+            }
+            this.chart.series[0].data = this.modesData.series
+            this.chart.xAxis.data = this.modesData.xAxis
           }
        })
     },
@@ -274,7 +292,7 @@ export default {
       getSearchPatientInfo(this.listQuery.search,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
          if(response.data.state  === 1){
            var PatientsInfo = response.data.data.PatientsInfo
-         //  console.log("PatientsInfo",PatientsInfo)
+           console.log("PatientsInfo",PatientsInfo)
            var arr = []
            for(let i=0;i<this.tableData.length;i++){
              for(let j=0;j<PatientsInfo.length;j++){
@@ -283,7 +301,7 @@ export default {
                  }
              }
            }
-         //  console.log("arr",arr)
+           console.log("arr",arr)
          }
       })
     }

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

@@ -254,6 +254,8 @@ export default {
      this.geStatistics()
    },
     geStatistics(){
+      this.modesData.series = []
+      this.modesData.xAxis = []
       geStatistics(this.listQuery).then(response=>{
         if(response.data.state === 1){
           var dtd =  response.data.data.statistics