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

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -400,7 +400,7 @@
         this.query.patient_id = val.id
         this.query.page = 1
         this.GetDialysisBloodPressureTableData(this.query)
-        this.GetDialysisBloodPressureChartData(this.query)
+        // this.GetDialysisBloodPressureChartData(this.query)
       },
       handleSizeChange(limit) {
         this.query.limit = limit;

src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue

@@ -513,17 +513,10 @@
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
-              if (this.query.statistics_type != 9 && this.query.statistics_type != 10) {
                 for (let i = 0; i < resp.data.data.length; i++) {
                   this.chart.xAxis.data.push(resp.data.data[i].date)
                   this.chart.series[0].data.push(resp.data.data[i].value)
                 }
-              } else {
-                for (let i = 0; i < resp.data.data.length; i++) {
-                  this.bar.xAxis.data.push(resp.data.data[i].name)
-                  this.bar.series[0].data.push(resp.data.data[i].total)
-                }
-              }
             } else {
             }
           })

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -598,6 +598,7 @@
                 this.tableData.push(resp.data.data[i])
               }
               this.total = resp.data.total
+
             } else {
               this.loading = false
             }