From 98b5791895595777a2ca353d19985746c30a5ecf Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 25 Nov 2021 09:56:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/system-management/push/push.component.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/app/system-management/push/push.component.ts b/src/app/system-management/push/push.component.ts index 6f09bcc..944b28f 100644 --- a/src/app/system-management/push/push.component.ts +++ b/src/app/system-management/push/push.component.ts @@ -121,5 +121,14 @@ export class PushComponent implements OnInit { this.validateForm.controls[i].markAsDirty(); this.validateForm.controls[i].updateValueAndValidity(); } + + if(this.validateForm.value.search){ + this.list = this.list.filter((item)=>{ + return item.violationType.indexOf(this.validateForm.value.search) != -1 + }) + }else{ + this.getViolation() + } + } } From e2eee64cb5f069cc44f7f388b7332958b93fd42c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 25 Nov 2021 11:42:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=8E=9F=E5=9E=8B=E5=9B=BE=E4=BF=AE=E6=94=B9=E6=9C=80=E6=96=B0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.html | 109 +++++++++--------- .../criminal-records-admin.component.scss | 36 +++--- .../criminal-records-admin.component.ts | 13 ++- .../criminal-records.component.html | 109 +++++++++--------- .../criminal-records.component.scss | 33 +++--- .../criminal-records.component.ts | 13 ++- src/app/pages/home/home.component.html | 38 +++++- src/app/pages/home/home.component.scss | 41 ++++++- src/app/pages/home/home.component.ts | 107 ++++++++++++++++- .../today-warning-admin.component.html | 5 + .../today-warning-admin.component.scss | 51 ++++---- .../today-warning.component.html | 5 + .../today-warning.component.scss | 26 +++++ src/assets/images/fullscreen.png | Bin 0 -> 1648 bytes src/assets/images/navbg.png | Bin 22586 -> 41053 bytes 15 files changed, 401 insertions(+), 185 deletions(-) create mode 100644 src/assets/images/fullscreen.png diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index bc2075d..03256b2 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -1,64 +1,65 @@
-
- -
+
+ +
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss index 4f9b0d3..2d24701 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.scss @@ -10,7 +10,7 @@ padding: 0 36px; width: 100%; height: 32px; - margin-top: 14px; + margin-bottom: 16px; form { width: 100%; @@ -65,20 +65,21 @@ width: 100%; display: flex; justify-content: center; - + .chartname{ + position: absolute; + left: 20px; + top: 12px; + } .chart { width: 97%; - height: 360px; - border: 0px; - box-shadow: 0 0 26px 0px #1a7fd7 inset; + height: 350px; box-sizing: border-box; - padding: 18px 26px; + padding: 0 10px; display: flex; div { display: flex; flex-direction: column; - span { font-family: titlefont; display: flex; @@ -91,22 +92,18 @@ div { flex: 1; } - - .piechart {} - - .barchart { - // border: 1px solid rgba(145, 204, 255, 0.95); - } + } - .leftbox { width: 360px; position: relative; - + border: 0px; + box-shadow: 0 0 26px 0px #1a7fd7 inset; + margin-right: 16px; .centerContent { position: absolute; top: 42%; - left: 11%; + left: 26%; width: 170px; div { @@ -132,11 +129,12 @@ .rightbox { flex: 1; position: relative; - + border: 0px; + box-shadow: 0 0 26px 0px #1a7fd7 inset; .btnbox { position: absolute; - right: 5px; - top: 5px; + right: 28px; + top: 12px; display: flex; flex-direction: row; z-index: 999; diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts index 901ff44..d76adf5 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts @@ -30,8 +30,9 @@ export class CriminalRecordsAdminComponent implements OnInit { { // name: 'Access From', type: 'pie', - radius: [85, 112],//内半径外，外半径 - left: '-30%', + radius: [88, 116],//内半径外，外半径 + left: '0', + top:'8%', avoidLabelOverlap: false,//防止标签重叠策略 label: {//每一个标签外网延伸的引导说明 show: false, @@ -142,10 +143,10 @@ export class CriminalRecordsAdminComponent implements OnInit { } ], grid: { - left: '36px', + left: '42px', right: '30px', - bottom: '50px', - top: '45px' + bottom: '38px', + top: '60px' } }; baroption2 = { @@ -245,7 +246,7 @@ export class CriminalRecordsAdminComponent implements OnInit { left: '150px', right: '80px', bottom: '3px', - top: '20px' + top: '36px' }, // dataZoom: [ //Y轴滑动条 // { diff --git a/src/app/pages/criminal-records/criminal-records.component.html b/src/app/pages/criminal-records/criminal-records.component.html index bf7d449..a10f121 100644 --- a/src/app/pages/criminal-records/criminal-records.component.html +++ b/src/app/pages/criminal-records/criminal-records.component.html @@ -1,64 +1,65 @@
-
- -
+
+ +
diff --git a/src/app/pages/criminal-records/criminal-records.component.scss b/src/app/pages/criminal-records/criminal-records.component.scss index 13599ab..3c005b1 100644 --- a/src/app/pages/criminal-records/criminal-records.component.scss +++ b/src/app/pages/criminal-records/criminal-records.component.scss @@ -10,7 +10,7 @@ padding: 0 36px; width: 100%; height: 32px; - margin-top: 14px; + margin-bottom: 16px; form { width: 100%; @@ -66,14 +66,16 @@ width: 100%; display: flex; justify-content: center; - + .chartname{ + position: absolute; + left: 20px; + top: 12px; + } .chart { width: 97%; - height: 360px; - border: 0px; - box-shadow: 0 0 26px 0px #1a7fd7 inset; + height: 350px; box-sizing: border-box; - padding: 18px 26px; + padding: 0 10px; display: flex; div { @@ -92,22 +94,18 @@ div { flex: 1; } - - .piechart {} - - .barchart { - // border: 1px solid rgba(145, 204, 255, 0.95); - } } .leftbox { width: 360px; position: relative; - + border: 0px; + box-shadow: 0 0 26px 0px #1a7fd7 inset; + margin-right: 16px; .centerContent { position: absolute; top: 42%; - left: 11%; + left: 26%; width: 170px; div { @@ -133,11 +131,12 @@ .rightbox { flex: 1; position: relative; - + border: 0px; + box-shadow: 0 0 26px 0px #1a7fd7 inset; .btnbox { position: absolute; - right: 5px; - top: 5px; + right: 28px; + top: 12px; display: flex; flex-direction: row; z-index: 999; diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts index 9cb605c..b9c18f2 100644 --- a/src/app/pages/criminal-records/criminal-records.component.ts +++ b/src/app/pages/criminal-records/criminal-records.component.ts @@ -26,8 +26,9 @@ export class CriminalRecordsComponent implements OnInit { { // name: 'Access From', type: 'pie', - radius: [85, 112],//内半径外，外半径 - left: '-30%', + radius: [88, 116],//内半径外，外半径 + left: '0', + top:'8%', avoidLabelOverlap: false,//防止标签重叠策略 label: {//每一个标签外网延伸的引导说明 show: false, @@ -139,10 +140,10 @@ export class CriminalRecordsComponent implements OnInit { } ], grid: { - left: '36px', + left: '42px', right: '30px', - bottom: '50px', - top: '45px' + bottom: '38px', + top: '60px' } }; baroption2 = { @@ -241,7 +242,7 @@ export class CriminalRecordsComponent implements OnInit { left: '150px', right: '80px', bottom: '3px', - top: '20px' + top: '36px' } } getThirtyDays() { diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index 6702563..5594d54 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -1,8 +1,11 @@
-
+
+
+ +
  • 数字油站
    • @@ -22,14 +25,41 @@
  • 预警记录
    • + + +
    + + + + + {{time}} + + + | + + {{surname}} + + + + +
      +
    • 基本信息
      • +
    • 器材信息
      • +
    • 系统管理
      • +
    • 退出系统
      • +
    +     +
    -
    +
    diff --git a/src/app/pages/home/home.component.scss b/src/app/pages/home/home.component.scss index b29e46d..9e5f1e5 100644 --- a/src/app/pages/home/home.component.scss +++ b/src/app/pages/home/home.component.scss @@ -8,6 +8,8 @@ flex-direction: column; } + + .menu { height: 56px; width: 100%; @@ -15,13 +17,13 @@ justify-content: center; font-size: 17px; background: url('../../../assets/images/navbg.png') no-repeat; - background-size: 100% 100%; + background-size: 100% 115%; position: relative; li { width: 10%; - height: 46px; - line-height: 46px; + height: 52px; + line-height: 52px; text-align: center; cursor: pointer; font-family: sybold; @@ -30,6 +32,35 @@ } +.boxleft { + position: absolute; + left: 24px; + top: 16px; + img{ + width: 154px; + } +} + +.boxright { + position: absolute; + right: 24px; + top: 12px; + display: flex; + align-items: center; + + span { + font-size: 16px; + color: #FFFFFF; + opacity: 0.6; + } + + img { + width: 36px; + height: 36px; + } +} + + .backbtn { position: absolute; right: 26px; @@ -80,5 +111,7 @@ } .router-link-active { - background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, #1c8199 50%, rgba(35, 153, 255, 0) 100%); + // background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, #1c8199 50%, rgba(35, 153, 255, 0) 100%); + + background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, #36A2FF 50%, rgba(35, 153, 255, 0) 100%); } diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 86b1181..16b76c5 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -3,6 +3,9 @@ import { Router, NavigationEnd, ActivatedRoute } from '@angular/router'; import { Title } from '@angular/platform-browser' import { filter } from 'rxjs/operators'; import { NavChangeService } from 'src/app/service/navChange.service'; +import { CacheTokenService } from '../../service/cache-token.service' //引入服务 +import { CookieService } from 'ngx-cookie-service'; +import { NzMessageService } from 'ng-zorro-antd/message'; @Component({ selector: 'app-home', templateUrl: './home.component.html', @@ -10,11 +13,16 @@ import { NavChangeService } from 'src/app/service/navChange.service'; }) export class HomeComponent implements OnInit { - constructor(private router: Router, private navChangeService: NavChangeService) { } + constructor(private router: Router, private navChangeService: NavChangeService, public token: CacheTokenService, + private cookieService: CookieService, private message: NzMessageService) { } isGasStationNav: boolean isGasStation: boolean isWarning: boolean = false//是否是今日预警页面 num + + surname: string + userName: string + // isGasStation: string ngOnInit(): void { this.navChangeService.getMessage().subscribe((message: any) => { @@ -42,8 +50,10 @@ export class HomeComponent implements OnInit { } if (sessionStorage.getItem('isGasStation') == 'true') { + this.isGasStation = true this.isGasStationNav = true } else { + this.isGasStation = false this.isGasStationNav = false } @@ -61,12 +71,107 @@ export class HomeComponent implements OnInit { this.isGasStation = false } }); + + setInterval(() => { + this.getTime() + }, 1000); + this.isGasStation = JSON.parse(sessionStorage.getItem('isGasStation')) + if (this.isGasStation) { + this.surname = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).name + this.userName = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).userName + } else { + this.surname = JSON.parse(sessionStorage.getItem('userdata')).name + this.userName = JSON.parse(sessionStorage.getItem('userdata')).userName + } } + //获得时间 + time: string + getTime() { + let myDate = new Date(); + let y = myDate.getFullYear(); + let M = myDate.getMonth() + 1; //获取当前月份(0-11,0代表1月) + let d = myDate.getDate(); //获取当前日(1-31) + let h = myDate.getHours(); //获取当前小时数(0-23) + let m = myDate.getMinutes(); //获取当前分钟数(0-59) + let s = myDate.getSeconds(); //获取当前秒数(0-59) + + //检查是否小于10 + M = check(M); + d = check(d); + h = check(h); + m = check(m); + s = check(s); + let timestr = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s; + this.time = timestr; + //时间数字小于10，则在之前加个“0”补位。 + function check(i) { + let num = (i < 10) ? ("0" + i) : i; + return num; + } + } + + //退出系统 + signOut() { + this.message.create('success', `退出成功`); + this.token.delete() + sessionStorage.clear() + // window.localStorage.clear() + + localStorage.removeItem("isautologin") + this.cookieService.set("token", '', new Date(new Date().getTime() + 1), '/'); + this.cookieService.set("refreshToken", '', new Date(new Date().getTime() + 1), '/'); + this.router.navigate(['/login']) + } + + navChange(router) { + this.router.navigate([router]) + } + goback() { this.router.navigate(['/plan']) this.isGasStationNav = false } + + //全屏 + isfullscreen: boolean = false; + fullscreenToggle() { + const docElmWithBrowsersFullScreenFunctions = document.documentElement as HTMLElement & { + mozRequestFullScreen(): Promise; + webkitRequestFullscreen(): Promise; + msRequestFullscreen(): Promise; + }; + + if (docElmWithBrowsersFullScreenFunctions.requestFullscreen) { + docElmWithBrowsersFullScreenFunctions.requestFullscreen(); + } else if (docElmWithBrowsersFullScreenFunctions.mozRequestFullScreen) { /* Firefox */ + docElmWithBrowsersFullScreenFunctions.mozRequestFullScreen(); + } else if (docElmWithBrowsersFullScreenFunctions.webkitRequestFullscreen) { /* Chrome, Safari and Opera */ + docElmWithBrowsersFullScreenFunctions.webkitRequestFullscreen(); + } else if (docElmWithBrowsersFullScreenFunctions.msRequestFullscreen) { /* IE/Edge */ + docElmWithBrowsersFullScreenFunctions.msRequestFullscreen(); + } + + this.isfullscreen = true; + + } + closefullscreen() { + const docWithBrowsersExitFunctions = document as Document & { + mozCancelFullScreen(): Promise; + webkitExitFullscreen(): Promise; + msExitFullscreen(): Promise; + }; + if (docWithBrowsersExitFunctions.exitFullscreen) { + docWithBrowsersExitFunctions.exitFullscreen(); + } else if (docWithBrowsersExitFunctions.mozCancelFullScreen) { /* Firefox */ + docWithBrowsersExitFunctions.mozCancelFullScreen(); + } else if (docWithBrowsersExitFunctions.webkitExitFullscreen) { /* Chrome, Safari and Opera */ + docWithBrowsersExitFunctions.webkitExitFullscreen(); + } else if (docWithBrowsersExitFunctions.msExitFullscreen) { /* IE/Edge */ + docWithBrowsersExitFunctions.msExitFullscreen(); + } + this.isfullscreen = false; + } } diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html index 521910f..28baa97 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.html +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html @@ -1,6 +1,11 @@
    +
    + + 今日预警 + {{totalCount}} +