From ff7cd5048e35aeb0218f807ef85fb933fed2cd4b Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 16 Sep 2022 09:58:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=94=B6=E5=88=B0=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=88=B7=E6=96=B0=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/home-page/home-page.component.ts | 12 +++-- src/app/pages/home/home.component.ts | 44 +++++++++---------- .../disposeequipment.component.ts | 3 +- .../warning-statistics-list.component.html | 10 ++--- .../today-warning-admin.component.ts | 11 +---- .../get-out-of-line-details.component.html | 20 +++++++++ .../today-warning/today-warning.component.ts | 9 ---- .../organization/organization.component.ts | 11 +++-- src/theme.less | 21 +++++++++ 9 files changed, 88 insertions(+), 53 deletions(-) diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts index 0f69e48..3ebf3c0 100644 --- a/src/app/pages/home-page/home-page.component.ts +++ b/src/app/pages/home-page/home-page.component.ts @@ -7,7 +7,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component'; import { NzMessageService } from 'ng-zorro-antd/message'; import { DisposeequipmentComponent } from '../records/warning-statistics-list/disposeequipment/disposeequipment.component'; - +import { listRefreshService } from '../../service/listRefresh.service'; declare var tools @Component({ selector: 'app-home-page', @@ -16,7 +16,7 @@ declare var tools }) export class HomePageComponent implements OnInit { - constructor(private http: HttpClient, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService) { } + constructor(private listRefreshService: listRefreshService, private http: HttpClient, private router: Router, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService) { } warningechartpieAll//全部预警饼图 warningechartpieOptionAll = { color: ['#91CCFF', '#46DFFF', '#36A2FF', '#FF6181', '#B4C3FF', '#FF9963', '#5A9CFF', '#4BFFD4', '#46DFFF', '#91CCFF'], @@ -500,7 +500,13 @@ export class HomePageComponent implements OnInit { setTimeout(() => { this.getHomeAggregation() }, 10 * 6000); - + this.listRefreshService.getMessage().subscribe((message: any) => { + //列表刷新 + if (message.type == 'add') { + console.log('咱这边收到通知刷新页面了') + this.getHomeAggregation() + } + }); this.resolutionRatio() } diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 7495ead..c2fc200 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -17,7 +17,7 @@ import * as moment from 'moment'; 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 { Location } from "@angular/common"; @Component({ selector: 'app-home', templateUrl: './home.component.html', @@ -27,14 +27,14 @@ export class HomeComponent implements OnInit { @ViewChild('warning', { static: false }) template?: TemplateRef<{}>; passwordValidateForm!: FormGroup; constructor(private listRefreshService: listRefreshService, private http: HttpClient, private router: Router, private navChangeService: NavChangeService, public token: CacheTokenService, - private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private fb: FormBuilder, private selectedMenu: SelectedMenu,private location: Location) { + private message: NzMessageService, private notificationService: NzNotificationService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private fb: FormBuilder, private selectedMenu: SelectedMenu, private location: Location) { const { password } = MyValidators; - + this.passwordValidateForm = this.fb.group({ oldpassword: [null, [Validators.required]], newpassword: [null, [Validators.required, password]], affirmpassword: [null, [Validators.required, password]] - + }); } @@ -78,14 +78,14 @@ export class HomeComponent implements OnInit { menuList2 = [] selectedItem routerChange(item) { - if(JSON.parse(sessionStorage.getItem('isGasStation'))){ - let a=JSON.parse(sessionStorage.getItem("3dSceneData")) - if(!a.hasBuildingInfo && item.url == "/plan/petrolStation"){ + if (JSON.parse(sessionStorage.getItem('isGasStation'))) { + let a = JSON.parse(sessionStorage.getItem("3dSceneData")) + if (!a.hasBuildingInfo && item.url == "/plan/petrolStation") { this.message.info("当前油站未开通!"); return } } - + if (item.name == this.selectedItem) { return } @@ -96,33 +96,33 @@ export class HomeComponent implements OnInit { ngOnInit(): void { this.location.subscribe(event => { - - if(event.url=="/homepage"){ + + if (event.url == "/homepage") { sessionStorage.setItem('selectedMenu', "首页") this.selectedItem = "首页" - }else if(event.url=="/plan"||event.url=="/plan/petrolStation"){ + } else if (event.url == "/plan" || event.url == "/plan/petrolStation") { sessionStorage.setItem('selectedMenu', "数字油站") this.selectedItem = "数字油站" - }else if(event.url=="/todaywarning"||event.url=="/todaywarning/petrolStation"){ + } else if (event.url == "/todaywarning" || event.url == "/todaywarning/petrolStation") { sessionStorage.setItem('selectedMenu', "今日预警") this.selectedItem = "今日预警" - }else if(event.url.indexOf("/records_nav")!=-1){ - if(event.url=="/records_nav"){ + } else if (event.url.indexOf("/records_nav") != -1) { + if (event.url == "/records_nav") { this.router.navigate(['/records_nav/all']) - }else if(event.url=="/records_nav/petrolStation"){ - + } else if (event.url == "/records_nav/petrolStation") { + this.router.navigate(['/records_nav/petrolStation/all']) - + } sessionStorage.setItem('selectedMenu', "预警记录") this.selectedItem = "预警记录" - }else if(event.url=="/license"||event.url=="/license/petrolStation"){ + } else if (event.url == "/license" || event.url == "/license/petrolStation") { sessionStorage.setItem('selectedMenu', "证照管理") this.selectedItem = "证照管理" } - -}); - + + }); + let a = sessionStorage.getItem('userdata') this.userMenu = JSON.parse(a).menus for (let index = 0; index < this.userMenu.length; index++) { @@ -252,7 +252,7 @@ export class HomeComponent implements OnInit { reloadPage = (userNotification) => { console.log('abp.notifications.received收到通知', userNotification); - if (this.router.url.indexOf('todaywarning') != -1) { + if (this.router.url.indexOf('todaywarning') != -1 || this.router.url.indexOf('homepage') != -1) { let obj = { type: 'add', data: userNotification diff --git a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts index 6c29471..36bf261 100644 --- a/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts +++ b/src/app/pages/records/warning-statistics-list/disposeequipment/disposeequipment.component.ts @@ -16,6 +16,7 @@ export class DisposeequipmentComponent implements OnInit { radioValue = "A" data2 + copydata2 isScrap isScraped @@ -23,7 +24,7 @@ export class DisposeequipmentComponent implements OnInit { isSubmit ngOnInit(): void { this.data2 = JSON.parse(JSON.stringify(this.data)) - + this.copydata2 = JSON.parse(JSON.stringify(this.data)) console.log('快照预警数据', this.data2) if (this.data2.handleTime) { let params = { diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html index d8a922a..4b4890d 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.html @@ -123,12 +123,12 @@ 预警内容 公司名称 区域名称 - 油站名称 - 证照/消防设施名称 - 有效期限 + 油站名称 + 证照/消防设施名称 + 有效期限 预警时间 - 状态 - 操作 + 状态 + 操作 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 5dd346a..200a2ae 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 @@ -48,22 +48,13 @@ export class TodayWarningAdminComponent implements OnInit { //更新处置状态 if (message.type == 'updatehandleTime') { console.log('更新处置状态', message) - console.log(this.list) + // console.log(this.list) this.list.forEach(element => { if (element.id == message.data) { element.handleTime = new Date() } }); } - // let params = { - // id: message.notification.entityId - // } - // this.http.get('/api/services/app/ViolateRecord/Get', { - // params: params - // }).subscribe((data: any) => { - // this.list.unshift(data.result) - // console.log('新获取一条', data.result) - // }) }); let loginUserInfo 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 5d41eea..328c178 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 @@ -63,6 +63,26 @@ (nzOnCancel)="handleCancel()"> + { - // this.list.unshift(data.result) - // console.log('新获取一条', data.result) - // }) }); let loginUserInfo diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts index 1a2208b..a180cdc 100644 --- a/src/app/system-management/organization/organization.component.ts +++ b/src/app/system-management/organization/organization.component.ts @@ -206,10 +206,15 @@ export class OrganizationComponent implements OnInit { id: event.dragNode.key, parentId: parentId, // code: instance.validateForm.value.code, - displayName: event.dragNode.origin.displayName, - isGasStation: event.dragNode.origin.isGasStation + // displayName: event.dragNode.origin.displayName, + // isGasStation: event.dragNode.origin.isGasStation } - this.http.put('/api/services/app/Organization/Update', body).subscribe(data => { + this.http.post('/api/services/app/Organization/Move', null, { + params: { + id: event.dragNode.key, + parentId: parentId, + } + }).subscribe(data => { this.message.create('success', '拖拽成功！'); this.nzTreeComponent.getExpandedNodeList().forEach((item) => { this.defaultExpandedKeys.push(item.key) diff --git a/src/theme.less b/src/theme.less index 6df522d..71c1f3a 100644 --- a/src/theme.less +++ b/src/theme.less @@ -712,3 +712,24 @@ color: #fff; } } + +// 申诉上传 +.appealUploadbox{ + display: flex; + margin-top: 12px; + .title{ + margin-right: 6px; + } + .btn{ + ul{ + margin-top: 6px; + margin-bottom: 0px; + li{ + cursor: pointer; + } + li:hover{ + text-decoration: underline; + } + } + } +} \ No newline at end of file