解决冲突
This commit is contained in:
		| @ -139,6 +139,7 @@ export class DatatableCustomindexComponent implements OnInit { | ||||
|       .subscribe(res => { | ||||
|         if (res) { | ||||
|           this.chartData.push(...res); | ||||
|         console.log(this.curve); | ||||
|           this.curve.reRender(); | ||||
|         } | ||||
|       }); | ||||
|  | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -4,7 +4,7 @@ | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-04-06 10:57:56 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-04-06 19:15:39 | ||||
|  * @LastEditTime : 2022-04-06 20:39:43 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
| --> | ||||
|  | ||||
| @ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; | ||||
|  * @Author       : Shiming | ||||
|  * @Date         : 2022-04-06 10:57:56 | ||||
|  * @LastEditors  : Shiming | ||||
|  * @LastEditTime : 2022-04-06 19:36:34 | ||||
|  * @LastEditTime : 2022-04-06 20:39:15 | ||||
|  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts | ||||
|  * Copyright (C) 2022 huzhenhong. All rights reserved. | ||||
|  */ | ||||
| @ -25,11 +25,12 @@ export class DatatableDatascreenComponent implements OnInit { | ||||
|   @ViewChild('st') private readonly st!: STComponent; | ||||
|   @ViewChild('orderSt') private readonly orderSt!: STComponent; | ||||
|   @ViewChild('map') private readonly map!: DatatableCustomindexMapComponent; | ||||
|  | ||||
|   columns: STColumn[] = []; | ||||
|   chartData: any = []; | ||||
|   orderColumns!: STColumn[]; | ||||
|   constructor(public service: DataService) { } | ||||
|   constructor(public service: DataService) { | ||||
|     | ||||
|    } | ||||
|  | ||||
|   /** | ||||
|    * 查询参数 | ||||
| @ -43,6 +44,8 @@ export class DatatableDatascreenComponent implements OnInit { | ||||
|   get reqParams() { | ||||
|     const params = { | ||||
|     } | ||||
|   | ||||
|  | ||||
|     return { ...params }; | ||||
|   } | ||||
|   ngOnInit(): void { | ||||
| @ -60,9 +63,13 @@ export class DatatableDatascreenComponent implements OnInit { | ||||
|       { title: '货物', index: 'carStatus', className: 'text-center'}, | ||||
|       { title: '数量', index: 'approvalStatus', className: 'text-center' }, | ||||
|     ]; | ||||
|     if(this.map) { | ||||
|       this.map.reRender() | ||||
|     } | ||||
|     console.log(this.map); | ||||
|     setTimeout(() => { | ||||
|       if(this.map) { | ||||
|         this.map.reRender() | ||||
|       } | ||||
|     }, 500); | ||||
|     | ||||
|   } | ||||
|   initOrderST() { | ||||
|     this.columns = [ | ||||
|  | ||||
		Reference in New Issue
	
	Block a user