解决冲突

2022-04-07 18:27:27 +08:00
parent deec1b0bd6
commit 7b0f2d49b5
9 changed files with 209 additions and 33 deletions
--- a/src/app/routes/datatable/components/datascreen/map/map.component.html
+++ b/src/app/routes/datatable/components/datascreen/map/map.component.html
@ -0,0 +1,11 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 17:57:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-07 15:48:36
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\map.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<g2-custom delay="200" (render)="render($event)"></g2-custom>