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

@@ -184,7 +184,7 @@
             left: 0
           },
           xAxis: {
-            data: ['达标', '未达标']
+            data: []
           },
           yAxis: {
             axisLabel: {
@@ -197,7 +197,7 @@
             {
               name: '',
               type: 'bar',
-              data: ['78.57', '50'],
+              data: [],
               barWidth: 30,
               label: {
                 normal: {

src/xt_pages/qcd/workAnalysis/doctor.vue

@@ -145,7 +145,7 @@ export default {
       loading: false,
       total: '',
       query: {
-        admin_user_id: "",
+        admin_user_id: 0,
         statistics_type: 1,
         start_time: "",
         end_time: "",
@@ -154,7 +154,10 @@ export default {
       },
 
 
-      doctor_options:[],
+      doctor_options:[
+        {id:0,user_name:"全部",admin_user_id:0}
+
+      ],
       project_options:[
         {value:1, name:"治疗"},
         {value:2, name:"病程记录"},
@@ -278,6 +281,7 @@ export default {
       this.query.admin_user_id = val
       this.query.page = 1
       this.GetDoctorWorkloadTableData(this.query)
+      this.GetDoctorWorkloadChartData(this.query)
 
     },
     GetAllDoctor(){
@@ -319,9 +323,24 @@ export default {
           var resp = rs.data
           if (resp.state == 1) {
             this.loading = false
+            let total_cure = 0
+            let total_rescue = 0
+            let total_course = 0
+
             for (let i = 0; i < resp.data.data.length; i++) {
+              total_cure = total_cure + resp.data.data[i].p_count
+              total_rescue = total_rescue + resp.data.data[i].rescue_count
+              total_course = total_course + resp.data.data[i].course_count
               this.tableData.push(resp.data.data[i])
             }
+
+            this.tableData.push( {
+              user_name:"合计",
+              p_count:total_cure,
+              course_count:total_course,
+              rescue_count:total_rescue
+            })
+
           } else {
             this.loading = false
           }
@@ -351,6 +370,8 @@ export default {
 
       this.bar.xAxis.data = []
       this.bar.series[0].data = []
+      this.percent = []
+
       GetDoctorWorkloadChartData(params)
         .then(rs => {
           var resp = rs.data

src/xt_pages/qcd/workAnalysis/nurse.vue

@@ -180,16 +180,16 @@
         loading: false,
         total: '',
         query: {
-          admin_user_id: "",
+          admin_user_id: 0,
           statistics_type: 1,
           start_time: "",
           end_time: "",
           limit:20,
           page:1,
         },
-
-
-        nurse_options:[],
+        nurse_options:[
+          {id:0,user_name:"全部",admin_user_id:0}
+        ],
         project_options:[
           {value:1, name:"治疗"},
           {value:2, name:"穿刺"},
@@ -312,6 +312,7 @@
       changeNurse(val){
         this.query.admin_user_id = val
         this.query.page = 1
+        this.GetNurseWorkloadChartData(this.query)
         this.GetNurseWorkloadTableData(this.query)
 
       },
@@ -353,10 +354,22 @@
           .then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
+              let total_cure = 0
+              let total_puncture = 0
+              let total_mission = 0
               this.loading = false
               for (let i = 0; i < resp.data.data.length; i++) {
+                total_cure = total_cure + resp.data.data[i].cure_count
+                total_puncture = total_puncture + resp.data.data[i].puncture_count
+                total_mission = total_mission + resp.data.data[i].mission_count
                 this.tableData.push(resp.data.data[i])
               }
+              this.tableData.push( {
+                user_name:"合计",
+                cure_count:total_cure,
+                puncture_count:total_puncture,
+                mission_count:total_mission
+              })
             } else {
               this.loading = false
             }
@@ -386,6 +399,7 @@
 
         this.bar.xAxis.data = []
         this.bar.series[0].data = []
+        this.percent = []
         GetNurseWorkloadChartData(params)
           .then(rs => {
             var resp = rs.data