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

@@ -75,13 +75,13 @@
       <el-table :data="tableData" style="width: 100%" :height="tableHeight">
 
 
-        <el-table-column label="姓名" align="center">
+        <el-table-column fixed label="姓名" align="center">
           <template slot-scope="scope">
             {{scope.row.patient.name}}
           </template>
         </el-table-column>
 
-        <el-table-column fixed label="检查日期" align="center">
+        <el-table-column  label="检查日期" align="center">
           <template slot-scope="scope">
             <!--{{getTime(scope.row.inspect_date)}}-->
             {{scope.row.inspect_date | parseTime('{y}-{m}-{d}') }}
@@ -474,7 +474,6 @@
                 this.tableData.push(resp.data.data[i])
               }
               this.total = resp.data.total
-              console.log(this.total)
 
             } else {
               this.$toast({

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

@@ -141,6 +141,8 @@
     },
     data() {
       return {
+        percent:[],
+
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear() - 1)).getTime() - 24 * 3600 * 1000
@@ -197,7 +199,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
+                    }
+                  }
                 }
               },
               //配置样式
@@ -568,6 +580,8 @@
               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 {

src/xt_pages/qcd/indicatorControlAnalysis/weightDetails.vue

@@ -356,7 +356,7 @@ export default {
           if (resp.state == 1) {
             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)
+              this.chart.series[0].data.push(parseFloat(resp.data.data[i].value).toFixed(1))
             }
           } else {
           }

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -132,6 +132,8 @@ export default {
   },
   data() {
     return {
+      percent:[],
+
       pickerOptions: {
         disabledDate(time) {
           let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -200,7 +202,17 @@ export default {
               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
+                  }
+                }
               }
             },
             //配置样式
@@ -300,6 +312,10 @@ export default {
 
         })
     },
+    getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
     changeTime(val) {
       var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
       if (time > 0) {
@@ -327,12 +343,18 @@ export default {
               if(this.query.statistics_type == 1){
 
                 this.bar.series[0].data.push(resp.data.data[i].p_count)
+                this.percent.push(resp.data.data[i].p_ratio)
+
 
               }else if(this.query.statistics_type == 2){
                 this.bar.series[0].data.push(resp.data.data[i].course_count)
+                this.percent.push(resp.data.data[i].course_ratio)
+
 
               }else if(this.query.statistics_type == 3){
                 this.bar.series[0].data.push(resp.data.data[i].rescue_count)
+                this.percent.push(resp.data.data[i].rescue_ratio)
+
 
               }
             }

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -175,6 +175,7 @@
     },
     data() {
       return {
+        percent:[],
         pickerOptions: {
           disabledDate(time) {
             let threeMonths = new Date(new Date().setFullYear(new Date().getFullYear()-1)).getTime() - 24 * 3600 * 1000;
@@ -244,7 +245,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
+                    }
+                  }
                 }
               },
               //配置样式
@@ -344,6 +355,10 @@
 
           })
       },
+      getTimestamp(time) {
+        // 把时间日期转成时间戳
+        return new Date(time).getTime() / 1000;
+      },
       changeTime(val) {
         var time = this.getTimestamp(val) - this.getTimestamp(this.query.end_time);
         if (time > 0) {
@@ -371,17 +386,21 @@
                 if(this.query.statistics_type == 1){
 
                   this.bar.series[0].data.push(resp.data.data[i].puncture_count)
+                  this.percent.push(resp.data.data[i].puncture_ratio)
 
                 }else if(this.query.statistics_type == 2){
 
                   this.bar.series[0].data.push(resp.data.data[i].change_medicine_count)
+                  this.percent.push(resp.data.data[i].change_medicine_ratio)
 
 
                 }else if(this.query.statistics_type == 3){
                   this.bar.series[0].data.push(resp.data.data[i].cure_count)
+                  this.percent.push(resp.data.data[i].cure_ratio)
 
                 }else if(this.query.statistics_type == 4){
                   this.bar.series[0].data.push(resp.data.data[i].mission_count)
+                  this.percent.push(resp.data.data[i].mission_ratio)
 
                 }
               }