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
59d50da3d4

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

192
     },
192
     },
193
     data() {
193
     data() {
194
       return {
194
       return {
195
+        percent:[],
196
+
195
         pickerOptions: {
197
         pickerOptions: {
196
           disabledDate(time) {
198
           disabledDate(time) {
197
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
199
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
251
                 normal: {
253
                 normal: {
252
                   show: true,
254
                   show: true,
253
                   position: 'top',
255
                   position: 'top',
254
-                  formatter: '{c}'
256
+                  formatter: (params) => {
257
+                    if(this.percent.length > 0){
258
+                      let str = ''
259
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
260
+                      return str
261
+                    }else{
262
+                      let str = ''
263
+                      str = params.data
264
+                      return str
265
+                    }
266
+                  }
255
                 }
267
                 }
256
               },
268
               },
257
               //配置样式
269
               //配置样式
320
                 normal: {
332
                 normal: {
321
                   show: true,
333
                   show: true,
322
                   position: 'top',
334
                   position: 'top',
323
-                  formatter: '{c}次'
335
+                  formatter: (params) => {
336
+                    if(this.percent.length > 0){
337
+                      let str = ''
338
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
339
+                      return str
340
+                    }else{
341
+                      let str = ''
342
+                      str = params.data
343
+                      return str
344
+                    }
345
+                  }
324
                 }
346
                 }
325
               },
347
               },
326
               //配置样式
348
               //配置样式
470
       GetDialysisBloodPressureChartData(params) {
492
       GetDialysisBloodPressureChartData(params) {
471
         this.bar.xAxis.data = []
493
         this.bar.xAxis.data = []
472
         this.bar.series[0].data = []
494
         this.bar.series[0].data = []
495
+        this.percent = []
496
+
473
         GetDialysisBloodPressureChartData(params)
497
         GetDialysisBloodPressureChartData(params)
474
           .then(rs => {
498
           .then(rs => {
475
             var resp = rs.data
499
             var resp = rs.data
477
                 for (let i = 0; i < resp.data.data.length; i++) {
501
                 for (let i = 0; i < resp.data.data.length; i++) {
478
                   this.bar.xAxis.data.push(resp.data.data[i].name)
502
                   this.bar.xAxis.data.push(resp.data.data[i].name)
479
                   this.bar.series[0].data.push(resp.data.data[i].total)
503
                   this.bar.series[0].data.push(resp.data.data[i].total)
480
-              }
504
+                  this.percent.push(resp.data.data[i].ratio)
505
+
506
+                }
481
             } else {
507
             } else {
482
             }
508
             }
483
           })
509
           })

+ 15 - 1
src/xt_pages/qcd/indicatorControlAnalysis/components/office.vue View File

146
     },
146
     },
147
     data() {
147
     data() {
148
       return {
148
       return {
149
+        percent:[],
150
+
149
         pickerOptions: {
151
         pickerOptions: {
150
           disabledDate(time) {
152
           disabledDate(time) {
151
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
153
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
203
                 normal: {
205
                 normal: {
204
                   show: true,
206
                   show: true,
205
                   position: 'top',
207
                   position: 'top',
206
-                  formatter: '{c}'
208
+                  formatter: (params) => {
209
+                    if(this.percent.length > 0){
210
+                      let str = ''
211
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
212
+                      return str
213
+                    }else{
214
+                      let str = ''
215
+                      str = params.data
216
+                      return str
217
+                    }
218
+                  }
207
                 }
219
                 }
208
               },
220
               },
209
               //配置样式
221
               //配置样式
434
       GetInspectionIndexChart(params) {
446
       GetInspectionIndexChart(params) {
435
         this.options.xAxis.data = []
447
         this.options.xAxis.data = []
436
         this.options.series[0].data = []
448
         this.options.series[0].data = []
449
+        this.percent = []
437
         GetInspectionIndexChart(params)
450
         GetInspectionIndexChart(params)
438
           .then(rs => {
451
           .then(rs => {
439
             var resp = rs.data
452
             var resp = rs.data
441
               for (let i = 0; i < resp.data.data.length; i++) {
454
               for (let i = 0; i < resp.data.data.length; i++) {
442
                 this.options.xAxis.data.push(resp.data.data[i].name)
455
                 this.options.xAxis.data.push(resp.data.data[i].name)
443
                 this.options.series[0].data.push(resp.data.data[i].total)
456
                 this.options.series[0].data.push(resp.data.data[i].total)
457
+                this.percent.push(resp.data.data[i].ratio)
444
               }
458
               }
445
             } else {
459
             } else {
446
               this.$message.error(resp.msg)
460
               this.$message.error(resp.msg)

+ 28 - 3
src/xt_pages/qcd/indicatorControlAnalysis/process.vue View File

310
 
310
 
311
           }
311
           }
312
         },
312
         },
313
+        percent:[],
313
         patientsData: [],
314
         patientsData: [],
314
         tableData: [],
315
         tableData: [],
315
         loading: false,
316
         loading: false,
369
                 normal: {
370
                 normal: {
370
                   show: true,
371
                   show: true,
371
                   position: 'top',
372
                   position: 'top',
372
-                  formatter: '{c}'
373
+                  formatter: (params) => {
374
+                    if(this.percent.length > 0){
375
+                      let str = ''
376
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
377
+                      return str
378
+                    }else{
379
+                      let str = ''
380
+                      str = params.data
381
+                      return str
382
+                    }
383
+                  }
373
                 }
384
                 }
374
               },
385
               },
375
               //配置样式
386
               //配置样式
438
                 normal: {
449
                 normal: {
439
                   show: true,
450
                   show: true,
440
                   position: 'top',
451
                   position: 'top',
441
-                  formatter: '{c}次'
452
+                  formatter: (params) => {
453
+                    if(this.percent.length > 0){
454
+                      let str = ''
455
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
456
+                      return str
457
+                    }else{
458
+                      let str = ''
459
+                      str = params.data
460
+                      return str
461
+                    }
462
+                  }
442
                 }
463
                 }
443
               },
464
               },
444
               //配置样式
465
               //配置样式
588
         this.chart.series[0].data = []
609
         this.chart.series[0].data = []
589
         this.bar.xAxis.data = []
610
         this.bar.xAxis.data = []
590
         this.bar.series[0].data = []
611
         this.bar.series[0].data = []
591
-        GetDialysisProcessIndexChartData(params)
612
+        this.percent = []
613
+
614
+          GetDialysisProcessIndexChartData(params)
592
           .then(rs => {
615
           .then(rs => {
593
             var resp = rs.data
616
             var resp = rs.data
594
             if (resp.state == 1) {
617
             if (resp.state == 1) {
602
                 for (let i = 0; i < resp.data.data.length; i++) {
625
                 for (let i = 0; i < resp.data.data.length; i++) {
603
                   this.bar.xAxis.data.push(resp.data.data[i].name)
626
                   this.bar.xAxis.data.push(resp.data.data[i].name)
604
                   this.bar.series[0].data.push(resp.data.data[i].total)
627
                   this.bar.series[0].data.push(resp.data.data[i].total)
628
+                  this.percent.push(resp.data.data[i].ratio)
629
+
605
                 }
630
                 }
606
               }
631
               }
607
             } else {
632
             } else {

+ 28 - 2
src/xt_pages/qcd/indicatorControlAnalysis/weight.vue View File

201
     },
201
     },
202
     data() {
202
     data() {
203
       return {
203
       return {
204
+        percent:[],
204
         pickerOptions: {
205
         pickerOptions: {
205
           disabledDate(time) {
206
           disabledDate(time) {
206
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
207
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
261
                 normal: {
262
                 normal: {
262
                   show: true,
263
                   show: true,
263
                   position: 'top',
264
                   position: 'top',
264
-                  formatter: '{c}'
265
+                  formatter: (params) => {
266
+                    if(this.percent.length > 0){
267
+                      let str = ''
268
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
269
+                      return str
270
+                    }else{
271
+                      let str = ''
272
+                      str = params.data
273
+                      return str
274
+                    }
275
+                  }
265
                 }
276
                 }
266
               },
277
               },
267
               //配置样式
278
               //配置样式
330
                 normal: {
341
                 normal: {
331
                   show: true,
342
                   show: true,
332
                   position: 'top',
343
                   position: 'top',
333
-                  formatter: '{c}次'
344
+                  formatter: (params) => {
345
+                    if(this.percent.length > 0){
346
+                      let str = ''
347
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
348
+                      return str
349
+                    }else{
350
+                      let str = ''
351
+                      str = params.data
352
+                      return str
353
+                    }
354
+                  }
334
                 }
355
                 }
335
               },
356
               },
336
               //配置样式
357
               //配置样式
482
       GetDialysisWeightChartData(params) {
503
       GetDialysisWeightChartData(params) {
483
         this.bar.xAxis.data = []
504
         this.bar.xAxis.data = []
484
         this.bar.series[0].data = []
505
         this.bar.series[0].data = []
506
+        this.percent = []
507
+
485
         GetDialysisWeightChartData(params)
508
         GetDialysisWeightChartData(params)
486
           .then(rs => {
509
           .then(rs => {
487
             var resp = rs.data
510
             var resp = rs.data
489
               for (let i = 0; i < resp.data.data.length; i++) {
512
               for (let i = 0; i < resp.data.data.length; i++) {
490
                 this.bar.xAxis.data.push(resp.data.data[i].name)
513
                 this.bar.xAxis.data.push(resp.data.data[i].name)
491
                 this.bar.series[0].data.push(resp.data.data[i].total)
514
                 this.bar.series[0].data.push(resp.data.data[i].total)
515
+                this.percent.push(resp.data.data[i].ratio)
516
+
517
+
492
               }
518
               }
493
             } else {
519
             } else {
494
             }
520
             }

+ 1 - 1
src/xt_pages/qcd/workAnalysis/doctor.vue View File

200
               normal: {
200
               normal: {
201
                 show: true,
201
                 show: true,
202
                 position: "top",
202
                 position: "top",
203
-                formatter: "{c}"
203
+                formatter: "{c}人次"
204
               }
204
               }
205
             },
205
             },
206
             //配置样式
206
             //配置样式

+ 1 - 1
src/xt_pages/qcd/workAnalysis/nurse.vue View File

244
                 normal: {
244
                 normal: {
245
                   show: true,
245
                   show: true,
246
                   position: "top",
246
                   position: "top",
247
-                  formatter: "{c}"
247
+                  formatter: "{c}人次"
248
                 }
248
                 }
249
               },
249
               },
250
               //配置样式
250
               //配置样式