解决冲突

src/app/routes/datatable/components/datascreen/datascreen.component.ts

@@ -5,7 +5,7 @@ import { map } from 'rxjs/operators';
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 01:48:44
+ * @LastEditTime : 2022-04-07 09:30:20
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -56,8 +56,15 @@ export class DatatableDatascreenComponent implements OnInit {
   ngOnInit(): void {
     this.initST()
     this.initOrderST()
+    this.initData()
     this.initLineData()
   }
+  initData(){
+    this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => {
+      console.log(res);
+      
+    })
+  }
   initLineData(){
     for (let i = 0; i < 20; i += 1) {
       this.chartData.push({