Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-07 18:31:33 +08:00
parent 7b0f2d49b5 617896a85b
commit 1c1bfad35e
9 changed files with 151 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/datatable/datatable.module.ts
View File

@ -1,10 +1,10 @@
/*
* @Description :
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-06 11:02:17
* @LastEditors : Shiming
* @LastEditTime : 2022-04-06 17:22:44
* @LastEditTime : 2022-04-07 18:29:39
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\datatable.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -42,6 +42,7 @@ import { BusitableCurveComponent } from './components/busitable/busiindex/curve/
import { DatatableCustomindexCurveComponent } from './components/customtable/customindex/curve/curve.component';
import { DatatableCustomindexMapComponent } from './components/datascreen/map/map.component';
import { DatatableCustomindexCurveMinComponent } from './components/datascreen/curve/curve.component';
import { DatatableReportingvViewTrackComponent } from './reporting/components/view-track/view-track.component';
const COMPONENTS: Type<void>[] = [
DatatableDataindexComponent,
@ -76,7 +77,8 @@ const COMPONENTS: Type<void>[] = [
BusitableCurveComponent,
DatatableCustomindexCurveComponent,
DatatableCustomindexMapComponent,
DatatableCustomindexCurveMinComponent
DatatableCustomindexCurveMinComponent,
DatatableReportingvViewTrackComponent
]