diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 149c5ef..0f8f6b9 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -45,7 +45,7 @@ {{time}} - | + | {{surname}} @@ -60,10 +60,10 @@
  • 退出系统
    • + | + -
    - -
    +
    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 ca5f682..06e8773 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 @@ -8,7 +8,7 @@
    - + @@ -30,6 +30,7 @@ + @@ -47,7 +48,7 @@ - - + @@ -298,7 +299,7 @@
    所属组织机构站名 {{userdata.organization.displayName}}
    地址 + @@ -56,7 +57,7 @@ 营业执照有效期*
    区域
    - +
    @@ -338,6 +358,26 @@ +
    + + + + + + + *提前预警时间天数： + + + + + + + + 天 +
    + @@ -359,6 +399,24 @@ +
    + + + + + + + *提前预警时间天数： + + + + + + + + 天 +
    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 79910b3..7c42ccc 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 @@ -74,7 +74,9 @@ .text { width: 33%; } - + .text2 { + width: 83%; + } .organizations { text-align: left; color: #fff; @@ -98,8 +100,17 @@ padding: 0 16px; display: flex; align-items: center; + position: relative; + } + .timeDiv{ + position: absolute; + right: 10px; + top: 50%; + transform: translateY(-50%); + display: flex; + align-items: center; + justify-content: flex-end; } - .uploadDiv { margin-left: 16px; width: 120px; 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 8db1358..44ab02b 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 @@ -27,7 +27,7 @@ export class OilStationInfoComponent implements OnInit { oilStationType: [null], laneNumber: [null], address: [null], - validityTime: [null, [Validators.required]],//营业执照有效期 + // validityTime: [null, [Validators.required]],//营业执照有效期 locationName: [null], companyName: [null], leaderName: [null], @@ -54,6 +54,14 @@ export class OilStationInfoComponent implements OnInit { address: [null], distance: [null], contactInformation: [null] + }), + validityTime: this.fb.group({ + businessLicensevalidityTime: [null], + businessLicensevalidityTimeDay: [null, [Validators.required]], + hazardousLicensevalidityTime: [null], + hazardousLicensevalidityTimeDay: [null, [Validators.required]], + oilLicensevalidityTime: [null], + oilLicensevalidityTimeDay: [null, [Validators.required]] }) }); @@ -65,7 +73,9 @@ export class OilStationInfoComponent implements OnInit { validityTime: any = []//营业执照有效期 - + businessLicensevalidityTime: any = []//营业执照有效期 + hazardousLicensevalidityTime: any = []//危化品有效期 + oilLicensevalidityTime: any = []//成品油有效期 //获取油站信息 gallery getInfo() { @@ -83,9 +93,15 @@ export class OilStationInfoComponent implements OnInit { this.hospital = data.result.govUnitDetail.hospital this.fireBrigade = data.result.govUnitDetail.fireBrigade this.httpBody.stationType = String(this.httpBody.stationType) - this.validityTime[0] = data.result.validityStartTime - this.validityTime[1] = data.result.validityEndTime - this.validityTime = [...this.validityTime] + this.businessLicensevalidityTime[0] = data.result.validityStartTime + this.businessLicensevalidityTime[1] = data.result.validityEndTime + this.businessLicensevalidityTime = [...this.businessLicensevalidityTime] + this.hazardousLicensevalidityTime[0] = data.result.dangerousStartTime + this.hazardousLicensevalidityTime[1] = data.result.dangerousEndTime + this.hazardousLicensevalidityTime = [...this.hazardousLicensevalidityTime] + this.oilLicensevalidityTime[0] = data.result.sellLicenseStartTime + this.oilLicensevalidityTime[1] = data.result.sellLicenseEndTime + this.oilLicensevalidityTime = [...this.oilLicensevalidityTime] } else { this.httpBody.id = data.result.id } @@ -128,6 +144,13 @@ export class OilStationInfoComponent implements OnInit { organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id, validityStartTime: '', validityEndTime: '', + dangerousStartTime: '', + dangerousEndTime: '', + sellLicenseStartTime: '', + sellLicenseEndTime: '', + validityTermDays: null, + dangerousTermDays: null, + sellLicenseTermDays: null, openTime: '', stationType: '', laneCount: '', @@ -160,8 +183,14 @@ export class OilStationInfoComponent implements OnInit { if (this.validateForm.valid) { this.isLoadingSave = true this.httpBody.openTime = moment(this.httpBody.openTime).format('YYYY-MM-MM')//开业时间格式化 - this.httpBody.validityStartTime = moment(this.validityTime[0]).format('YYYY-MM-MM')//开业时间格式化 - this.httpBody.validityEndTime = moment(this.validityTime[1]).format('YYYY-MM-MM')//开业时间格式化 + + this.httpBody.validityStartTime = moment(this.businessLicensevalidityTime[0]).format('YYYY-MM-MM')// + this.httpBody.validityEndTime = moment(this.businessLicensevalidityTime[1]).format('YYYY-MM-MM')// + this.httpBody.dangerousStartTime = moment(this.hazardousLicensevalidityTime[0]).format('YYYY-MM-MM')// + this.httpBody.dangerousEndTime = moment(this.hazardousLicensevalidityTime[1]).format('YYYY-MM-MM')// + this.httpBody.sellLicenseStartTime = moment(this.oilLicensevalidityTime[0]).format('YYYY-MM-MM')// + this.httpBody.sellLicenseEndTime = moment(this.oilLicensevalidityTime[1]).format('YYYY-MM-MM')// + this.httpBody.govUnitDetail.policeStation = this.validateForm.value.policeStation this.httpBody.govUnitDetail.hospital = this.validateForm.value.hospital this.httpBody.govUnitDetail.fireBrigade = this.validateForm.value.fireBrigade diff --git a/src/assets/images/goback.png b/src/assets/images/goback.png new file mode 100644 index 0000000..dbb838f Binary files /dev/null and b/src/assets/images/goback.png differ
    营业执照 @@ -316,6 +317,25 @@ +
    + + + + + + + *提前预警时间天数： + + + + + + + + 天 +