diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts index 5ffcafb..530fb25 100644 --- a/src/app/pages/equipment-info/equipment-info.component.ts +++ b/src/app/pages/equipment-info/equipment-info.component.ts @@ -162,6 +162,6 @@ export class EquipmentInfoComponent implements OnInit { } goback() { - this.router.navigate(['/warning/petrolStation']) + this.router.navigate(['/todaywarning/petrolStation']) } } diff --git a/src/app/pages/home-page/home-page.component.html b/src/app/pages/home-page/home-page.component.html index b8b9950..eb5a26f 100644 --- a/src/app/pages/home-page/home-page.component.html +++ b/src/app/pages/home-page/home-page.component.html @@ -198,14 +198,14 @@
- {{HomeAggregatioData.dev.cameraCount}} + {{HomeAggregatioData.licenseViolationCount}} 证照预警数量
- {{HomeAggregatioData.dev.cameraCount}} + {{HomeAggregatioData.deviceViolationCount}} 消防设备预警数量
diff --git a/src/app/pages/home-page/home-page.component.scss b/src/app/pages/home-page/home-page.component.scss index 6ddc412..6e31fa8 100644 --- a/src/app/pages/home-page/home-page.component.scss +++ b/src/app/pages/home-page/home-page.component.scss @@ -417,6 +417,9 @@ span { color: white; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .lightspan { @@ -1214,7 +1217,7 @@ padding: 8px 0; .numlistbox { - height:40px; + height: 40px; width: 80%; display: flex; align-items: center; diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts index 2076807..db26b09 100644 --- a/src/app/pages/home-page/home-page.component.ts +++ b/src/app/pages/home-page/home-page.component.ts @@ -376,7 +376,7 @@ export class HomePageComponent implements OnInit { left: '40px', right: '30px', bottom: '38px', - top: '26px' + top: '36px' } }; @@ -452,7 +452,9 @@ export class HomePageComponent implements OnInit { stationCount: '', violationCount: '', cameraCount: '' - } + }, + deviceViolationCount: '', + licenseViolationCount: '' } totalCount isSpin: boolean = false @@ -477,7 +479,7 @@ export class HomePageComponent implements OnInit { { name: '摄像头数量', value: data.result.dev.cameraCount }, { name: '预警模型数量', value: data.result.dev.violationCount } ] - // console.log('图表信息', data.result) + console.log('图表信息', data.result) this.isSpin = false this.eventEcharts(data.result) }) diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts index afdcf92..6aaddf3 100644 --- a/src/app/pages/login/login.component.ts +++ b/src/app/pages/login/login.component.ts @@ -123,7 +123,7 @@ export class LoginComponent implements OnInit { } else { if (data.result.user.organization.isGasStation) { sessionStorage.setItem("isGasStation", 'true'); - this.router.navigate(['/warning/petrolStation']) + this.router.navigate(['/todaywarning/petrolStation']) this.message.create('success', `登录成功`); } else { sessionStorage.setItem("isGasStation", 'false'); 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 0abc44e..189b9a6 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 @@ -316,15 +316,15 @@ -
+
- + - + @@ -332,42 +332,45 @@
- + - +
-
- +
- +
+
+ - + + + + + + + +
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 6fb5f0c..a2d0f00 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 @@ -92,7 +92,7 @@ tr, td { - height: 138px; + height: 155px; } .imgbox { @@ -167,9 +167,8 @@ .timeDivflex2 { align-items: center; - nz-form-item { - width: 36%; + width: 30%; margin-right: 9px; } } 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 4c46d4f..e052c8f 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 @@ -94,9 +94,9 @@ export class OilStationInfoComponent implements OnInit { } if (this.httpBody.licenses.length == 0) { this.httpBody.licenses = [ - { name: '营业执照', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', type: 1, hasAnnualInspection: true }, - { name: '危险化学品', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', type: 3, hasAnnualInspection: false }, - { name: '成品油零售', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', type: 2, hasAnnualInspection: true } + { name: '营业执照', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true }, + { name: '危险化学品', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false }, + { name: '成品油零售', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true } ] } this.httpBody.stationType ? this.httpBody.stationType = String(this.httpBody.stationType) : null @@ -193,7 +193,7 @@ export class OilStationInfoComponent implements OnInit { handleOk(): void { this.isVisible = false; - if(this.addName){ + if (this.addName) { this.addTr() } } @@ -204,15 +204,15 @@ export class OilStationInfoComponent implements OnInit { } addTr() { this.httpBody.licenses.push( - { name: this.addName, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', type: -1, hasAnnualInspection: false }, + { name: this.addName, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false }, ) } - deleteTrConfirm(key){ + deleteTrConfirm(key) { console.log(key) - this.httpBody.licenses.splice(key, 1); + this.httpBody.licenses.splice(key, 1); } goback() { - this.router.navigate(['/warning/petrolStation']) + this.router.navigate(['/todaywarning/petrolStation']) } submitForm() { diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts index 60ed44e..641d9a6 100644 --- a/src/app/pages/plan-admin/plan-admin.component.ts +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -113,7 +113,7 @@ export class PlanAdminComponent implements OnInit { } } sessionStorage.setItem('userdataOfgasstation', JSON.stringify(gastionobj)) - this.router.navigate(['/warning/petrolStation']) + this.router.navigate(['/todaywarning/petrolStation']) let obj = { name: 'oilstation' }