diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html index 7261383..4d88e13 100644 --- a/src/app/pages/equipment-info/equipment-info.component.html +++ b/src/app/pages/equipment-info/equipment-info.component.html @@ -80,4 +80,7 @@ +
+ +
diff --git a/src/app/pages/equipment-info/equipment-info.component.scss b/src/app/pages/equipment-info/equipment-info.component.scss index 7d58fc2..1bf72e0 100644 --- a/src/app/pages/equipment-info/equipment-info.component.scss +++ b/src/app/pages/equipment-info/equipment-info.component.scss @@ -3,6 +3,7 @@ height: 100%; display: flex; justify-content: center; + position: relative; } .content { @@ -115,3 +116,19 @@ } } + + +.backbtn { + position: absolute; + right: 66px; + top: 22px; + + button { + width: 64px; + height: 32px; + background: rgba(0, 129, 255, 0.3); + border: 1px solid #36A2FF; + border-radius: 0px; + color: #91CCFF; + } +} \ No newline at end of file diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts index c62f119..7d4cf02 100644 --- a/src/app/pages/equipment-info/equipment-info.component.ts +++ b/src/app/pages/equipment-info/equipment-info.component.ts @@ -5,6 +5,7 @@ import { NzMessageService } from 'ng-zorro-antd/message'; import { AddequipmentComponent } from './addequipment/addequipment.component'; import { HttpClient } from '@angular/common/http'; import { EditequipmentComponent } from './editequipment/editequipment.component'; +import { Router, ActivatedRoute } from '@angular/router' @Component({ selector: 'app-equipment-info', templateUrl: './equipment-info.component.html', @@ -12,7 +13,7 @@ import { EditequipmentComponent } from './editequipment/editequipment.component' }) export class EquipmentInfoComponent implements OnInit { validateForm!: FormGroup; - constructor(private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { } + constructor(private router: Router,private fb: FormBuilder, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { } arr = [] ngOnInit(): void { this.validateForm = this.fb.group({ @@ -159,4 +160,8 @@ export class EquipmentInfoComponent implements OnInit { } }); } + + goback(){ + this.router.navigate(['/warning/petrolStation']) + } } diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 5594d54..46dc0cf 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -52,14 +52,9 @@ -
+
-
diff --git a/src/app/pages/home/home.component.scss b/src/app/pages/home/home.component.scss index 9e5f1e5..7b1a7bc 100644 --- a/src/app/pages/home/home.component.scss +++ b/src/app/pages/home/home.component.scss @@ -63,7 +63,7 @@ .backbtn { position: absolute; - right: 26px; + left: 205px; bottom: 6px; button { diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 16b76c5..499ef6a 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -17,12 +17,11 @@ export class HomeComponent implements OnInit { private cookieService: CookieService, private message: NzMessageService) { } isGasStationNav: boolean isGasStation: boolean - isWarning: boolean = false//是否是今日预警页面 + isGasStationBack: boolean num surname: string userName: string - // isGasStation: string ngOnInit(): void { this.navChangeService.getMessage().subscribe((message: any) => { @@ -30,25 +29,21 @@ export class HomeComponent implements OnInit { if (message.name == 'oilstation') { this.isGasStationNav = true } - if (message.name == '改变数量') { - this.isWarning = true - this.num = message.num - } }); - if (this.router.url.indexOf('warning') != -1) { - this.isWarning = true - } else { - this.isWarning = false - } - if (this.router.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'false') {//控制返回按钮显示 - this.isGasStation = true + this.isGasStationBack = true } else { - this.isGasStation = false + this.isGasStationBack = false } + // if (this.router.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'true') { + // this.isGasStation = true + // } else { + // this.isGasStation = false + // } + if (sessionStorage.getItem('isGasStation') == 'true') { this.isGasStation = true this.isGasStationNav = true @@ -60,15 +55,10 @@ export class HomeComponent implements OnInit { this.router.events.pipe( filter(event => event instanceof NavigationEnd) ).subscribe((event: any) => { - if (event.url.indexOf('warning') != -1) {//控制今日预警左上角数字显示 - - } else { - this.isWarning = false - } if (event.url.indexOf('petrolStation') != -1 && sessionStorage.getItem('isGasStation') == 'false') {//控制返回按钮显示 - this.isGasStation = true + this.isGasStationBack = true } else { - this.isGasStation = false + this.isGasStationBack = 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 816d689..441c74f 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 @@ -139,7 +139,8 @@ - + @@ -371,4 +372,7 @@
+
+ +
\ No newline at end of file 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 0964eb4..79910b3 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 @@ -3,6 +3,7 @@ height: 100%; display: flex; justify-content: center; + position: relative; } ::-webkit-scrollbar { @@ -149,10 +150,12 @@ border-radius: 0px; color: #91CCFF; } + button:nth-child(1) { width: 100px; margin-left: 16px; } + button:nth-child(2) { width: 130px; margin-left: 16px; @@ -160,3 +163,18 @@ } } } + +.backbtn { + position: absolute; + right: 66px; + top: 22px; + + button { + width: 64px; + height: 32px; + background: rgba(0, 129, 255, 0.3); + border: 1px solid #36A2FF; + border-radius: 0px; + color: #91CCFF; + } +} 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 98d8c61..8db1358 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 @@ -5,6 +5,7 @@ import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service'; import { NzMessageService } from 'ng-zorro-antd/message'; import * as moment from 'moment'; import Viewer from 'viewerjs'; +import { Router, ActivatedRoute } from '@angular/router' @Component({ selector: 'app-oil-station-info', templateUrl: './oil-station-info.component.html', @@ -12,7 +13,7 @@ import Viewer from 'viewerjs'; }) export class OilStationInfoComponent implements OnInit { validateForm!: FormGroup; - constructor(private fb: FormBuilder, private objectsSrv: ObjectsSimpleService, private http: HttpClient, private message: NzMessageService) { } + constructor(private router: Router, private fb: FormBuilder, private objectsSrv: ObjectsSimpleService, private http: HttpClient, private message: NzMessageService) { } userdata: any @@ -148,7 +149,9 @@ export class OilStationInfoComponent implements OnInit { dangerousChemicalLicenseImage: '', gasSellLicenseImage: '' } - + goback() { + this.router.navigate(['/warning/petrolStation']) + } submitForm() { diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html index 8d11460..76addb9 100644 --- a/src/app/pages/today-warning/today-warning.component.html +++ b/src/app/pages/today-warning/today-warning.component.html @@ -111,7 +111,10 @@ {{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
- + + + + 已处置
diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss index cc102d1..1707ad9 100644 --- a/src/app/pages/today-warning/today-warning.component.scss +++ b/src/app/pages/today-warning/today-warning.component.scss @@ -87,7 +87,8 @@ color: #91CCFF; margin-bottom: 12px; background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); - + box-sizing: border-box; + padding-right: 36px; div { font-size: 15px; text-align: center; @@ -103,6 +104,8 @@ } } } - + .dispositioned{ + color: #23D9FF; + } } } diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts index 32b412e..e4c0bfe 100644 --- a/src/app/pages/today-warning/today-warning.component.ts +++ b/src/app/pages/today-warning/today-warning.component.ts @@ -128,4 +128,8 @@ export class TodayWarningComponent implements OnInit { }); const instance = modal.getContentComponent(); } + + disposition(item){ + + } }