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

src/router/modules/qcd.js

@@ -259,17 +259,7 @@ export default {
         noCache: true
       }
     },
-    {
-      path: '/qcd/a',
-      hidden: true,
-      is_menu: false,
-      component: () => import('@/xt_pages/qcd/a'),
-      name: 'workAnalysisNurse',
-      meta: {
-        title: '工作量分析统计护士',
-        noCache: true
-      }
-    },
+
     {
       path: '/qcd/patientanalysis/checkStatistical',
       hidden: true,

src/xt_pages/qcd/indicatorControlAnalysis/bloodPressure.vue

@@ -192,6 +192,8 @@
     },
     data() {
       return {
+        percent:[],
+
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -251,7 +253,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -320,7 +332,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -470,6 +492,8 @@
       GetDialysisBloodPressureChartData(params) {
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
+        this.percent = []
+
         GetDialysisBloodPressureChartData(params)
           .then(rs => {
             var resp = rs.data
@@ -477,7 +501,9 @@
                 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)
-              }
+                  this.percent.push(resp.data.data[i].ratio)
+
+                }
             } else {
             }
           })

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

@@ -146,6 +146,8 @@
     },
     data() {
       return {
+        percent:[],
+
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
@@ -203,7 +205,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -434,6 +446,7 @@
       GetInspectionIndexChart(params) {
         this.options.xAxis.data = []
         this.options.series[0].data = []
+        this.percent = []
         GetInspectionIndexChart(params)
           .then(rs => {
             var resp = rs.data
@@ -441,6 +454,7 @@
               for (let i = 0; i < resp.data.data.length; i++) {
                 this.options.xAxis.data.push(resp.data.data[i].name)
                 this.options.series[0].data.push(resp.data.data[i].total)
+                this.percent.push(resp.data.data[i].ratio)
               }
             } else {
               this.$message.error(resp.msg)

src/xt_pages/qcd/indicatorControlAnalysis/process.vue

@@ -310,6 +310,7 @@
 
           }
         },
+        percent:[],
         patientsData: [],
         tableData: [],
         loading: false,
@@ -369,7 +370,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -438,7 +449,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -588,7 +609,9 @@
         this.chart.series[0].data = []
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
-        GetDialysisProcessIndexChartData(params)
+        this.percent = []
+
+          GetDialysisProcessIndexChartData(params)
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
@@ -602,6 +625,8 @@
                 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)
+                  this.percent.push(resp.data.data[i].ratio)
+
                 }
               }
             } else {

src/xt_pages/qcd/indicatorControlAnalysis/weight.vue

@@ -201,6 +201,7 @@
     },
     data() {
       return {
+        percent:[],
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -261,7 +262,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -330,7 +341,17 @@
                 normal: {
                   show: true,
                   position: 'top',
-                  formatter: '{c}次'
+                  formatter: (params) => {
+                    if(this.percent.length > 0){
+                      let str = ''
+                      str = params.data + '('+ this.percent[params.dataIndex] +'%)'
+                      return str
+                    }else{
+                      let str = ''
+                      str = params.data
+                      return str
+                    }
+                  }
                 }
               },
               //配置样式
@@ -482,6 +503,8 @@
       GetDialysisWeightChartData(params) {
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
+        this.percent = []
+
         GetDialysisWeightChartData(params)
           .then(rs => {
             var resp = rs.data
@@ -489,6 +512,9 @@
               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)
+                this.percent.push(resp.data.data[i].ratio)
+
+
               }
             } else {
             }

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -200,7 +200,7 @@ export default {
               normal: {
                 show: true,
                 position: "top",
-                formatter: "{c}"
+                formatter: "{c}人次"
               }
             },
             //配置样式

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -244,7 +244,7 @@
                 normal: {
                   show: true,
                   position: "top",
-                  formatter: "{c}"
+                  formatter: "{c}人次"
                 }
               },
               //配置样式