Browse Source

[完善]完善消防器材排版

dev
邵佳豪 3 years ago
parent
commit
4dcfda8aba
  1. 15
      src/app/pages/equipment-info/equipment-info.component.html
  2. 11
      src/app/pages/equipment-info/equipment-info.component.scss
  3. 5
      src/app/pages/pages.module.ts

15
src/app/pages/equipment-info/equipment-info.component.html

@ -47,19 +47,22 @@
<div class="tbody"> <div class="tbody">
<div nz-row class="tr" *ngFor="let item of equipmentList"> <div nz-row class="tr" *ngFor="let item of equipmentList">
<div nz-col nzSpan="5" style="box-sizing: border-box;padding-left: 28px;"> <div nz-col nzSpan="5" style="box-sizing: border-box;padding-left: 28px;">
{{item.name}} <span nz-tooltip [nzTooltipTitle]="item.name">{{item.name}}</span>
</div> </div>
<div nz-col nzSpan="4"> <div nz-col nzSpan="4">
{{item.storageLocation}} <span nz-tooltip [nzTooltipTitle]="item.storageLocation">{{item.storageLocation}}</span>
</div> </div>
<div nz-col nzSpan="4"> <div nz-col nzSpan="4">
{{item.productionDate | date:"yyyy-MM-dd"}} <span nz-tooltip [nzTooltipTitle]="item.productionDate | date:'yyyy-MM-dd'">{{item.productionDate |
date:"yyyy-MM-dd"}}</span>
</div> </div>
<div nz-col nzSpan="4"> <div nz-col nzSpan="4">
{{item.maintenanceDate | date:"yyyy-MM-dd"}} <span nz-tooltip [nzTooltipTitle]="item.maintenanceDate | date:'yyyy-MM-dd'">{{item.maintenanceDate |
date:"yyyy-MM-dd"}}</span>
</div> </div>
<div nz-col nzSpan="4"> <div nz-col nzSpan="4">
{{item.validityEndTime | date:"yyyy-MM-dd"}} <span nz-tooltip [nzTooltipTitle]="item.validityEndTime | date:'yyyy-MM-dd'">{{item.validityEndTime |
date:"yyyy-MM-dd"}}</span>
</div> </div>
<div nz-col nzSpan="3" class="btn"> <div nz-col nzSpan="3" class="btn">
<span (click)="edit(item)"> <span (click)="edit(item)">
@ -83,4 +86,4 @@
<div class="backbtn"> <div class="backbtn">
<button nz-button (click)="goback()">返回</button> <button nz-button (click)="goback()">返回</button>
</div> </div>
</div> </div>

11
src/app/pages/equipment-info/equipment-info.component.scss

@ -74,7 +74,7 @@
color: #23D9FF; color: #23D9FF;
background: rgba(35, 153, 255, 0.2); background: rgba(35, 153, 255, 0.2);
border: 1px solid rgba(35, 217, 255, 0.4); border: 1px solid rgba(35, 217, 255, 0.4);
box-shadow: 0 0 3px 0px #23D9FF inset; box-shadow: 0 0 3px 0px #23D9FF inset;
} }
.tbody { .tbody {
@ -88,6 +88,13 @@
line-height: 40px; line-height: 40px;
border-bottom: 1px solid #115188; border-bottom: 1px solid #115188;
div {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: default;
}
.btn { .btn {
span { span {
color: #2399FF; color: #2399FF;
@ -131,4 +138,4 @@
border-radius: 0px; border-radius: 0px;
color: #91CCFF; color: #91CCFF;
} }
} }

5
src/app/pages/pages.module.ts

@ -58,7 +58,7 @@ import { ChangePasswordComponent } from './change-password/change-password.compo
import { FacilitySortPipe } from './facility-sort.pipe'; import { FacilitySortPipe } from './facility-sort.pipe';
import { WarningStatisticsListComponent } from './warning-statistics-list/warning-statistics-list.component'; import { WarningStatisticsListComponent } from './warning-statistics-list/warning-statistics-list.component';
import { DisposeequipmentComponent } from './warning-statistics-list/disposeequipment/disposeequipment.component'; import { DisposeequipmentComponent } from './warning-statistics-list/disposeequipment/disposeequipment.component';
import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
@NgModule({ @NgModule({
declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
@ -102,7 +102,8 @@ import { DisposeequipmentComponent } from './warning-statistics-list/disposeequi
NzNotificationModule, NzNotificationModule,
NzPopconfirmModule, NzPopconfirmModule,
NzBadgeModule, NzBadgeModule,
NzRadioModule NzRadioModule,
NzToolTipModule
], ],
entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent], entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA] schemas: [CUSTOM_ELEMENTS_SCHEMA]

Loading…
Cancel
Save