Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Sinopec-Anxin

src/app/pages/records/criminal-records/criminal-records.component.ts

@@ -447,6 +447,7 @@ export class CriminalRecordsComponent implements OnInit {
       option.yAxis.data = ydata
       option.series.data = valuedata
     }
+    //1
     this.mybarChart.setOption(option);
   }
   //获取统计信息

src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts

@@ -152,7 +152,6 @@ export class OilUnloadingProcessListComponent implements OnInit {
         
       }
     }
-
   }
   //刷新饼图图表数据
   num