Pārlūkot izejas kodu

提交适配部分修改

master
lijie.hu pirms 1 gada
vecāks
revīzija
6b25868b49
4 mainītis faili ar 40 papildinājumiem un 27 dzēšanām
  1. +7
    -3
      src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css
  2. +4
    -4
      src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.html
  3. +27
    -18
      src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.ts
  4. +2
    -2
      src/app/routes/data-v/navigation/navigation.component.html

+ 7
- 3
src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.css Parādīt failu

@@ -34,19 +34,22 @@ border-radius: 3px;


.card-content { .card-content {
overflow: hidden; overflow: hidden;

/* height: 18rem; */
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
//height: 18rem;
padding: 1rem 1.5rem; padding: 1rem 1.5rem;
padding: 1rem; padding: 1rem;


/* 调整内边距以适应内容 */ /* 调整内边距以适应内容 */
//position: relative;

/* //position: relative; */
background-image: url('../../../../assets/dashboard/dashboard_card_bg2.png'); background-image: url('../../../../assets/dashboard/dashboard_card_bg2.png');
background-repeat: no-repeat; background-repeat: no-repeat;


/* 防止背景图片重复 */ /* 防止背景图片重复 */
background-position: center; background-position: center;
// background-position: top;

/* // background-position: top; */
background-size: 100% 100%; background-size: 100% 100%;


.card-content-title { .card-content-title {
@@ -115,6 +118,7 @@ border-radius: 3px;
.table-header { .table-header {
display: flex; /* 使用 flex 布局 */ display: flex; /* 使用 flex 布局 */
justify-content: space-between; /* 元素之间平均分布 */ justify-content: space-between; /* 元素之间平均分布 */
font-size: 0.9rem;
} }


+ 4
- 4
src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.html Parādīt failu

@@ -17,7 +17,7 @@
<div class="rounded-border" style="color: #ff0200">#1</div> <div class="rounded-border" style="color: #ff0200">#1</div>


<lj-car-ag-grid-component <lj-car-ag-grid-component
style="width: 100%; height: 120px"
style="width: 100%; height: 14.5rem"
[defaultColDef]="defaultColDef" [defaultColDef]="defaultColDef"
[rowData]="rowData1" [rowData]="rowData1"
[columnDefs]="colDefs1" [columnDefs]="colDefs1"
@@ -27,7 +27,7 @@
<div class="grid-item"> <div class="grid-item">
<div class="rounded-border" style="color: #25f551">#2</div> <div class="rounded-border" style="color: #25f551">#2</div>
<lj-car-ag-grid-component <lj-car-ag-grid-component
style="width: 100%; height: 120px"
style="width: 100%; height: 14.5rem"
[defaultColDef]="defaultColDef" [defaultColDef]="defaultColDef"
[rowData]="rowData1" [rowData]="rowData1"
[columnDefs]="colDefs1" [columnDefs]="colDefs1"
@@ -37,7 +37,7 @@
<div class="grid-item"> <div class="grid-item">
<div class="rounded-border" style="color: #ff0200">#3</div> <div class="rounded-border" style="color: #ff0200">#3</div>
<lj-car-ag-grid-component <lj-car-ag-grid-component
style="width: 100%; height: 120px"
style="width: 100%; height: 14.5rem"
[defaultColDef]="defaultColDef" [defaultColDef]="defaultColDef"
[rowData]="rowData1" [rowData]="rowData1"
[columnDefs]="colDefs1" [columnDefs]="colDefs1"
@@ -47,7 +47,7 @@
<div class="grid-item"> <div class="grid-item">
<div class="rounded-border" style="color: #bbbbbb">#4</div> <div class="rounded-border" style="color: #bbbbbb">#4</div>
<lj-car-ag-grid-component <lj-car-ag-grid-component
style="width: 100%; height: 120px"
style="width: 100%; height: 14.5rem"
[defaultColDef]="defaultColDef" [defaultColDef]="defaultColDef"
[rowData]="rowData1" [rowData]="rowData1"
[columnDefs]="colDefs1" [columnDefs]="colDefs1"


+ 27
- 18
src/app/routes/data-v/lj-car-info-table/lj-car-info-table.component.ts Parādīt failu

@@ -78,58 +78,67 @@ export class DataVLjCarInfoTableComponent implements OnInit {
valueGetter: function (params: any) { valueGetter: function (params: any) {
return parseInt(params.node.id) + 1; return parseInt(params.node.id) + 1;
}, },
minWidth: 50,
cellStyle: { 'font-size': '13px' },
// minWidth: 5rem,
flex: 1,
cellStyle: { 'font-size': '0.9rem' },
field: 'xh' field: 'xh'
}, },


{ {
headerName: '时间', headerName: '时间',
field: 'time', field: 'time',
minWidth: 60,
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
// minWidth: 60,
flex: 1,
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '车牌', headerName: '车牌',
field: 'carNo', field: 'carNo',
minWidth: 50,
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
// minWidth: 50,
flex: 1,
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '车型', headerName: '车型',
field: 'carType', field: 'carType',
minWidth: 50,
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
// minWidth: 50,
flex: 1,
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '卡号', headerName: '卡号',
field: 'no', field: 'no',
minWidth: 50,
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
// minWidth: 50,
flex: 1,
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '供应商', headerName: '供应商',
minWidth: 55,
// minWidth: 55,
flex: 1,
field: 'supplier', field: 'supplier',
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '毛重', headerName: '毛重',
minWidth: 55,
// minWidth: 55,
flex: 1,
field: 'grossWeight', field: 'grossWeight',
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '上报热值', headerName: '上报热值',
minWidth: 55,
// minWidth: 55,
flex: 1,
field: 'reportHotValue', field: 'reportHotValue',
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
}, },
{ {
headerName: '估算热值', headerName: '估算热值',
minWidth: 55,
// minWidth: 55,
flex: 1,
field: 'estimateValue', field: 'estimateValue',
cellStyle: { 'font-size': '13px', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
cellStyle: { 'font-size': '0.9rem', 'padding-top': '0px', 'padding-right': '0px', 'padding-bottom': '0px', 'padding-left': '0px' }
} }
// { headerName: '操作', width: 90, field: 'cz', cellRenderer: GridButtonValueRenderer } // { headerName: '操作', width: 90, field: 'cz', cellRenderer: GridButtonValueRenderer }
]; ];


+ 2
- 2
src/app/routes/data-v/navigation/navigation.component.html Parādīt failu

@@ -7,7 +7,7 @@
<a href="javascript:void(0);" class="menu-group" [class.active]="isActive(true)" (click)="navigate(menu)"> <a href="javascript:void(0);" class="menu-group" [class.active]="isActive(true)" (click)="navigate(menu)">
<img <img
*ngIf="menu.icon" *ngIf="menu.icon"
width="20"
width="1rem"
src="assets/{{ menu.icon.includes('svg') ? menu.icon : menu.icon + '.svg' }}" src="assets/{{ menu.icon.includes('svg') ? menu.icon : menu.icon + '.svg' }}"
alt="{{ menu.text }}" alt="{{ menu.text }}"
/> />
@@ -36,7 +36,7 @@
<a href="javascript:void(0);" class="menu-group" [class.active]="isActive(true)" (click)="navigate(menu)"> <a href="javascript:void(0);" class="menu-group" [class.active]="isActive(true)" (click)="navigate(menu)">
<img <img
*ngIf="menu.icon" *ngIf="menu.icon"
width="20"
width="1rem"
src="assets/{{ menu.icon.includes('svg') ? menu.icon : menu.icon + '.svg' }}" src="assets/{{ menu.icon.includes('svg') ? menu.icon : menu.icon + '.svg' }}"
alt="{{ menu.text }}" alt="{{ menu.text }}"
/> />


Notiek ielāde…
Atcelt
Saglabāt