diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html new file mode 100644 index 0000000..9fad21e --- /dev/null +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html @@ -0,0 +1 @@ +

details-file-category works!

diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.scss b/src/app/pages/license/file-category/details-file-category/details-file-category.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts b/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts new file mode 100644 index 0000000..6d5bd0f --- /dev/null +++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-details-file-category', + templateUrl: './details-file-category.component.html', + styleUrls: ['./details-file-category.component.scss'] +}) +export class DetailsFileCategoryComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html new file mode 100644 index 0000000..4b2f754 --- /dev/null +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html @@ -0,0 +1 @@ +

edit-file-category works!

diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts new file mode 100644 index 0000000..94a231e --- /dev/null +++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-edit-file-category', + templateUrl: './edit-file-category.component.html', + styleUrls: ['./edit-file-category.component.scss'] +}) +export class EditFileCategoryComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/license/inform/inform.component.html b/src/app/pages/license/inform/inform.component.html index 52bfa71..aff191f 100644 --- a/src/app/pages/license/inform/inform.component.html +++ b/src/app/pages/license/inform/inform.component.html @@ -19,21 +19,21 @@ - + 证件名称 - - 证件编号 - 证件有效期 - 有效期类型 - 办理类型 - 通知内容 - 通知状态 - 处置状态 - - 忽略 + + 证件编号 + 证件有效期 + 有效期类型 + 办理类型 + 通知内容 + 通知状态 + 处置状态 + + 忽略 处置 - 申请延期 - + 申请延期 + diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html new file mode 100644 index 0000000..6c69572 --- /dev/null +++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html @@ -0,0 +1 @@ +

details-update-category works!

diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.scss b/src/app/pages/license/update-category/details-update-category/details-update-category.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts b/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts new file mode 100644 index 0000000..381198b --- /dev/null +++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-details-update-category', + templateUrl: './details-update-category.component.html', + styleUrls: ['./details-update-category.component.scss'] +}) +export class DetailsUpdateCategoryComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html new file mode 100644 index 0000000..2bc99c3 --- /dev/null +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html @@ -0,0 +1 @@ +

edit-update-category works!

diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts new file mode 100644 index 0000000..02463ab --- /dev/null +++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-edit-update-category', + templateUrl: './edit-update-category.component.html', + styleUrls: ['./edit-update-category.component.scss'] +}) +export class EditUpdateCategoryComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html index 6a503e4..caf5061 100644 --- a/src/app/pages/license/update-category/update-category.component.html +++ b/src/app/pages/license/update-category/update-category.component.html @@ -1 +1,51 @@ -

update-category works!

+
+
+ + + + + 证件名称 + + 证件编号 + 证件有效期 + 图片 + 有效期类型 + 办理类型 + 是否年检 + 提交时间 + 审核状态 + 预警状态 + 操作 + + + + + + 证件名称 + + 证件编号 + 证件有效期 + + + + 有效期类型 + 办理类型 + 是否年检 + 提交时间 + 审核状态 + 预警状态 + + 编辑 + 详情 + 提交审核 + + + + + +
+
+ + diff --git a/src/app/pages/license/update-category/update-category.component.scss b/src/app/pages/license/update-category/update-category.component.scss index e69de29..87b68c8 100644 --- a/src/app/pages/license/update-category/update-category.component.scss +++ b/src/app/pages/license/update-category/update-category.component.scss @@ -0,0 +1,20 @@ +.box{ + width: 100%; + height: 100%; +} +.tablebox{ + width: 100%; + height: 100%; + .operation{ + span{ + margin-right: 6px; + } + } + #table{ + img{ + width: 30px; + height: 30px; + cursor: pointer; + } + } +} \ No newline at end of file diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts index 15615ba..e5550d6 100644 --- a/src/app/pages/license/update-category/update-category.component.ts +++ b/src/app/pages/license/update-category/update-category.component.ts @@ -1,5 +1,7 @@ import { Component, OnInit } from '@angular/core'; - +import { Observable, fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import Viewer from 'viewerjs'; @Component({ selector: 'app-update-category', templateUrl: './update-category.component.html', @@ -8,8 +10,46 @@ import { Component, OnInit } from '@angular/core'; export class UpdateCategoryComponent implements OnInit { constructor() { } + tableSpin = false + list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + tableScrollHeight ngOnInit(): void { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + // 页面监听 + fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px' + }); + } + //查看图片 + viewImg(url) { + // url.split('?')[0] + let dom = document.getElementById(`viewerjs`) + let pObjs = dom.childNodes; + let node = document.createElement("img") + node.style.display = "none"; + node.src = url; + node.id = 'img' + dom.appendChild(node) + setTimeout(() => { + let viewer = new Viewer(document.getElementById(`viewerjs`), { + hidden: () => { + dom.removeChild(pObjs[0]); + viewer.destroy(); + } + }); + node.click(); + }, 0); + } + + dispose() { + console.log('处置') } + edit(item) { + + } + details(item) { + + } } diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 694d4fa..1b700d5 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -64,10 +64,14 @@ import { InformComponent } from './license/inform/inform.component'; import { UpdateCategoryComponent } from './license/update-category/update-category.component'; import { FileCategoryComponent } from './license/file-category/file-category.component'; import { HistoriesComponent } from './license/histories/histories.component'; +import { EditUpdateCategoryComponent } from './license/update-category/edit-update-category/edit-update-category.component'; +import { DetailsUpdateCategoryComponent } from './license/update-category/details-update-category/details-update-category.component'; +import { EditFileCategoryComponent } from './license/file-category/edit-file-category/edit-file-category.component'; +import { DetailsFileCategoryComponent } from './license/file-category/details-file-category/details-file-category.component'; @NgModule({ declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent, TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent, - AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent], + AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent], imports: [ diff --git a/src/app/pages/plan-admin/plan-admin.component.html b/src/app/pages/plan-admin/plan-admin.component.html index 8c6e93f..4384100 100644 --- a/src/app/pages/plan-admin/plan-admin.component.html +++ b/src/app/pages/plan-admin/plan-admin.component.html @@ -75,27 +75,27 @@ - +
{{item.stationName}} - - {{item.locationName}} - {{item.companyName}} - {{item.leaderName}} - {{item.leaderContact}} - {{item.stationLevel}} - {{item.sellVariety}} - {{item.gasStationCount}} - {{item.laneCount}} - + + {{item.locationName}} + {{item.companyName}} + {{item.leaderName}} + {{item.leaderContact}} + {{item.stationLevel}} + {{item.sellVariety}} + {{item.gasStationCount}} + {{item.laneCount}} + {{item.tankVolume}} {{item.tankVolume ? 'm³' : null}} - - + + 查看 - + diff --git a/src/index.html b/src/index.html index e24c7ef..79008b4 100644 --- a/src/index.html +++ b/src/index.html @@ -9,6 +9,7 @@ + diff --git a/src/theme.less b/src/theme.less index 0ff888d..58d86f8 100644 --- a/src/theme.less +++ b/src/theme.less @@ -1,6 +1,6 @@ @import "../node_modules/ng-zorro-antd/ng-zorro-antd.less"; -.buleColor { +.blueColor { color: #36A2FF; cursor: pointer; } @@ -294,7 +294,8 @@ //蓝色 表格 tree #stationPlanBox, -#inform { +#inform, +#updateLicense { ::-webkit-input-placeholder { /* WebKit browsers */ color: #345d85; @@ -368,13 +369,13 @@ border-bottom: 1px solid #0d3761; } - .ant-table-tbody>tr>th { - font-weight: 400; + .ant-table-tbody>tr>td { + font-weight: 300; font-family: synormal; background: none; border-bottom: none; padding: 0; - color: #91CCFF; + color: #C4E2FC; } .look {