Browse Source

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

XMLWAN 4 years ago
parent
commit
93b5133d80

+ 1 - 1
src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue View File

400
         this.query.patient_id = val.id
400
         this.query.patient_id = val.id
401
         this.query.page = 1
401
         this.query.page = 1
402
         this.GetDialysisBloodPressureTableData(this.query)
402
         this.GetDialysisBloodPressureTableData(this.query)
403
-        this.GetDialysisBloodPressureChartData(this.query)
403
+        // this.GetDialysisBloodPressureChartData(this.query)
404
       },
404
       },
405
       handleSizeChange(limit) {
405
       handleSizeChange(limit) {
406
         this.query.limit = limit;
406
         this.query.limit = limit;

+ 0 - 7
src/xt_pages/qcd/indicatorControlAnalysis/monitor.vue View File

513
           .then(rs => {
513
           .then(rs => {
514
             var resp = rs.data
514
             var resp = rs.data
515
             if (resp.state == 1) {
515
             if (resp.state == 1) {
516
-              if (this.query.statistics_type != 9 && this.query.statistics_type != 10) {
517
                 for (let i = 0; i < resp.data.data.length; i++) {
516
                 for (let i = 0; i < resp.data.data.length; i++) {
518
                   this.chart.xAxis.data.push(resp.data.data[i].date)
517
                   this.chart.xAxis.data.push(resp.data.data[i].date)
519
                   this.chart.series[0].data.push(resp.data.data[i].value)
518
                   this.chart.series[0].data.push(resp.data.data[i].value)
520
                 }
519
                 }
521
-              } else {
522
-                for (let i = 0; i < resp.data.data.length; i++) {
523
-                  this.bar.xAxis.data.push(resp.data.data[i].name)
524
-                  this.bar.series[0].data.push(resp.data.data[i].total)
525
-                }
526
-              }
527
             } else {
520
             } else {
528
             }
521
             }
529
           })
522
           })

+ 1 - 0
src/xt_pages/qcd/indicatorControlAnalysis/process.vue View File

598
                 this.tableData.push(resp.data.data[i])
598
                 this.tableData.push(resp.data.data[i])
599
               }
599
               }
600
               this.total = resp.data.total
600
               this.total = resp.data.total
601
+
601
             } else {
602
             } else {
602
               this.loading = false
603
               this.loading = false
603
             }
604
             }