From 08052c1cd4c8cf02a810debbf09fc83b171d3fac Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 14 Dec 2021 10:53:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84=E6=B2=B9?= =?UTF-8?q?=E7=AB=99=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2+=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/home/home.component.html | 8 +-- .../oil-station-info.component.html | 68 ++++++++++++++++-- .../oil-station-info.component.scss | 15 +++- .../oil-station-info.component.ts | 43 +++++++++-- src/assets/images/goback.png | Bin 0 -> 1774 bytes 5 files changed, 116 insertions(+), 18 deletions(-) create mode 100644 src/assets/images/goback.png 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 0000000000000000000000000000000000000000..dbb838f7c239e8d622196b6d066c7878d4635f73 GIT binary patch literal 1774 zcmVI&OGew`vHai;lSk% zbIzUfx!?0U-{0>ic#VC;YmA2-0@>bkw*NZI{zVLa-O;;l1IUX10ZjE?q<*ruW__x^ z_R0Q??&!|IwgA)znL-?!M9j}3TKjrHQLT3mo7n1`u;cUC>0?+Npo0_JhuQ?F2U7OEC1Hj&i;bw!~< ziSh+1)yUlMEvGVUYRJomJl5oU67t3{SlzwW*3?=D=oOgrpmu>WDZb6|t-;6QD}l-_ zQg~QTVXQ`*6fFgryG#|m0QsI-%nX>VszkXC%Hy66B;;6xmo#-b%^0x{WJ$ILvkv0BT4tQGYs#OZygpoW(= z31mQM1ZAbDpcxU0s)h2@ZG7b26MV|W&;$SAyAPe`Zy1)Wq%EK$p+ioTLtF?*7IV`5 zyU|fdK64b)b+I)9eie{Y=ZQJIiPzyTvvXzV&%cxR}8bj?z@8`rD$2c-LWj}s` zQ@_8!c?V(*EfkAN&@z^`hEC|Ql%*u4kc1AJYtcs^!PM8Vh9RI{ARq3l6Llz*i<@Z6s+@%Ki|oG>f^i&z$|pd}PbHYajW zm*&VOu8?h}1vCkscRha5QuI73+AwN!cE4jElP7NG8>0pGZ`*j@o*p1xh zOG=x;43D3i=Xc*f%Y)X^lnx9QwWe)SqM$=scsp4)$m_zzRQIzcP_0G5`h-?6f?@2Z zALNfxP~HyAVD9rR9=-Qb?l+dE=h2J>i?U6ps)-xpq_dE7+y!~hIM-DujVUFDs`ME9 z!dv*{TX*v%PZ90}>Rf|go;t^`9F&Bs*0AVQss?b-TxOp--vmk3+1uk3p!Do1jrt{8@)Er&?!?dQOwJf z2HWON*}-c#^zlP{wHomHVW?)zmCJ2jjC10N5%$#zjQf(p@SLY!=7FD|=Rs*{rVdEc zjs>wFkv?{rd=N*=eW-5bQIO%gP>YudTpVdA+nikrMvbI4R$<>~4{^_E$PI%9Pha4n z#~b|1LT)YjXc7O|A#R_jaCk7Mo$}=O&hix@xazDR)3lR_i1}_D>A~?|?bIMnpXxca z^CIOD22jonRpEjhMueeq*Ufx+Z;4yof)BsI56-;EGgz#USYfe7U_X2@lVhQ-9v*;OHGKze)@UGMwR>Ri?@Ib1Gtu{5FxIx%5bCd?DcE^QzP1r+bR zkw24`YG%@2F0=a+d zWqY@Em&Q<~Q9K8gq!e7H&!DJ03NG7AP*x6|)C};uYDnS6Y!B*-Z{ufy;^0pn=Ozr1 zSEOS)#9f2DNOqic73%N!5L9Cl8HRZL8=oq^i3mcApM@xyq6n6sIja#;pfo6Vccbq+ zz~KWUeEk=*+@Uo|K@cYqNl+tAo9JFp_lmgnE5;Rdkt0p<&;(R7qyy9ef+iF_Ov}fVU&1U*tSoO=IrV1#`${|HX1bp2{PgNZbI>L^ z;5Sqd(SLe??wLXdd#QzWok{gFcIM>jLTw8Qtpr`swXPiQH<5!Lj`xC7bTG|
    营业执照 @@ -316,6 +317,25 @@ +
    + + + + + + + *提前预警时间天数： + + + + + + + + 天 +