diff --git a/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-component.component.ts b/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-component.component.ts index 88dd154..ac3aa08 100644 --- a/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-component.component.ts +++ b/src/app/routes/data-v/lj-car-info-table/lj-car-ag-grid-component/lj-car-ag-grid-component.component.ts @@ -12,7 +12,8 @@ import { NzPaginationModule } from 'ng-zorro-antd/pagination'; export class LjCarAgGridComponentComponent implements OnInit { @ViewChild('myGrid') grid!: AgGridAngular; public gridOptions: any = { - headerHeight: 0 + headerHeight: 0, + width: '100%' }; /**每页数 */ diff --git a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css index deb7419..d24397c 100644 --- a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css +++ b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css @@ -101,4 +101,28 @@ border-radius: 3px; align-self: flex-end; } } -} \ No newline at end of file +} + +.table-container { + margin: 10px 5px 20px; /* Adjust padding as needed */ + padding: 10px; + border: 1px solid #fff; /* White border */ + + /* Other styles */ + } + + + .table-header { + display: flex; /* 使用 flex 布局 */ + justify-content: space-between; /* 元素之间平均分布 */ + } + + .table-header span { + flex: 1; /* 每个元素占据等宽 */ + text-align: center; /* 文本居中 */ + } + + .grid-item { + margin-bottom: 10px; + } + \ No newline at end of file diff --git a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.html b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.html index 581c6c3..0d2be2b 100644 --- a/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.html +++ b/src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.html @@ -1,11 +1,55 @@
- +
+
+ 序号 + 时间 + 车牌 + 车型 + 卡号 + 供应商 + 毛重 + 上报
热值
+ 估算
热值
+
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/src/app/routes/data-v/s1/s1.component.html b/src/app/routes/data-v/s1/s1.component.html index 891f7a0..c8feb85 100644 --- a/src/app/routes/data-v/s1/s1.component.html +++ b/src/app/routes/data-v/s1/s1.component.html @@ -46,51 +46,45 @@
-
-
- 机器人 -
-
- 全硫仪 -
-
- 全水分析仪 -
-
- 挥发分仪 -
-
- 量热仪 -
-
- 碳氢氮元素 -
+
+
机器人
+
全硫仪
+
全水分析仪
+
挥发分仪
+
量热仪
+
碳氢氮元素
- +
- @for(item of chartConfig.optionsCheckList; track item) { + @for (item of chartConfig.optionsCheckList; track item) {
- + *ngIf="item.checked" + />
- } + }
- @for(item of chartConfig.optionBottomList; track item) { + @for (item of chartConfig.optionBottomList; track item) {
- } + }
diff --git a/src/app/routes/data-v/second1/second1.component.html b/src/app/routes/data-v/second1/second1.component.html index b5bcbe2..1e9b299 100644 --- a/src/app/routes/data-v/second1/second1.component.html +++ b/src/app/routes/data-v/second1/second1.component.html @@ -1,8 +1,8 @@
-
- +
+ void }; diff --git a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html index b50505b..2a9d8e8 100644 --- a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html +++ b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html @@ -22,16 +22,15 @@ [suppressScrollOnNewData]="true" [paginationPageSize]="pageSize" [defaultColDef]="defaultColDef" - [rowData]="rowData" - [columnDefs]="columnDefs" [rowHeight]="38" + [gridOptions]="gridOptions" />
-
共 {{ pageRowTotal }} 项数据
+
共1222 {{ pageRowTotal }} 项数据