刘向辉 3 years ago
parent
commit
24ebef06fe
  1. 46
      src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
  2. 47
      src/app/pages/criminal-records/criminal-records.component.ts
  3. 68
      src/app/pages/facility-sort.pipe.ts
  4. 8
      src/app/pages/home-page/home-page.component.ts
  5. 32
      src/app/pages/home/home.component.ts
  6. 6
      src/app/pages/left-domain/left-domain.component.html
  7. 10
      src/app/pages/left-domain/left-domain.component.ts
  8. 3
      src/app/pages/pages.module.ts
  9. 2
      src/app/pages/today-warning-admin/today-warning-admin.component.ts
  10. 3
      src/app/pages/today-warning/today-warning.component.ts

46
src/app/pages/criminal-records-admin/criminal-records-admin.component.ts

@ -532,30 +532,32 @@ export class CriminalRecordsAdminComponent implements OnInit {
if (!item.violateImage && !item.violateVideo) {
this.message.create('warning', '没有预警照片或视频!');
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
'box-shadow': '0 0 8px 0 #fff',
'background': '#000D21',
},
nzComponentParams: {
data: item
},
nzFooter: null,
nzOnOk: async () => {
if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
this.message.create('warning', item.desc);
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
'box-shadow': '0 0 8px 0 #fff',
'background': '#000D21',
},
nzComponentParams: {
data: item
},
nzFooter: null,
nzOnOk: async () => {
}
});
const instance = modal.getContentComponent();
}
});
const instance = modal.getContentComponent();
}
}
}

47
src/app/pages/criminal-records/criminal-records.component.ts

@ -513,31 +513,32 @@ export class CriminalRecordsComponent implements OnInit {
if (!item.violateImage && !item.violateVideo) {
this.message.create('warning', '没有预警照片或视频!');
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
'box-shadow': '0 0 8px 0 #fff',
'background': '#000D21',
},
nzComponentParams: {
data: item
},
nzFooter: null,
nzOnOk: async () => {
if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
this.message.create('warning', item.desc);
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
'box-shadow': '0 0 8px 0 #fff',
'background': '#000D21',
},
nzComponentParams: {
data: item
},
nzFooter: null,
nzOnOk: async () => {
}
});
const instance = modal.getContentComponent();
}
});
const instance = modal.getContentComponent();
}
}
}
goOilList() {

68
src/app/pages/facility-sort.pipe.ts

@ -0,0 +1,68 @@
import { Pipe, PipeTransform } from '@angular/core';
import { FacilityInfoUIItem } from '../babylon/view/facilityinfoinscene-window/facilityinfo-ui-item';
@Pipe({
name: 'facilitySort',
pure: false,
})
export class FacilitySortPipe implements PipeTransform {
transform(items: FacilityInfoUIItem[]) {
items.forEach(item=>{
if (!this.isHasNumber(item.getPropertyData().name)) {
item.getPropertyData().name = this.handleChineseNumber(item.getPropertyData().name)
}
})
items.sort(function (a, b) {
var _a = a.getPropertyData().name.match(/^(.*?)(\d*)$/);
var _b = b.getPropertyData().name.match(/^(.*?)(\d*)$/);
if (_a[1] === _b[1]) {
return parseInt(_a[2] || 0) - parseInt(_b[2] || 0);
} else {
return _a[1].localeCompare(_b[1]);
}
})
return items;
}
//处理 汉字数字
handleChineseNumber(str: string): string {
if (str.includes('一')) {
str = str.replace("一", "")
return `1${str}`
} else if (str.includes('二')) {
str = str.replace("二", "")
return `2${str}`
} else if (str.includes('三')) {
str = str.replace("三", "")
return `3${str}`
} else if (str.includes('四')) {
str = str.replace("四", "")
return `4${str}`
} else if (str.includes('五')) {
str = str.replace("五", "")
return `5${str}`
} else if (str.includes('六')) {
str = str.replace("六", "")
return `6${str}`
} else if (str.includes('七')) {
str = str.replace("七", "")
return `7${str}`
} else if (str.includes('八')) {
str = str.replace("八", "")
return `8${str}`
} else if (str.includes('九')) {
str = str.replace("九", "")
return `9${str}`
} else {
return str
}
}
//正则校验 是否包含阿拉伯数字
isHasNumber(str: string): boolean {
let reg = /\d/;
return reg.test(str)
}
}

8
src/app/pages/home-page/home-page.component.ts

@ -410,7 +410,7 @@ export class HomePageComponent implements OnInit {
color: '#fff'
},
active: {
fontSize: document.documentElement.clientHeight < 750 ? 12 : 14,
fontSize: document.documentElement.clientHeight < 750 ? 12 : 14,
color: '#fff',
fontFamily: 'Microsoft YaHei',
},
@ -655,9 +655,9 @@ export class HomePageComponent implements OnInit {
isOpenModel: boolean = false
look(item) {
console.log(item)
// console.log(item)
if (item.notification.data.eventSystemName == '灭火器维护' || item.notification.data.eventSystemName == '证照预警') {
this.message.create('warning', `证照或者器材即将临期,请联系加油站处理!`);
this.message.create('warning', item.notification.data.desc);
} else {
this.isOpenModel = true
let data = {
@ -668,7 +668,7 @@ export class HomePageComponent implements OnInit {
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight<650 || document.documentElement.clientWidth<1400) ? 1000 : 1200,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',

32
src/app/pages/home/home.component.ts

@ -106,20 +106,21 @@ export class HomeComponent implements OnInit {
modalData
look(item) {
if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') {
this.message.create('warning', `证照或者器材即将临期,请联系加油站处理!`);
} else {
let params = {
id: item.notification.entityId
}
this.http.get('/api/services/app/ViolateRecord/Get', {
params: params
}).subscribe((data: any) => {
let params = {
id: item.notification.entityId
}
this.http.get('/api/services/app/ViolateRecord/Get', {
params: params
}).subscribe((data: any) => {
// console.log(data)
if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') {
this.message.create('warning', data.result.desc);
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight<650 || document.documentElement.clientWidth<1400) ? 1000 : 1200,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
nzBodyStyle: {
'border': '1px solid #6d9cc7',
'border-radius': '0px',
@ -142,10 +143,9 @@ export class HomeComponent implements OnInit {
}
})
this.readMess(item.notification.id)
})
}
}
})
}
//标记为已读
@ -266,7 +266,7 @@ export class HomeComponent implements OnInit {
//修改密码
changePassword() {
const modal:any = this.modal.create({
const modal: any = this.modal.create({
nzTitle: '修改密码',
nzContent: ChangePasswordComponent,
nzViewContainerRef: this.viewContainerRef,
@ -278,7 +278,7 @@ export class HomeComponent implements OnInit {
this.message.create('warning', '两次密码输入不一致!');
return false
} else {
await new Promise((resolve,reject) => {
await new Promise((resolve, reject) => {
let body = {
currentPassword: instance.validateForm.value.oldpassword,
newPassword: instance.validateForm.value.newpassword
@ -287,7 +287,7 @@ export class HomeComponent implements OnInit {
resolve(data)
this.message.create('success', '修改成功!');
return true
},err=>{
}, err => {
this.message.create('warning', err.error.error.message);
modal.config.nzOkLoading = false
return false

6
src/app/pages/left-domain/left-domain.component.html

@ -47,7 +47,7 @@
<!-- 基本信息 -->
<!-- 加油机 -->
<div class="publicBox refueller" *ngIf="beforeFence === 1">
<div class="interval" *ngFor="let item of FacilityList" (click)="selectFacility($event, item)" [ngClass]="{'selectFacility': selectFacilityId === item.getID()}">
<div class="interval" *ngFor="let item of FacilityList | facilitySort" (click)="selectFacility($event, item)" [ngClass]="{'selectFacility': selectFacilityId === item.getID()}">
<p class="title"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().name" (click)="stopBubbling($event)"></p>
<div class="table">
<div class="tableHeader">
@ -73,14 +73,13 @@
<!-- 加油机 -->
<!-- 油罐设备 -->
<div class="publicBox refueller" *ngIf="beforeFence === 2">
<div class="interval" *ngFor="let item of FacilityList" (click)="selectFacility($event, item)" [ngClass]="{'selectFacility': selectFacilityId === item.getID()}">
<div class="interval" *ngFor="let item of FacilityList | facilitySort" (click)="selectFacility($event, item)" [ngClass]="{'selectFacility': selectFacilityId === item.getID()}">
<p class="title"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().name" (click)="stopBubbling($event)"></p>
<div class="table">
<div class="tableHeader">
<p>油品品号</p>
<p>油罐容积</p>
<p>安全容积</p>
<p>数量</p>
<p>罐区</p>
<p>油罐类型</p>
</div>
@ -88,7 +87,6 @@
<p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
<p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilTankVolume" (click)="stopBubbling($event)"></p>
<p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().safeVolume" (click)="stopBubbling($event)"></p>
<p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().quantity" (click)="stopBubbling($event)"></p>
<p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().tankFarm" (click)="stopBubbling($event)"></p>
<p style="padding-left: 8px;" (click)="stopBubbling($event)">
<nz-select class="tableSelect" [nzBorderless]="true" [nzDisabled]="!editMode" [(ngModel)]="item.getPropertyData().oilTankType">

10
src/app/pages/left-domain/left-domain.component.ts

@ -130,7 +130,6 @@ export class LeftDomainComponent implements OnInit {
}
PlanComponent.instance.isShowLoading = true //打开遮罩
let institutionKey = `${PlanComponent.instance.companyData.id}` || "ceshi"; //单位id
console.log(PlanComponent.instance.buildingUIItems, PlanComponent.instance.beforeOneBuildingID);
let buildingKey = PlanComponent.instance.buildingUIItems.find(item => { return item.getBuildingID() == PlanComponent.instance.beforeOneBuildingID })
let url = DataManager.getResPath_facilityProperty(institutionKey, buildingKey ? buildingKey.getBuildingID() : "building", item.getType(), item.getID(), null)
ServeManager.instance.openFileSelect(file, url, (name: string, path: string) => { //上传
@ -207,12 +206,17 @@ export class LeftDomainComponent implements OnInit {
}
//获取设备 数量
getFacilityNum(type: string): number {
getFacilityNum(type: string): string {
let num = 0
this.FacilityList.forEach(item => {
item.getType().includes(type) ? num = num + 1 : null
})
return num
let unit = type === 'XF_MHQ'? '具' : ConfigManager.getFacilityNumUnit(FacilityType[type])
let facilityNum = `${num}${unit}`
if (type === FacilityType.XF_XFS) {
facilityNum = `${num*2}${unit}`
}
return facilityNum
}
//点击tree节点

3
src/app/pages/pages.module.ts

@ -54,11 +54,12 @@ import { OilUnloadingProcessComponent } from './oil-unloading-process/oil-unload
import { HomePageComponent } from './home-page/home-page.component';
import { OilUnloadingProcessListComponent } from './oil-unloading-process-list/oil-unloading-process-list.component';
import { ChangePasswordComponent } from './change-password/change-password.component';
import { FacilitySortPipe } from './facility-sort.pipe';
@NgModule({
declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent],
AddequipmentComponent, EditequipmentComponent,PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe],
imports: [

2
src/app/pages/today-warning-admin/today-warning-admin.component.ts

@ -162,7 +162,7 @@ export class TodayWarningAdminComponent implements OnInit {
isVisible=false
look(item) {
if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
this.message.create('warning', `证照或者器材即将临期,请联系加油站处理!`);
this.message.create('warning', item.desc);
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,

3
src/app/pages/today-warning/today-warning.component.ts

@ -113,8 +113,9 @@ export class TodayWarningComponent implements OnInit {
look(item) {
console.log(item)
if (item.violation.eventSystemName == '灭火器维护' || item.violation.eventSystemName == '证照预警') {
this.message.create('warning', `证照或者器材即将临期,请联系加油站处理!`);
this.message.create('warning', item.desc);
} else {
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,

Loading…
Cancel
Save