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

src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue

@@ -153,6 +153,7 @@
 
           }
         },
+        range_type:'',
         total:0,
         item_name: '',
         query: {
@@ -279,7 +280,7 @@
       },
       jumpDetail(row){
         // this.$router.push("/qcd/indicatorControlAnalysis/bloodPressureDetails?id="+patient_id)
-        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+row.inspect_type+"&patient_id="+row.patient.id)
+        this.$router.push("/qcd/inspection/detail?project_id="+row.project_id+"&item_id="+row.item_id+"&range_type="+this.query.range_type+"&patient_id="+row.patient.id)
       },
       handleSizeChange(limit) {
         this.query.limit = limit

src/xt_pages/qcd/indicatorControlAnalysis/patientInspectionDetail.vue

@@ -491,7 +491,6 @@
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
             // 本月的结束时间
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -502,7 +501,7 @@
             const startDate = moment().subtract('month', 3).format('YYYY-MM-DD')
             this.query.start_time = startDate
             const endDate = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -513,7 +512,7 @@
           case 3: //近半年
             this.query.start_time = moment().subtract('month', 6).format('YYYY-MM-DD')
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -523,7 +522,7 @@
           case 4: //近一年
             this.query.start_time = moment().subtract('month', 12).format('YYYY-MM-DD')
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
+
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -533,7 +532,6 @@
             this.query.start_time = moment().subtract('month', 1).format('YYYY-MM-DD')
             // 本月的结束时间
             this.query.end_time = moment(new Date()).format('YYYY-MM-DD')
-            this.query.patient_id = this.$route.query.patient_id
             this.query.project_id = this.$route.query.project_id
             this.query.item_id = this.$route.query.item_id
             this.query.range_type = this.$route.query.range_type
@@ -608,6 +606,8 @@
                 }
               }
 
+              console.log(this.options.xAxis.data)
+
               console.log(this.options.series[0].data)
 
               //获取无法确定选项的颜色