From 1a64371b80746001ad1d75204bb2220900aa1d53 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 14 Apr 2023 15:32:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=AE=97=E6=B3=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm-config.component.html | 52 ++++++++++++++++--- .../algorithm-config.component.scss | 37 +++++++++++-- .../algorithm-config.component.ts | 49 ++++++++++++++--- 3 files changed, 119 insertions(+), 19 deletions(-) diff --git a/src/app/system-management/algorithm-config/algorithm-config.component.html b/src/app/system-management/algorithm-config/algorithm-config.component.html index 3f9cbe9..128e28c 100644 --- a/src/app/system-management/algorithm-config/algorithm-config.component.html +++ b/src/app/system-management/algorithm-config/algorithm-config.component.html @@ -15,11 +15,24 @@
-
- +
+
+ + + + + + + + + + + + +
- @@ -27,11 +40,27 @@ - - {{item.stationName || '/'}} - {{item.locationName || '/'}} - {{item.companyName || '/'}} - + + + + {{item.stationName || '/'}} + + + + + + {{item.locationName || '/'}} + + + + + {{item.companyName || '/'}} + + +
@@ -53,6 +82,13 @@ + +
+
\ No newline at end of file diff --git a/src/app/system-management/algorithm-config/algorithm-config.component.scss b/src/app/system-management/algorithm-config/algorithm-config.component.scss index fd57aef..8cd6e53 100644 --- a/src/app/system-management/algorithm-config/algorithm-config.component.scss +++ b/src/app/system-management/algorithm-config/algorithm-config.component.scss @@ -51,7 +51,14 @@ overflow-y: auto; box-sizing: border-box; padding: 12px; - + .searchbox{ + display: flex; + justify-content: flex-end; + margin-bottom: 16px; + button{ + color: #40a9ff; + } + } .tableBox { .dataItem { @@ -63,24 +70,24 @@ .hover { display: none; - - } cursor: pointer; } - .dataItem:hover { + .dataItemLevek:hover { .hover { display: block; width: 72px; height: 48px; border-radius: 12px; overflow: hidden; - div{ + + div { display: inline-block; width: 50%; } + .on { background: #1e1e1e; } @@ -94,6 +101,26 @@ display: none; } } + + .Highlight { + background: rgb(236, 234, 234); + // color: #fff; + } + + .name { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + cursor: default; + } } + + .pagination { + margin: 15px 0; + display: flex; + align-items: center; + justify-content: center; + } } diff --git a/src/app/system-management/algorithm-config/algorithm-config.component.ts b/src/app/system-management/algorithm-config/algorithm-config.component.ts index 50e3658..a4bad7d 100644 --- a/src/app/system-management/algorithm-config/algorithm-config.component.ts +++ b/src/app/system-management/algorithm-config/algorithm-config.component.ts @@ -1,5 +1,6 @@ import { HttpClient } from "@angular/common/http"; import { Component, OnInit } from "@angular/core"; +import { FormBuilder, FormGroup } from "@angular/forms"; import { NzMessageService } from "ng-zorro-antd/message"; import { NzFormatEmitEvent } from "ng-zorro-antd/tree"; import { TreeService } from "src/app/service/tree.service"; @@ -13,17 +14,33 @@ export class AlgorithmConfigComponent implements OnInit { constructor( private http: HttpClient, private toTree: TreeService, - private message: NzMessageService + private message: NzMessageService, + private fb: FormBuilder ) {} + validateForm!: FormGroup; + submitForm(): void { + console.log("submit", this.validateForm.value); + this.StationName = this.validateForm.value.name; + this.SkipCount = 0; + this.getStationViolationConfigList(); + } OrganizationUnitId: string; + level; ngOnInit(): void { + this.validateForm = this.fb.group({ + name: [null], + }); this.OrganizationUnitId = sessionStorage.getItem("isGasStation") == "true" ? JSON.parse(sessionStorage.getItem("userdataOfgasstation")) .organization.id : JSON.parse(sessionStorage.getItem("userdata")).organization.id; - + this.level = + sessionStorage.getItem("isGasStation") == "true" + ? JSON.parse(sessionStorage.getItem("userdataOfgasstation")) + .organization.level + : JSON.parse(sessionStorage.getItem("userdata")).organization.level; this.getAllOrganization(); } @@ -100,12 +117,15 @@ export class AlgorithmConfigComponent implements OnInit { } SkipCount = 0; - MaxResultCount = 100; + MaxResultCount = 10; isLoading = false; listOfData: any[] = []; thList = []; + totals; + StationName = null; getStationViolationConfigList() { let params = { + StationName: this.StationName, OrganizationUnitId: this.selectedOrId, IsContainsChildren: true, SkipCount: this.SkipCount, @@ -119,8 +139,8 @@ export class AlgorithmConfigComponent implements OnInit { .subscribe({ next: (data: any) => { this.isLoading = false; - this.listOfData = data.result; - + this.listOfData = data.result.result; + this.totals = data.result.totalCount; if (this.listOfData && this.listOfData.length !== 0) { let arr1 = ["油站名称", "区域名称", "公司名称"]; let arr2 = []; @@ -136,6 +156,12 @@ export class AlgorithmConfigComponent implements OnInit { }); } + pageChange($event) { + console.log($event); + this.SkipCount = ($event - 1) * this.MaxResultCount; + this.getStationViolationConfigList(); + } + change(item, type) { this.isLoading = true; let body = { @@ -149,7 +175,18 @@ export class AlgorithmConfigComponent implements OnInit { .subscribe((data) => { this.isLoading = false; this.message.create("success", "修改成功"); - item.disabled = type + item.disabled = type; }); } + + hoverKey; + hoverK; + mouseEnter(key, k) { + this.hoverKey = key; + this.hoverK = k; + } + mouseLeave() { + this.hoverKey = -1; + this.hoverK = -1; + } }