解决冲突

This commit is contained in:
wangshiming
2022-04-06 20:23:38 +08:00
parent 9fefb78dd8
commit 675a750ae6
12 changed files with 11532 additions and 84 deletions

View File

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-06 13:43:29
* @LastEditors : Shiming
* @LastEditTime : 2022-04-06 19:20:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\curve\\curve.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
import { Chart } from '@antv/g2';
import { DataService } from 'src/app/routes/datatable/services/data.service';
@ -23,7 +33,7 @@ export class DatatableCustomindexCurveComponent implements OnInit, OnChanges {
}
ngOnInit(): void {
}
reRender() {
setTimeout(() => {
@ -36,6 +46,7 @@ export class DatatableCustomindexCurveComponent implements OnInit, OnChanges {
setTimeout(() => {
this.ngZone.runOutsideAngular(() => this.init(this.el));
},500)
console.log(this.chartData);
}
private init(el: HTMLElement): void {