+
+
+
+
+
+
+
+
+
+
+ 暂无图片
+
-
-
-
-
-
-
-
-
-
-
-
- 暂无图片
-
-
-
-
-
-
-
- 暂无视频
-
-
+
+
+
+
+
+ 暂无视频
+
-
- 驳回人:{{data.appealLog.auditUser.name}}
- 驳回时间:{{data.appealLog.auditTime | date:"yyyy-MM-dd HH:mm:ss"}}
- 驳回说明:{{data.appealLog.rejectReason}}
-
-
-
-
- 处置内容
-
- 申诉成功 ( 处理人 : {{data.handleUserName}}
- 处理时间 : {{data.lastModificationTime |
+
+
+ 驳回人:{{data.appealLog.auditUser.name}}
+ 驳回时间:{{data.appealLog.auditTime | date:"yyyy-MM-dd HH:mm:ss"}}
+ 驳回说明:{{data.appealLog.rejectReason}}
+
+
+
+
+
处置内容
+
+ 申诉成功 ( 处理人 : {{data.handleUserName}}
+ 处理时间 : {{data.lastModificationTime |
date:"yyyy-MM-dd HH:mm:ss"}} )
- 已进行误报处置
-
-
-
-
申诉撤销
-
申诉
-
+ 已进行误报处置
+
+
+
+
申诉撤销
+
申诉
+
-
-
-
-
- 上传附件:
-
-
-
-
-
- -
- {{item | fileName}}
- x
-
-
-
-
-
+
+
+
+
+ 上传附件:
+
+
+
+
+
+ -
+ {{item | fileName}}
+ x
+
+
+
+
+
-
-
误报
-
误报
+
提交
-
已处置
-
申诉中
-
-
+ 已处置
+ 申诉中
+
+
-
-
- {{content}}
-
-
-
- 处置人:{{data.handleUserName}}
-
-
- 处置时间:{{data.handleTime|date:"yyyy-MM-dd HH:mm:ss"}}
-
-
+
+
+ {{content}}
+
+
+
+ 处置人:{{data.handleUserName}}
+
+
+ 处置时间:{{data.handleTime|date:"yyyy-MM-dd HH:mm:ss"}}
+
-
\ No newline at end of file
+
+
From 73db19c1b530bdb7aa259f1c2d7d2eca00f48340 Mon Sep 17 00:00:00 2001
From: qq55341701 <55341701@qq.com>
Date: Thu, 29 Dec 2022 09:53:41 +0800
Subject: [PATCH 4/8] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=A2=84=E8=AD=A6?=
=?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=8F=AF=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app.module.ts | 3 ++-
src/app/pages/home-page/home-page.component.ts | 5 ++---
src/app/pages/home/home.component.ts | 12 +++++-------
.../system-model/system-model.component.html | 3 +++
.../system-model/system-model.component.scss | 6 ++++++
.../system-model/system-model.component.ts | 18 ++++++++++++++++++
src/app/pages/pages.module.ts | 4 ++--
.../criminal-records-admin.component.ts | 5 ++---
.../criminal-records.component.ts | 5 ++---
.../oil-unloading-process-list.component.ts | 1 -
.../warning-statistics-list.component.ts | 5 ++---
.../today-warning-admin.component.ts | 5 ++---
.../get-out-of-line-details.component.html | 7 +++++--
.../get-out-of-line-details.component.scss | 15 ++++++++++++++-
.../get-out-of-line-details.component.ts | 6 +++++-
.../today-warning/today-warning.component.ts | 10 +++++++---
src/theme.less | 13 ++++++++++---
17 files changed, 87 insertions(+), 36 deletions(-)
create mode 100644 src/app/pages/home/system-model/system-model.component.html
create mode 100644 src/app/pages/home/system-model/system-model.component.scss
create mode 100644 src/app/pages/home/system-model/system-model.component.ts
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 6d04b2c..46ec9f6 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -16,8 +16,9 @@ import { NzMessageModule } from 'ng-zorro-antd/message';
AppComponent,
],
imports: [
- BrowserModule,
AppRoutingModule,
+ BrowserModule,
+
BrowserAnimationsModule,
PagesModule,
FormsModule,
diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts
index 3ebf3c0..4511b3d 100644
--- a/src/app/pages/home-page/home-page.component.ts
+++ b/src/app/pages/home-page/home-page.component.ts
@@ -867,12 +867,11 @@ export class HomePageComponent implements OnInit {
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: data
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index a589783..f9e7917 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -18,6 +18,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DisposeequipmentComponent } from '../records/warning-statistics-list/disposeequipment/disposeequipment.component';
import { SelectedMenu } from 'src/app/service/selectedMenu.service';
import { Location } from "@angular/common";
+import { SystemModelComponent } from './system-model/system-model.component';
@Component({
selector: 'app-home',
templateUrl: './home.component.html',
@@ -383,12 +384,11 @@ export class HomeComponent implements OnInit {
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: copydata
@@ -500,13 +500,11 @@ export class HomeComponent implements OnInit {
for (let k = 0; k < this.tap.length; k++) {
if (this.tap[k] == this.menu3[index].name) {
this.menuList2.push(this.menu3[index])
-
}
-
}
-
}
- this.router.navigate([this.menuList2[0].url])
+ // this.router.navigate([this.menuList2[0].url])
+ window.open(this.menuList2[0].url)
}
goback() {
this.router.navigate(['/plan'])
diff --git a/src/app/pages/home/system-model/system-model.component.html b/src/app/pages/home/system-model/system-model.component.html
new file mode 100644
index 0000000..13534e9
--- /dev/null
+++ b/src/app/pages/home/system-model/system-model.component.html
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/src/app/pages/home/system-model/system-model.component.scss b/src/app/pages/home/system-model/system-model.component.scss
new file mode 100644
index 0000000..9a7b165
--- /dev/null
+++ b/src/app/pages/home/system-model/system-model.component.scss
@@ -0,0 +1,6 @@
+.box{
+ width: 100%;
+ height: 600px;
+ border: 1px solid #6d9cc7;
+ box-shadow: 0 0 8px 0 #fff
+}
\ No newline at end of file
diff --git a/src/app/pages/home/system-model/system-model.component.ts b/src/app/pages/home/system-model/system-model.component.ts
new file mode 100644
index 0000000..16f25cf
--- /dev/null
+++ b/src/app/pages/home/system-model/system-model.component.ts
@@ -0,0 +1,18 @@
+import { Component, Input, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-system-model',
+ templateUrl: './system-model.component.html',
+ styleUrls: ['./system-model.component.scss']
+})
+export class SystemModelComponent implements OnInit {
+ @Input() url: any
+
+ constructor() { }
+
+ ngOnInit(): void {
+
+ console.log(this.url)
+ }
+
+}
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index c5078d2..5670dc2 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -88,11 +88,11 @@ import { WarningStatisticsListComponent } from './records/warning-statistics-lis
import { RecordsNavComponent } from './records/records-nav/records-nav.component';
import { UserDetailsComponent } from './audit/audit-ing/user-details/user-details.component';
import { AppealDetailsComponent } from './audit/audit-ing/appeal-details/appeal-details.component';
-
+import { SystemModelComponent } from './home/system-model/system-model.component';
@NgModule({
declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
- AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName],
+ AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, auditStatusPipe, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent, RecordsNavComponent, UserDetailsComponent, AppealDetailsComponent, fileName, SystemModelComponent],
imports: [
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 b298103..c28d4ab 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
@@ -794,12 +794,11 @@ export class CriminalRecordsAdminComponent implements OnInit {
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: item
diff --git a/src/app/pages/records/criminal-records/criminal-records.component.ts b/src/app/pages/records/criminal-records/criminal-records.component.ts
index 3cbb90e..d453455 100644
--- a/src/app/pages/records/criminal-records/criminal-records.component.ts
+++ b/src/app/pages/records/criminal-records/criminal-records.component.ts
@@ -758,12 +758,11 @@ export class CriminalRecordsComponent implements OnInit {
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: item
diff --git a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
index 800be37..438c71f 100644
--- a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
+++ b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts
@@ -3,7 +3,6 @@ import { Component, OnInit, ViewContainerRef, ElementRef } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import * as echarts from 'echarts';
import { NzModalService } from 'ng-zorro-antd/modal';
-import { GetOutOfLineDetailsComponent } from '../../today-warning/get-out-of-line-details/get-out-of-line-details.component';
import * as moment from 'moment';
import { fromEvent } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
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 197e4a9..6add8e3 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
@@ -627,12 +627,11 @@ export class WarningStatisticsListComponent implements OnInit {
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: item
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
index 200a2ae..8eeaac4 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
@@ -347,12 +347,11 @@ export class TodayWarningAdminComponent implements OnInit {
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: item
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 2bbbedf..a9218e9 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
@@ -1,6 +1,6 @@
-
+
-
预警详情:{{details}}
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
index cd1fa75..d4651c1 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss
@@ -7,6 +7,8 @@
flex-direction: column;
background-image: linear-gradient(#003B6E, #000D21);
position: relative;
+ border: 1px solid #6d9cc7;
+ box-shadow: 0 0 8px 0 #fff
}
.titlebox {
@@ -15,6 +17,7 @@
background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%);
display: flex;
align-items: center;
+ position: relative;
.title {
width: 100%;
@@ -52,6 +55,16 @@
}
}
+
+ .close {
+ position: absolute;
+ right: 18px;
+ top: 18px;
+ cursor: pointer;
+ i {
+ font-size: 18px;
+ }
+ }
}
.details {
@@ -111,7 +124,7 @@
.btn {
display: flex;
align-items: center;
-
+
span {
margin: 0 4px;
display: inline-block;
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 6b1884f..e79c91b 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
@@ -16,7 +16,7 @@ import Viewer from 'viewerjs';
export class GetOutOfLineDetailsComponent implements OnInit {
@Input() data: any
- constructor(private objectsSrv: ObjectsSimpleService, private fb: FormBuilder, private http: HttpClient, private message: NzMessageService, private modal: NzModalService, private initialModal: NzModalRef, private sanitizer: DomSanitizer) { }
+ constructor(private objectsSrv: ObjectsSimpleService, private fb: FormBuilder, private http: HttpClient, private message: NzMessageService, private modal: NzModalService, private initialModal: NzModalRef, private sanitizer: DomSanitizer,private openmodal: NzModalRef) { }
imgUrl: string
@@ -289,4 +289,8 @@ export class GetOutOfLineDetailsComponent implements OnInit {
this.message.create('warning', '申诉撤销失败,请联系管理员!');
})
}
+
+ closeModel(){
+ this.openmodal.close()
+ }
}
diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts
index 296a437..08fe295 100644
--- a/src/app/pages/today-warning/today-warning.component.ts
+++ b/src/app/pages/today-warning/today-warning.component.ts
@@ -305,17 +305,17 @@ export class TodayWarningComponent implements OnInit {
});
const instance = modal.getContentComponent();
} else {
+ console.log(777777777777)
const modal = this.modal.create({
nzContent: GetOutOfLineDetailsComponent,
nzWrapClassName: "vertical-center-modal",
nzViewContainerRef: this.viewContainerRef,
nzWidth: (document.documentElement.clientHeight < 650 || document.documentElement.clientWidth < 1400) ? 1000 : 1200,
+ nzClosable: false,
+ nzClassName: 'modelnobg',
nzBodyStyle: {
- 'border': '1px solid #6d9cc7',
'border-radius': '0px',
'padding': '0px',
- 'box-shadow': '0 0 8px 0 #fff',
- 'background': '#000D21',
},
nzComponentParams: {
data: item
@@ -334,6 +334,10 @@ export class TodayWarningComponent implements OnInit {
}
});
const instance = modal.getContentComponent();
+ modal.afterOpen.subscribe(() => {
+ console.log(9999999999999999)
+ });
+ modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
}
}
diff --git a/src/theme.less b/src/theme.less
index cbaf74f..00354b6 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -657,6 +657,12 @@
justify-content: center;
}
+.modelnobg {
+ .ant-modal-content {
+ background: none;
+ }
+}
+
.vertical-center-modal .ant-modal {
top: 0;
}
@@ -771,8 +777,9 @@
}
}
}
-.WarningEvents{
- .ant-modal-close-x{
+
+.WarningEvents {
+ .ant-modal-close-x {
color: #000;
}
-}
\ No newline at end of file
+}
From 00dcb48d8ee4b68947a40f1599b82bec3aa08dfa Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Thu, 29 Dec 2022 10:52:47 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/login/login.component.ts | 65 ++++++++++++--------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index a30c123..aa89e9c 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -163,43 +163,40 @@ export class LoginComponent implements OnInit {
this.rememberInfo()
//自动登录
this.autoLogin()
- if (data.result.user.userName == 'admin') {
- sessionStorage.setItem("isGasStation", 'false');
- this.router.navigate(['/system/organization'])
+
+ if (data.result.user.organization.isGasStation) {
+ sessionStorage.setItem("isGasStation", 'true');
+ let a = sessionStorage.getItem('userdataOfgasstation')
+ let menuList = this.returnLastMenus(a, this.menu2)
+ let isTrue = menuList.find((item) => {
+ return item.name == "今日预警"
+ });
+ if (isTrue) {
+ this.router.navigate(['/todaywarning/petrolStation'])
+ sessionStorage.setItem('selectedMenu', '今日预警')
+ } else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
+ this.router.navigate([menuList[1].url])
+ sessionStorage.setItem('selectedMenu', menuList[1].name)
+ } else {
+ this.router.navigate([menuList[0].url])
+ sessionStorage.setItem('selectedMenu', menuList[0].name)
+ }
} else {
- if (data.result.user.organization.isGasStation) {
- sessionStorage.setItem("isGasStation", 'true');
- let a = sessionStorage.getItem('userdataOfgasstation')
- let menuList = this.returnLastMenus(a, this.menu2)
- let isTrue = menuList.find((item) => {
- return item.name == "今日预警"
- });
- if (isTrue) {
- this.router.navigate(['/todaywarning/petrolStation'])
- sessionStorage.setItem('selectedMenu', '今日预警')
- } else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
- this.router.navigate([menuList[1].url])
- sessionStorage.setItem('selectedMenu', menuList[1].name)
- } else {
- this.router.navigate([menuList[0].url])
- sessionStorage.setItem('selectedMenu', menuList[0].name)
- }
+ sessionStorage.setItem("isGasStation", 'false');
+ let a = sessionStorage.getItem('userdata')
+ let menuList = this.returnLastMenus(a, this.menu1)
+ let isTrue = menuList.find((item) => {
+ return item.name == "首页"
+ });
+ if (isTrue) {
+ this.router.navigate(['/homepage'])
+ sessionStorage.setItem('selectedMenu', '首页')
} else {
- sessionStorage.setItem("isGasStation", 'false');
- let a = sessionStorage.getItem('userdata')
- let menuList = this.returnLastMenus(a, this.menu1)
- let isTrue = menuList.find((item) => {
- return item.name == "首页"
- });
- if (isTrue) {
- this.router.navigate(['/homepage'])
- sessionStorage.setItem('selectedMenu', '首页')
- } else {
- this.router.navigate([menuList[0].url])
- sessionStorage.setItem('selectedMenu', menuList[0].name)
- }
- //
+ this.router.navigate([menuList[0].url])
+ sessionStorage.setItem('selectedMenu', menuList[0].name)
}
+ //
+
}
this.message.create('success', `登录成功`);
}, err => {
From 983f026a41e75b14a8dfad50d9c226e076ff1d74 Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Thu, 29 Dec 2022 11:03:56 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/login/login.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index aa89e9c..a6bf179 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -137,7 +137,7 @@ export class LoginComponent implements OnInit {
sessionStorage.setItem("encryptedAccessToken", data.result.encryptedAccessToken);
this.http.get('/api/services/app/Session/GetCurrentLoginInformations').subscribe(async (data: any) => {
console.log('GetCurrentLoginInformations', data.result)
- if (data.result.user.menus.length == 0 && data.result.user.userName != "admin") {
+ if (data.result.user.menus.length == 0) {
this.message.create('error', `当前用户未分配菜单`);
this.isLoading = false
return
From 0c41b7917940fb8d4ca69c277ad44a048ad4850d Mon Sep 17 00:00:00 2001
From: qq55341701 <55341701@qq.com>
Date: Fri, 30 Dec 2022 11:28:59 +0800
Subject: [PATCH 7/8] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/home/home.component.ts | 7 ++++++-
.../criminal-records-admin.component.ts | 3 +--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index f9e7917..b47ae15 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -504,7 +504,12 @@ export class HomeComponent implements OnInit {
}
}
// this.router.navigate([this.menuList2[0].url])
- window.open(this.menuList2[0].url)
+ if (this.menuList2[0].url) {
+ window.open(this.menuList2[0].url)
+ } else {
+ this.message.create('warning', '未分配系统管理菜单');
+ }
+
}
goback() {
this.router.navigate(['/plan'])
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 c28d4ab..cb2e57d 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
@@ -533,8 +533,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
SkipCount: this.SkipCount,
MaxResultCount: this.MaxResultCount,
AppealStatus: this.validateForm.value.appealState,
- Positive: this.validateForm.value.misinformation,
- IsLicense: true
+ Positive: this.validateForm.value.misinformation
}
this.tableSpin = true
this.http.get('/api/services/app/ViolateRecord/GetAll', {
From 4212f8bb6092c5aedecedaef03f0aedcf0645048 Mon Sep 17 00:00:00 2001
From: jingbowen <970029315@qq.com>
Date: Fri, 30 Dec 2022 13:38:03 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/login/login.component.ts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/app/pages/login/login.component.ts b/src/app/pages/login/login.component.ts
index a6bf179..a88ce99 100644
--- a/src/app/pages/login/login.component.ts
+++ b/src/app/pages/login/login.component.ts
@@ -177,6 +177,8 @@ export class LoginComponent implements OnInit {
} else if (data.result.user.menus[0].name == "数字油站" && !this.init3D) {
this.router.navigate([menuList[1].url])
sessionStorage.setItem('selectedMenu', menuList[1].name)
+ } else if (menuList.length == 0) {
+ return this.message.create('warning', `当前用户未分配菜单`);
} else {
this.router.navigate([menuList[0].url])
sessionStorage.setItem('selectedMenu', menuList[0].name)
@@ -188,6 +190,11 @@ export class LoginComponent implements OnInit {
let isTrue = menuList.find((item) => {
return item.name == "首页"
});
+ if (menuList.length == 0) {
+
+ return this.message.create('warning', `当前用户未分配菜单`);
+
+ }
if (isTrue) {
this.router.navigate(['/homepage'])
sessionStorage.setItem('selectedMenu', '首页')