diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.html b/src/app/pages/audit/gas-base-info/gas-base-info.component.html
index 11a6ee9..17c248f 100644
--- a/src/app/pages/audit/gas-base-info/gas-base-info.component.html
+++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.html
@@ -154,7 +154,7 @@
-
+
diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.ts b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
index d5ecea4..7dbb9f1 100644
--- a/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
+++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
@@ -12,6 +12,7 @@ export class GasBaseInfoComponent implements OnInit {
constructor(private modal: NzModalRef, private http: HttpClient) { }
@Input() data?: any;
+ @Input() url?: any;
isDetails: boolean = false; //是否是详情
ngOnInit(): void {
@@ -27,8 +28,11 @@ export class GasBaseInfoComponent implements OnInit {
otherData
getBaseInfo() {
- let params = { organizationUnitId: this.data.organizationId }
- this.http.get('/api/services/app/GasStation/Get', { params }).subscribe((data: any) => {
+ let params
+ let httpUrl
+ this.url ? httpUrl = this.url : httpUrl = '/api/services/app/GasStation/Get'
+ this.url ? params = { orgId: this.data.organizationId } : params = { organizationUnitId: this.data.organizationId }
+ this.http.get(httpUrl, { params }).subscribe((data: any) => {
data.result.govUnitDetail ? data.result.govUnitDetail = JSON.parse(data.result.govUnitDetail) : null;
this.baseInfo = data.result
this.baseInfo.otherData ? this.otherData = JSON.parse(this.baseInfo.otherData) : null
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
index dd807d1..f0e04e7 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.html
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -84,7 +84,7 @@
-
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.scss b/src/app/pages/oil-station-info/oil-station-info.component.scss
index 997ab9e..a48d5b6 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.scss
+++ b/src/app/pages/oil-station-info/oil-station-info.component.scss
@@ -45,7 +45,7 @@
tr {
td {
- height: 40px;
+ min-height: 40px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
index feac988..321d38b 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.ts
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -28,7 +28,7 @@ export class OilStationInfoComponent implements OnInit {
laneNumber: [null],
address: [null],
locationName: [null],
- companyName: [null],
+ companyName: [null, [Validators.required]],
leaderName: [null],
leaderContact: [null],
stationLevel: [null],
@@ -184,10 +184,10 @@ export class OilStationInfoComponent implements OnInit {
{ name: '', connectTanker: '', connectOilTank: '', designPaper: '' }
],
oilVaporRecovery: [
- { name: '', onceSystemType: '', twiceSystemType: 0, twicePumpType: '', thriceProcessingUnit: '', monitoringDevice: '', designPaper: '' }
+ { name: '油气回收管线', onceSystemType: '将卸油时产生的油气进行回收', twiceSystemType: 1, twicePumpType: 'mini9000', thriceProcessingUnit: '冷凝+吸附', monitoringDevice: '监测气液比、密闭性,出现异常可及时预警', designPaper: '' }
],
valve: [
- { name: '', description: '' }
+ { name: 'P/V阀(机械呼吸阀)', description: '阀内设计双向开启功能,阀门处于常闭状态,当油罐压力/真空达到阀门预设压力/真空值时,阀门自行打开进行排气/吸气,以维持油罐内压力与大气压保持平衡。' }
]
}
diff --git a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts
index 44a2fba..3a302ee 100644
--- a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts
+++ b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.ts
@@ -104,7 +104,8 @@ export class OilStationListComponent implements OnInit {
'top': '50px',
},
nzComponentParams: {
- data: { organizationId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id }
+ data: { organizationId: (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization.id },
+ url: '/api/services/app/GasStation/GetAuditted'
},
nzFooter: null,
nzClosable: false,