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

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckAll.vue

                  }
               }
             }
+            // let projectArr = []
+            // this.newArr.map(item => {
+            //   projectArr.push(item.project_name)
+            // })
+            // console.log("projectArr",projectArr)
+            // projectArr.forEach((item,index) => {
+            //   if(!(arr[index] && item == arr[index].ProjectName)){
+            //     arr.splice(index,0,{Count:0, ProjectName: item,name: val.name})
+            //   }
+            // })
+            // this.tableData = []
+            // let obj = {}
+            // obj.name = val.name
+            // obj.data = arr
+            // this.tableData.push(obj)
             console.log("arr",arr)
           }
       })
       })
     },
     handleChange(val){
+      console.log(1111111111,val)
       getPatientDetailCheck(val.id,this.listQuery.start_time,this.listQuery.end_time).then(response=>{
           if(response.data.state === 1){
             var checkDetail =  response.data.data.checkDetail
                  }
               }
             }
-            console.log("arr",arr)
+            let projectArr = []
+            this.newArr.map(item => {
+              projectArr.push(item.project_name)
+            })
+            console.log("projectArr",projectArr)
+            projectArr.forEach((item,index) => {
+              if(!(arr[index] && item == arr[index].ProjectName)){
+                arr.splice(index,0,{Count:0, ProjectName: item,name: val.name})
+              }
+            })
+            this.tableData = []
+            let obj = {}
+            obj.name = val.name
+            obj.data = arr
+            this.tableData.push(obj)
+            this.total = 1
+            console.log("arr",this.tableData)
           }
       })
     },

src/xt_pages/qcd/treatmentControlAnalysis/components/CheckPersonal.vue

              item.Count = eval(item.Count.join('+'))
             })
             console.log(11111,res)
+            let arr1 = []
+            this.tableData.map(it => {
+              arr1.push(it.project_name)
+            })
 
-          
+            arr1.forEach((item,index)=>{
+              if(!(res[index] && item ==res[index].ProjectName)){
+                res.splice(index,0,{Count:0, ProjectName: item, Sort: index+1})
+              }
+            })
+            res.map(item => {
+              this.modesData.series.push(parseInt(item.Count));
+            })
 
 
             for (const key in this.tableData) {
               this.modesData.xAxis.push(this.tableData[key].project_name);
-              if (key in res) {
-                this.modesData.series.push(parseInt(res[key].Count));
-                // batotal += parseInt(res[key].Count);
-              } else {
-                this.modesData.series.push(0);
-              }
+              // if (key in res) {
+                
+              //   this.modesData.series.push(parseInt(res[key].Count));
+              //   // batotal += parseInt(res[key].Count);
+              // } else {
+              //   this.modesData.series.push(0);
+              // }
             }
+
+
             
             this.chart.series[0].data = this.modesData.series
             this.chart.xAxis.data = this.modesData.xAxis