From 8ae11de2d6bf0abfb59a5a24f7db63d38fa7a3c3 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 27 Jun 2022 15:28:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E8=AF=81=E7=85=A7?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../criminal-records-admin.component.ts | 7 ++++- .../warning-statistics-list.component.ts | 28 ++++++++----------- .../today-warning-admin.component.html | 6 ++-- .../get-out-of-line-details.component.ts | 3 ++ .../today-warning.component.html | 6 ++-- 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts index 51f0175..7c3eba7 100644 --- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts @@ -293,7 +293,7 @@ export class CriminalRecordsAdminComponent implements OnInit { tableScrollHeight resizeListener isShowEchartsListener - + ngOnInit(): void { console.log(this.isShowEchartsListener) @@ -628,6 +628,11 @@ export class CriminalRecordsAdminComponent implements OnInit { warningLevelsCopy: any warningType() { this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { + + data.result = data.result.filter((item) => { + return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒' + }) + console.log(7894,data.result) this.warningTypesDetails = JSON.parse(JSON.stringify(data.result)) this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份 this.warningTypes = (data.result as any).groupBy((t) => { return t.violationType }); diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts index 9758440..11859e6 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts @@ -38,7 +38,7 @@ export class WarningStatisticsListComponent implements OnInit { isOrShow: boolean isMisinformation: boolean = false//误报按钮的显隐 - button=false + button = false tableScrollHeight resizeListener ngOnInit(): void { @@ -56,7 +56,7 @@ export class WarningStatisticsListComponent implements OnInit { this.returnLastMenus() } else { loginUserInfo = JSON.parse(sessionStorage.getItem('userdata')) - this.button=false + this.button = false } if (loginUserInfo.roles.find((item) => { @@ -103,10 +103,10 @@ export class WarningStatisticsListComponent implements OnInit { } returnLastMenus() { let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - + for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId==7) { - this.button=true + if (userMenu[index].parentId == 7) { + this.button = true } } return @@ -582,20 +582,15 @@ export class WarningStatisticsListComponent implements OnInit { }); this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => { console.log('预警事件', data.result) - let option1 - let option2 + data.result.forEach(element => { - if (element.violationType == '证照资质') { - option1 = element.id - } - if (element.violationType == '设备监测') { - option2 = element.id + if (element.violationType == '设备监测' || element.violationType == '证照资质') { + this.eventSystemNameOption.push( + { id: element.id, name: element.eventSystemName } + ) } }); - this.eventSystemNameOption = [ - { id: option1, name: '证照预警' }, - { id: option2, name: '消防设施预警' }, - ] + this.list = [] this.SkipCount = '0' this.getLicenseList() @@ -635,7 +630,6 @@ export class WarningStatisticsListComponent implements OnInit { ViolationIds.push(element.id) }); } - console.log('xxx', this.validateForm.value.licenseType) let params = { ViolationIds: ViolationIds, organizationUnitId: organizationUnitId, 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 e4f13ce..3c3db3f 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 @@ -153,13 +153,13 @@ + *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' "> - + - + diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts index 4c0545f..cd0abcc 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts @@ -28,6 +28,9 @@ export class GetOutOfLineDetailsComponent implements OnInit { fileUrl isLicenseWarning = false + + + isOilStationUser ngOnInit(): void { if (this.data.violation.violationType == '证照资质') { diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html index 354ad50..2abf3db 100644 --- a/src/app/pages/today-warning/today-warning.component.html +++ b/src/app/pages/today-warning/today-warning.component.html @@ -125,13 +125,13 @@ + *ngIf="item.violation.violationType != '卸油作业检查' && item.violation.violationType != '证照资质' && item.violation.violationType != '设备监测' "> - + - + From 13f158e8e8e86dbb671e041a1d7e314fce76aac3 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 27 Jun 2022 16:07:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warning-statistics-list.component.scss | 2 +- .../warning-statistics-list.component.ts | 233 +++--------------- .../get-out-of-line-details.component.html | 5 +- .../get-out-of-line-details.component.ts | 2 + .../role/addrole/addrole.component.html | 2 +- .../role/editrole/editrole.component.html | 2 +- 6 files changed, 36 insertions(+), 210 deletions(-) diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss index e060549..74c776c 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.scss @@ -131,7 +131,7 @@ .centerContent { position: absolute; - top: 34%; + top: 40%; left: 50%; transform: translateX(-50%); width: 170px; diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts index 11859e6..ea02a9d 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts @@ -156,40 +156,40 @@ export class WarningStatisticsListComponent implements OnInit { echartsData: any //一级饼图 oilchartpieOption = { - color: ['#FF4B65', '#36A2FF'], + color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'], tooltip: { trigger: 'item'//触发类型 }, - legend: { - bottom: '12%', - left: 'center', - itemGap: 40, - itemWidth: 8, - itemHeight: 8, - formatter: (name) => { - let data = this.oilchartpieOptionPieData1 - let value - for (var i = 0, l = data.length; i < l; i++) { - if (data[i].name == name) { - value = data[i].value; - } - } - return '{a|' + name + '}' + '{b|' + value + '}'; - }, - textStyle: { - color: '#fff', - rich: { - a: { - width: 80 - } - } - } - }, + // legend: { + // bottom: '12%', + // left: 'center', + // itemGap: 40, + // itemWidth: 8, + // itemHeight: 8, + // formatter: (name) => { + // let data = this.oilchartpieOptionPieData1 + // let value + // for (var i = 0, l = data.length; i < l; i++) { + // if (data[i].name == name) { + // value = data[i].value; + // } + // } + // return '{a|' + name + '}' + '{b|' + value + '}'; + // }, + // textStyle: { + // color: '#fff', + // rich: { + // a: { + // width: 80 + // } + // } + // } + // }, series: [ { type: 'pie', radius: ['50%', '60%'], - bottom: '10%', + // bottom: '10%', avoidLabelOverlap: false,//防止标签重叠策略 label: {//每一个标签外网延伸的引导说明 show: false, @@ -310,185 +310,8 @@ export class WarningStatisticsListComponent implements OnInit { } }; - //二级饼图 - oilchartpieOption2 = { - color: ['#36A2FF', '#FFBD4B', '#46DFFF'], - tooltip: { - trigger: 'item'//触发类型 - }, - legend: { - bottom: '8%', - left: 'center', - itemGap: 10, - itemWidth: 8, - itemHeight: 8, - formatter: (name) => { - let data = this.oilchartpieOptionPieData2 - let value - for (var i = 0, l = data.length; i < l; i++) { - if (data[i].name == name) { - value = data[i].value; - } - } - return '{a|' + name + '}' + '{b|' + value + '}'; - }, - textStyle: { - color: '#fff', - rich: { - a: { - width: 60 - } - } - } - }, - series: [ - { - type: 'pie', - radius: ['50%', '60%'], - bottom: '10%', - avoidLabelOverlap: false,//防止标签重叠策略 - label: {//每二个标签外网延伸的引导说明 - show: false, - position: 'outside' - }, - data: [], - tooltip: {//鼠标移入提示 - position: 'right', - padding: [14, 19], - backgroundColor: 'rgba(28, 129, 218, 0.4)', - textStyle: { - color: '#fff', - fontSize: 12 - } - } - } - ] - }; - oilchartpieOptionPieData2: any - //二级柱状图 - oilchartbarOption2 = { - tooltip: { - // trigger: 'axis' - }, - xAxis: { - type: 'category', - data: [], - axisLine: { - show: false, - lineStyle: { - color: '#91CCFF' - } - }, - axisTick: {//刻度线 - show: false - }, - inverse: true - }, - yAxis: { - type: 'value', - nameTextStyle: { - color: '#C4E2FC' - }, - splitLine: {//分割线 - lineStyle: { - color: ['#0f4374'], - width: 2 - } - }, - axisTick: {//刻度线 - show: false - }, - axisLine: {//轴线 - show: false, - lineStyle: { - color: '#C4E2FC' - } - } - }, - legend: { - selectedMode: false, // 是否允许点击 - data: ['事前准备', '事中操作', '全程监测'], - textStyle: { - color: '#fff' - }, - right: 18, - top: 18, - itemWidth: 8, - itemHeight: 8, - }, - series: [ - { - name: '', - data: [], - type: 'bar', - itemStyle: { - color: { - type: 'linear', - x: 0, - y: 0, - x2: 0, - y2: 1, - colorStops: [{ - offset: 0, color: 'rgba(54, 162, 255, 1)' // 0% 处的颜色 - }, { - offset: 1, color: 'rgba(54, 162, 255, 0.1)' // 100% 处的颜色 - }], - global: false // 缺省为 false - } - }, - barWidth: '25%' - }, - { - name: '', - data: [], - type: 'bar', - itemStyle: { - color: { - type: 'linear', - x: 0, - y: 0, - x2: 0, - y2: 1, - colorStops: [{ - offset: 0, color: 'rgba(255, 189, 75, 1)' // 0% 处的颜色 - }, { - offset: 1, color: 'rgba(255, 189, 75, 0.1)' // 100% 处的颜色 - }], - global: false // 缺省为 false - } - }, - barWidth: '25%' - }, - { - name: '', - data: [], - type: 'bar', - itemStyle: { - color: { - type: 'linear', - x: 0, - y: 0, - x2: 0, - y2: 1, - colorStops: [{ - offset: 0, color: 'rgba(70, 223, 255, 1)' // 0% 处的颜色 - }, { - offset: 1, color: 'rgba(70, 223, 255, 0.1)' // 100% 处的颜色 - }], - global: false // 缺省为 false - } - }, - barWidth: '25%' - } - ], - grid: { - left: '42px', - right: '30px', - bottom: '38px', - top: '80px' - } - }; + isgoback: boolean = false //获取统计信息 chartsSpin: boolean = false diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html index 009e034..249f149 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html @@ -49,13 +49,14 @@
误报 - 提交 + 提交 已处置
- + {{content}}
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts index cd0abcc..8598795 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts @@ -66,8 +66,10 @@ export class GetOutOfLineDetailsComponent implements OnInit { let loginUserInfo if (sessionStorage.getItem('isGasStation') == 'true') { loginUserInfo = JSON.parse(sessionStorage.getItem('userdataOfgasstation')) + this.isOilStationUser = true } else { loginUserInfo = JSON.parse(sessionStorage.getItem('userdata')) + this.isOilStationUser = false } if (loginUserInfo.roles.find((item) => { diff --git a/src/app/system-management/role/addrole/addrole.component.html b/src/app/system-management/role/addrole/addrole.component.html index 94f160e..0dcca76 100644 --- a/src/app/system-management/role/addrole/addrole.component.html +++ b/src/app/system-management/role/addrole/addrole.component.html @@ -22,7 +22,7 @@ 菜单 - diff --git a/src/app/system-management/role/editrole/editrole.component.html b/src/app/system-management/role/editrole/editrole.component.html index 38539e9..0f3e2ac 100644 --- a/src/app/system-management/role/editrole/editrole.component.html +++ b/src/app/system-management/role/editrole/editrole.component.html @@ -19,7 +19,7 @@ 菜单 -