From 407f66719128095841974ccbeed4e2c679c775c7 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 2 Mar 2022 16:20:16 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=BB=9F=E8=AE=A1=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../combined-query.component.html | 312 ++++---- .../combined-query.component.scss | 403 ++++------ .../combined-query.component.spec.ts | 25 - .../combined-query.component.ts | 713 ++++++++---------- src/styles.scss | 653 ++++++++-------- 5 files changed, 1017 insertions(+), 1089 deletions(-) delete mode 100644 src/app/statistic-analysis/combined-query/combined-query.component.spec.ts diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.html b/src/app/statistic-analysis/combined-query/combined-query.component.html index be0d92f..6fe91fa 100644 --- a/src/app/statistic-analysis/combined-query/combined-query.component.html +++ b/src/app/statistic-analysis/combined-query/combined-query.component.html @@ -1,153 +1,165 @@ -
- - - -
-
-
-
- - - - - - 包含下级 - 包含下级 -
-
- clear -
- - - -
  • {{node.name}}
    • -     - - -
  • {{node.name}}
    • -     -     -
    -
    -
    - - - - - - - 🠊 - - - - -
    -
    - - - - 二维预案 - 三维预案 - 其他预案 - 文本预案 - - - -
    -
    - - - - - {{unit.name}} - - - -
    -
    - - - - 新增 - 维护更新 - - -
    -
    - - - - Ⅰ级预案 - Ⅱ级预案 - Ⅲ级预案 - Ⅳ级预案 - Ⅴ级预案 - - -
    -
    - - - - 从高到低 - 从低到高 - - -
    -
    - - - - 从高到低 - 从低到高 - - -
    -
    - - - -
    +
    + + + + +
    +
    +
    + + + + + + 包含下级 + 包含下级 +
    +
    + clear
    + + + +
  • {{node.name}}
    • +     + + +
  • {{node.name}}
    • +     +
    - - - -
    -
    - - - - - - - - - -
    {{item}}
    {{eletd}}
    - - - - - - - - - -
    {{item}}
    {{eletd}}
    - 暂无数据 -
    -
    - - - - -
    +
    +
    + + + + + + + 🠊 + + + + +
    +
    + + + + 二维预案 + 三维预案 + 其他预案 + 文本预案 + + + +
    +
    + + + + + {{unit.name}} + + + +
    +
    + + + + 新增 + 维护更新 + + +
    +
    + + + + Ⅰ级预案 + Ⅱ级预案 + Ⅲ级预案 + Ⅳ级预案 + Ⅴ级预案 + + +
    +
    + + + + 从高到低 + 从低到高 + + +
    +
    + + + + 从高到低 + 从低到高 + + +
    +
    + + + +
    +
    +
    + + +
    +
    + + + + + + + + + +
    {{item}}
    {{eletd}}
    + + + + + + + + + + +
    {{item}}
    {{eletd}}
    + 暂无数据 +
    +
    + +
    +
    + + + +
    \ No newline at end of file diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.scss b/src/app/statistic-analysis/combined-query/combined-query.component.scss index abf6442..b51bc0c 100644 --- a/src/app/statistic-analysis/combined-query/combined-query.component.scss +++ b/src/app/statistic-analysis/combined-query/combined-query.component.scss @@ -1,265 +1,190 @@ + + .header { - width: 100%; - padding: 12px 10px; + width: 100%; + padding: 12px 10px; + box-sizing: border-box; + + .queryBox { box-sizing: border-box; - .queryBox { - box-sizing: border-box; - padding: 5px 0 0 5px; - // margin-left: 50px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items:center; - // justify-content:center; + padding: 5px 0 0 5px; + // margin-left: 50px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + + // justify-content:center; .queryField { + //margin: 0 10px; input { width: 180px; height: 22px; line-height: 22px; border-radius: 3px; - } - @media screen and (min-device-width:1400px){ - margin: 3px 20px; - } - @media screen and (max-device-width:1400px)and (min-device-width:1200px){ - margin: 3px 10px; - mat-form-field{ - width: 180px; - } + } + + @media screen and (min-device-width:1400px) { + margin: 3px 20px; + } + + @media screen and (max-device-width:1400px)and (min-device-width:1200px) { + margin: 3px 10px; + + mat-form-field { + width: 180px; } - @media screen and (max-device-width:1200px){ - margin: 3px 0 3px 10px; - mat-form-field{ - width: 120px; - } + } + + @media screen and (max-device-width:1200px) { + margin: 3px 0 3px 10px; + + mat-form-field { + width: 120px; } - - } - + } - } //queryBox - .butclass{ - button{ - width: 80px;height: 36px; - font-size: 16px; } -} - .ordiv{ - position: relative; - .organizationbox{ - width:450px; - height: 200px; - background: white; - position: absolute; - top: 48px; - left: 77px; - z-index: 999; - border: 1px solid grey; - overflow-y: auto; - li{ - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - mat-tree-node{ - cursor: pointer; - white-space:pre; - } - mat-tree-node:hover{ - background: rgba(225, 225, 225, 0.8); - } - .closediv{ - z-index: 100; - position: absolute; - right: 0; - top: 0; - width: 30px; - height: 30px; - cursor: pointer; - line-height: 30px; - text-align: center; - } - .closediv:hover{ - background:rgba(225, 225, 225, 0.8); - } - } - + + + } + + //queryBox + .butclass { + button { + width: 80px; + height: 36px; + font-size: 16px; } } - .body{ - height: 100%; - width: 100%; - .buttonbox{ - padding-left: 50px; - button{ - margin:0 10px - } + + .ordiv { + position: relative; + + .organizationbox { + width: 450px; + height: 200px; + background: white; + position: absolute; + top: 48px; + left: 77px; + z-index: 999; + border: 1px solid grey; + overflow-y: auto; + + li { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } - .tablebox{ - height: 620px; - overflow-y: auto; - //margin-bottom: 15px; - table{ - width: 100%; - background-color: white; - margin-top: 15px; - table-layout: fixed; - thead,tr{ - border-bottom: 1px solid grey; - } - th { - border-bottom: 1px solid #999; - //width: 30%; - font-size: 16px; - text-align: center; - height: 60px; - line-height: 60px; - } - td { - - height: 50px; - //line-height: 50px; - text-align: center; - font-size: 16px; - margin-left: 3px; - border-bottom: 1px solid #999; - .spantext{ - margin-left: 7px; - } - .buleColor{ - color: #2196f3; - } - } - } - mat-paginator{ - width:100%; - // margin-left: 2%; - // margin-top: 30px; - } + + mat-tree-node { + cursor: pointer; + white-space: pre; } - } - .mat-header-cell{ - text-align: center; -} -.mat-cell{ - text-align: center; - -} -//完整度 -.integrityDiv{ - width: 180px; - height: 18px; - background-color: #e2e7ee; - // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32); - margin: 0 auto; - position: relative; - .integrityNum{ + mat-tree-node:hover { + background: rgba(225, 225, 225, 0.8); + } + + .closediv { + z-index: 100; position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - color: black; - font-weight: 800; - font-size: 13px; - cursor: default; + right: 0; + top: 0; + width: 30px; + height: 30px; + cursor: pointer; + line-height: 30px; + text-align: center; + } + + .closediv:hover { + background: rgba(225, 225, 225, 0.8); + } } - .integrityColorDiv{ - height: 100%; + + } +} + +.body { + flex: 1; + width: 100%; + position: relative; + .buttonbox { + padding-left: 50px; + + button { + margin: 0 10px } - .integrityDetails{ - position: absolute; - display: none; - width: 350px; - height:280px; - border: 1px solid rgba(0, 0, 0, 0.22); - background-color: white; - .integrityDetailsTop{ - width: 100%; - height: 23px; - line-height:23px; - border-bottom: 1px solid rgba(0, 0, 0, 0.22); - margin-bottom: 1px; - font-size: 14px; - span{ - display: inline-block; - text-align: center; - font-weight: 800; - } - .span1{ - width: 25%; - } - .span2{ - width: 60%; - } - .span3{ - width: 15%; - } + } + .masklayer{ + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 999; + background-color: rgba(0, 0, 0, 0.22); + display: flex; + align-items: center; + justify-content: center; + } + .tablebox { + height: 620px; + overflow-y: auto; + table { + width: 100%; + background-color: white; + margin-top: 15px; + table-layout: fixed; + + thead, + tr { + border-bottom: 1px solid grey; + } + + th { + border-bottom: 1px solid #999; + //width: 30%; + font-size: 16px; + text-align: center; + height: 60px; + line-height: 60px; + } + + td { + + height: 50px; + //line-height: 50px; + text-align: center; + font-size: 16px; + margin-left: 3px; + border-bottom: 1px solid #999; + + .spantext { + margin-left: 7px; } - .integrityDetailsBody{ - ul{ - li{ - width: 100%; - height: 23px; - line-height: 23px; - margin: 3px 0; - div{ - float: left; - font-size: 13px; - } - .name{ - width: 25%; - height: 100%; - } - .colorDiv{ - width: 60%; - height: 100%; - position: relative; - .colorDivBac{ - width: 90%; - height: 100%; - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%,-50%); - background-color: #dfe5ec; - border-radius: 5px; - .colorDivCon{ - border-radius: 5px; - height: 100%; - background-color: #2398f1; - } - } - span{ - position: absolute; - left: 50%; - top: 50%; - transform: translate(-50%,-50%); - // color: white; - font-weight: 600; - } - } - .number{ - width: 15%; - height: 100%; - } - } - } - + + .buleColor { + color: #2196f3; } + } } - .bottomposition{ - top: 2px; - left: 188px; - } - .topposition{ - top: -252px; - left: 188px; + + mat-paginator { + width: 100%; } + } } -.integrityDiv:hover{ - .integrityDetails{ - display: block; - } -} \ No newline at end of file + +.mat-header-cell { + text-align: center; +} + +.mat-cell { + text-align: center; + +} + diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.spec.ts b/src/app/statistic-analysis/combined-query/combined-query.component.spec.ts deleted file mode 100644 index 9b36c52..0000000 --- a/src/app/statistic-analysis/combined-query/combined-query.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CombinedQueryComponent } from './combined-query.component'; - -describe('CombinedQueryComponent', () => { - let component: CombinedQueryComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CombinedQueryComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CombinedQueryComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.ts b/src/app/statistic-analysis/combined-query/combined-query.component.ts index 6cb7d81..449ab69 100644 --- a/src/app/statistic-analysis/combined-query/combined-query.component.ts +++ b/src/app/statistic-analysis/combined-query/combined-query.component.ts @@ -21,25 +21,9 @@ export class CombinedQueryComponent implements OnInit { constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar) { } - ngOnInit(): void { - if (window.matchMedia("(max-width: 1400px)").matches) { - this.pcMore = false - this.padMore = true - this.pcfind = false - this.padjt = true - } else { - this.pcfind = true - this.pcMore = true - this.padMore = false - this.padjt = false - } - this.getunitdata(); - this.getOrganizations(); - this.getUnittype(); - this.getAllPlanInfo(); - let level = sessionStorage.getItem("level"); - this.url = window.location.href.substring(window.location.href.length - 1, window.location.href.length) - } + + + private _transformer = (node, level: number) => { //初始化tree return { expandable: !!node.children && node.children.length > 0, @@ -55,398 +39,351 @@ export class CombinedQueryComponent implements OnInit { dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; + + + displayedColumns: string[] = ['组织名称', '总数'];//, 'addtime', 'plantype', 'auditStatus', 'openRange', 'projectlevel', 'operation' - yuanColumns:string[]=['组织名称', '总数']; - allorganizations: any //所有组织机构 - allunittype: any //所有单位类型 - tabledataSource=[] //单位表格数据 - yuanTable=[]//预案表格数据 - excelData:any - url - findTj=0//查询条件 - - preparelevels:Number=0 - pcMore//pc更多 - pcput = false//pc收起 - pcfind//pc查询 - padjt = false - padMore = true//pad收缩控制 - padput = false//pad收起按钮 - imgsrcopen = "../../../assets/images/routdown2.png" - imgsrcdown = "../../../assets/images/routup2.png" - pcInfo() { - this.pcMore = !this.pcMore - this.pcput = !this.pcput - } - padInfo() { - this.padMore = !this.padMore - this.padput = !this.padput - } + yuanColumns: string[] = ['组织名称', '总数']; + + + tabledataSource = [] //单位表格数据 + yuanTable = []//预案表格数据 + excelData: any + findTj = 0//查询条件 + + + allPlanInfo: any //存储所有预案信息 - lable=['单位查询','预案查询'] + lable = ['单位查询', '预案查询'] selected = new FormControl(0); //选项卡实例 //判断选了哪一个 - selectedIndexChange(e){ + selectedIndexChange(e) { + + this.selected.setValue(e) - this.preparelevels=Number(e) + this.preparelevels = Number(e) this.getAllPlanInfo() } + + + + getNowFormatDate() { + var date = new Date(); + var seperator1 = "-"; + var year = date.getFullYear(); + var month: any = date.getMonth() + 1; + var strDate: any = date.getDate(); + if (month >= 1 && month <= 9) { + month = "0" + month; + } + if (strDate >= 0 && strDate <= 9) { + strDate = "0" + strDate; + } + var currentdate = year + seperator1 + month + seperator1 + strDate; + return currentdate; + } + + async ngOnInit(): Promise { + await this.getunitdata(); + await this.getOrganizations(); + await this.getUnittype(); + + this.jscheck = true + this.yuanjscheck = true + this.dwaddtime = '2020-01-01'//单位查询开始时间 + this.dwendtime = this.getNowFormatDate()//单位结束时间 + this.yuanaddtime = '2020-01-01'//预案查询开始时间 + this.yuanendtime = this.getNowFormatDate()//预案查询结束时间 + this.reservePlanType = ['1', '2', '4', '16'] + this.planCategory = ['1', '2', '3', '4', '5'] + this.getAllPlanInfo(); + } + + + //得到当前单位信息 + organizationName: any //当前单位组织机构名称 + organizationId: any //当前单位组织机构id + async getunitdata() { + await new Promise((resolve, reject) => { + this.http.get("/api/Account/Profiles").subscribe( + (data: any) => { + console.log('当前登陆用户信息', data) + resolve(data) + this.organizationName = data.organizationName + this.organizationId = data.organizationId + } + ) + }) + } + + //获得所有组织机构 + allorganizations: any //所有组织机构 + treedata: any //组织机构树型数据 + newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段 + async getOrganizations() { + await new Promise((resolve, reject) => { + this.http.get('/api/Organizations').subscribe( + (data: any) => { + this.allorganizations = data + this.treedata = this.tree.toTree(data); + this.getpresentOrganization(); + resolve(data) + } + ) + }) + } + //得到当前单位所在组织机构的tree型数据 + getpresentOrganization() { + this.newallorganizations = this.allorganizations + this.newallorganizations.forEach(item => { + item.children = [] + this.newallorganizations.forEach(element => { + if (element.parentId == item.id) { + item.children.push(element) + } + }); + }); + if (this.organizationName) { + this.newallorganizations.forEach(item => { + if (item.name == this.organizationName) { + this.dataSource.data = [item] + } + }); + } else { + this.dataSource.data = this.tree.toTree(this.treedata); + } + this.js = this.organizationName + this.jsId = this.organizationId + this.yuanjs = this.organizationName + this.yuanjsId = this.organizationId + } + + //获得所有单位类型 + allunittype: any //所有单位类型 + async getUnittype() { + await new Promise((resolve, reject) => { + this.http.get('/api/BuildingTypes/Simple').subscribe( + (data: any) => { + this.allunittype = data + console.log('单位类型', data) + this.allunittype.forEach(element => { + this.unittype.push(element.id) + }); + resolve(data) + } + ) + }) + + } + //获得所有预案或单位信息 - tableDataNull=false + tableDataNull = false + preparelevels: Number = 0 + companyName: any //单位名称 + + js: any //单位所选组织机构 + jsId: any //单位所选组织机构的id + jscheck: boolean //单位所选组织机构勾选框 + yuanjs: any //预案所选组织机构 + yuanjsId: any //预案所选组织机构的id + yuanjscheck: boolean //预案所选组织机构勾选框 + + dwaddtime//单位查询开始时间 + dwendtime//单位结束时间 + yuanaddtime//预案查询开始时间 + yuanendtime//预案查询结束时间 + + unittype = [] //单位类型 + reservePlanType = [] //预案类型 + preparelevel = [1] //单位状态 + plcheck: boolean //编制级别勾选框 + planCategory = [] //预案级别 + integritySort = 1 //单位排序字段 + yuanintegritySort = 1 //预案排序字段 + isMasklayer = false async getAllPlanInfo() { - /* this.planCategory=new Array(); - this.reservePlanType=new Array(); */ - let paramsdata:any={ - QueryMode:this.preparelevels, - OrganizationId:this.jsId||'', - HasChildren:this.jscheck||'', - TimeIntervalStart:this.dwaddtime||'', - TimeIntervalEnd:this.dwendtime||'', - BuildingTypeIds:this.unittype||[], - CompanyStatuses:this.preparelevel||[], - SortBy:'totalCount', - SortType:this.integritySort + let paramsdata: any = { + QueryMode: this.preparelevels, + OrganizationId: this.jsId || '', + HasChildren: this.jscheck || '', + TimeIntervalStart: this.dwaddtime || '', + TimeIntervalEnd: this.dwendtime || '', + BuildingTypeIds: this.unittype || [], + CompanyStatuses: this.preparelevel || [], + SortBy: 'totalCount', + SortType: this.integritySort } - let yuandata={ - QueryMode:this.preparelevels, - OrganizationId:this.yuanjsId||'', - HasChildren:this.yuanjscheck||'', - TimeIntervalStart:this.yuanaddtime||'', - TimeIntervalEnd:this.yuanendtime||'', - PlanCategories:this.planCategory||[], - PlanTypes:this.reservePlanType||[], - SortBy:'totalCount', - SortType:this.yuanintegritySort + let yuandata = { + QueryMode: this.preparelevels, + OrganizationId: this.yuanjsId || '', + HasChildren: this.yuanjscheck || '', + TimeIntervalStart: this.yuanaddtime || '', + TimeIntervalEnd: this.yuanendtime || '', + PlanCategories: this.planCategory || [], + PlanTypes: this.reservePlanType || [], + SortBy: 'totalCount', + SortType: this.yuanintegritySort } - let result = await new Promise((resolve, reject)=>{ - this.http.get("/api/StatisticsAnalysis/ReportTable", { params:this.preparelevels==0? paramsdata:yuandata }).subscribe((data: any) => { - console.log(data) - this.excelData=data - if(data.length==0){ - this.tableDataNull=true - }else{ - this.tableDataNull=false - if(this.preparelevels==0){ + // console.log(666, paramsdata) + this.isMasklayer = true + let result = await new Promise((resolve, reject) => { + this.http.get("/api/StatisticsAnalysis/ReportTable", { params: this.preparelevels == 0 ? paramsdata : yuandata }).subscribe((data: any) => { + console.log('接口数据', data) + this.excelData = data + if (data.length == 0) { + this.tableDataNull = true + } else { + this.tableDataNull = false + if (this.preparelevels == 0) { //单位查询 - if(this.preparelevel.length==0){ + if (this.preparelevel.length == 0) { //必须选择单位状态 let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 this.snackBar.open('请选择单位状态', '确定', config); - }else{ - this.tabledataSource=[] - this.displayedColumns=['组织名称', '总数'] - data.forEach((element,i,value) => { - this.tabledataSource.push({name:[element.orgName,element.companyStatistics.totalCount]}) - if(value[0].companyStatistics.buildingTypesCounts!=null){ - value[i].companyStatistics.buildingTypesCounts.forEach((build,bi,bvalue) => { - if(i==0){ - this.displayedColumns.push(value[0].companyStatistics.buildingTypesCounts[bi].buildingTypeName) - this.tabledataSource[0].name.push(value[0].companyStatistics.buildingTypesCounts[bi].count) - }else{ - this.tabledataSource[i].name.push(bvalue[bi].count) - } - /* this.tabledataSource.forEach((td,ti,tval)=>{ - tval[ti].name.push(item.count) - }) */ - }); - - } - }); + } else { + this.tabledataSource = [] + this.displayedColumns = ['组织名称', '总数'] + data.forEach((element, i, value) => { + this.tabledataSource.push({ name: [element.orgName, element.companyStatistics.totalCount] }) + if (value[0].companyStatistics.buildingTypesCounts != null) { + value[i].companyStatistics.buildingTypesCounts.forEach((build, bi, bvalue) => { + if (i == 0) { + this.displayedColumns.push(value[0].companyStatistics.buildingTypesCounts[bi].buildingTypeName) + this.tabledataSource[0].name.push(value[0].companyStatistics.buildingTypesCounts[bi].count) + } else { + this.tabledataSource[i].name.push(bvalue[bi].count) + } + /* this.tabledataSource.forEach((td,ti,tval)=>{ + tval[ti].name.push(item.count) + }) */ + }); + + } + }); } } - else if(this.preparelevels==1){ + else if (this.preparelevels == 1) { //预案查询 - this.yuanColumns=['组织名称', '总数'] - this.yuanTable=[{name:[0,0]}] - if(this.planCategory.length!=0){ - this.planCategory.forEach(element=>{ - if(element==1){ + this.yuanColumns = ['组织名称', '总数'] + this.yuanTable = [{ name: [0, 0] }] + if (this.planCategory.length != 0) { + this.planCategory.forEach(element => { + if (element == 1) { this.yuanColumns.push('Ⅰ级') this.yuanTable[0].name.push(0) - }else if(element==2){ + } else if (element == 2) { this.yuanColumns.push('Ⅱ级') this.yuanTable[0].name.push(0) - }else if(element==3){ + } else if (element == 3) { this.yuanColumns.push('Ⅲ级') this.yuanTable[0].name.push(0) - }else if(element==4){ + } else if (element == 4) { this.yuanColumns.push('Ⅳ级') this.yuanTable[0].name.push(0) - }else if(element==5){ + } else if (element == 5) { this.yuanColumns.push('Ⅴ级') this.yuanTable[0].name.push(0) } }) } - if(this.reservePlanType.length!=0){ + if (this.reservePlanType.length != 0) { this.reservePlanType.forEach(element => { - if(element==1){ + if (element == 1) { this.yuanColumns.push('二维') this.yuanTable[0].name.push(0) - }else if(element==2){ + } else if (element == 2) { this.yuanColumns.push('三维') this.yuanTable[0].name.push(0) - }else if(element==4){ + } else if (element == 4) { this.yuanColumns.push('其他') this.yuanTable[0].name.push(0) - }else if(element==16){ + } else if (element == 16) { this.yuanColumns.push('文本') this.yuanTable[0].name.push(0) } }); } - - data.forEach((element,i,value) => { - if(i==0){ - this.yuanTable[0].name[0]=value[0].orgName - this.yuanTable[0].name[1]=value[0].planStatistics.totalCount - }else{ - this.yuanTable.push({name:[value[i].orgName,value[i].planStatistics.totalCount]}) + + data.forEach((element, i, value) => { + if (i == 0) { + this.yuanTable[0].name[0] = value[0].orgName + this.yuanTable[0].name[1] = value[0].planStatistics.totalCount + } else { + this.yuanTable.push({ name: [value[i].orgName, value[i].planStatistics.totalCount] }) } }); - this.yuanTable.forEach((element,i,value)=>{ - if(i>0){ - for(let a=value[i].name.length;a { + if (i > 0) { + for (let a = value[i].name.length; a < value[0].name.length; a++) { value[i].name.push(0) } } }) - this.yuanTable.forEach((yuan,yuani,yuanval)=>{ - this.yuanColumns.forEach((th,thi,thvalu)=>{ - data.forEach((element,i,value) => { + this.yuanTable.forEach((yuan, yuani, yuanval) => { + this.yuanColumns.forEach((th, thi, thvalu) => { + data.forEach((element, i, value) => { //预案级别数据 - if(value[i].planStatistics.planCategoryStatistics!=null){ - value[i].planStatistics.planCategoryStatistics.planCategories.forEach((jibie,ji,jval) => { - if(thvalu[thi].indexOf(jval[ji].planCategoryName)!=-1&&yuani==i){ - yuanval[yuani].name[thi]=jval[ji].count + if (value[i].planStatistics.planCategoryStatistics != null) { + value[i].planStatistics.planCategoryStatistics.planCategories.forEach((jibie, ji, jval) => { + if (thvalu[thi].indexOf(jval[ji].planCategoryName) != -1 && yuani == i) { + yuanval[yuani].name[thi] = jval[ji].count } }); } - if(value[i].planStatistics.planTypeStatistics!=null){ + if (value[i].planStatistics.planTypeStatistics != null) { //预案类型数据 - value[i].planStatistics.planTypeStatistics.planTypes.forEach((planlx,lxi,lxval) => { - if(thvalu[thi].indexOf(lxval[lxi].planTypeName)!=-1&&yuani==i){ - yuanval[yuani].name[thi]=lxval[lxi].count - } - }); + value[i].planStatistics.planTypeStatistics.planTypes.forEach((planlx, lxi, lxval) => { + if (thvalu[thi].indexOf(lxval[lxi].planTypeName) != -1 && yuani == i) { + yuanval[yuani].name[thi] = lxval[lxi].count + } + }); } - + }); }) - + }) } } - //this.tabledataSource=data - - console.log(this.yuanColumns) - console.log(this.yuanTable) - + // console.log(this.yuanColumns) + // console.log(this.yuanTable) + this.isMasklayer = false resolve(this.excelData) } - ) + ) }) - - } - colorRgb(sColor) { - var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/; - var sColor = sColor.toLowerCase(); - if (sColor && reg.test(sColor)) { - if (sColor.length === 4) { - var sColorNew = "#"; - for (var i = 1; i < 4; i += 1) { - sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1)); - } - sColor = sColorNew; - } - //处理六位的颜色值 - var sColorChange = []; - for (var i = 1; i < 7; i += 2) { - sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2))); - } - return sColorChange; - } else { - return sColor; - } - } - colorHex(rgb) { - var _this = rgb; - var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/; - if (/^(rgb|RGB)/.test(_this)) { - var aColor = _this.replace(/(?:(|)|rgb|RGB)*/g, "").split(","); - var strHex = "#"; - for (var i = 0; i < aColor.length; i++) { - var hex: any = Number(aColor[i]).toString(16); - hex = hex < 10 ? 0 + '' + hex : hex;// 保证每个rgb的值为2位 - if (hex === "0") { - hex += hex; - } - strHex += hex; - } - if (strHex.length !== 7) { - strHex = _this; - } - return strHex; - } else if (reg.test(_this)) { - var aNum = _this.replace(/#/, "").split(""); - if (aNum.length === 6) { - return _this; - } else if (aNum.length === 3) { - var numHex = "#"; - for (var i = 0; i < aNum.length; i += 1) { - numHex += (aNum[i] + aNum[i]); - } - return numHex; - } - } else { - return _this; - } } - gradientColor(startColor, endColor, step) { - let _this = this - let startRGB = _this.colorRgb(startColor);//转换为rgb数组模式 - let startR = startRGB[0]; - let startG = startRGB[1]; - let startB = startRGB[2]; - - let endRGB = _this.colorRgb(endColor); - let endR = endRGB[0]; - let endG = endRGB[1]; - let endB = endRGB[2]; - - let sR = (endR - startR) / step;//总差值 - let sG = (endG - startG) / step; - let sB = (endB - startB) / step; - - var colorArr = []; - for (var i = 0; i < step; i++) { - //计算每一步的hex值 - var hex = _this.colorHex('rgb(' + parseInt((sR * i + startR)) + ',' + parseInt((sG * i + startG)) + ',' + parseInt((sB * i + startB)) + ')'); - colorArr.push(hex); - } - return colorArr; - } - integrity(width) { - let _this = this - - let style: any = {} - style.width = width + '%'; - if (width < 30) { - let colorArr = this.gradientColor('#D50000', '#E53935', 30); - for (let i = 0; i < 30; i++) { - if (i == width) { - style.background = colorArr[i] - } - } - } - if (width >= 30 && width < 60) { - let colorArr = this.gradientColor('#FF9800', '#E65100', 30); - for (let i = 30; i < 60; i++) { - if (i == width) { - style.background = colorArr[i - 30] - } - } - } - if (width >= 60) { - let colorArr = this.gradientColor('#81C784', '#2E7D32', 41); - for (let i = 60; i <= 100; i++) { - if (i == width) { - style.background = colorArr[i - 60] - } - } - } - return style - } - integrityDetails(width, zong) { - let style: any = {} - style.width = (width / zong) * 100 + '%'; - return style - } - //得到当前单位信息 - getunitdata() { - this.http.get("/api/Account/Profiles").subscribe( - (data: any) => { - this.organizationName = data.organizationName - } - ) - } - dwaddtime//单位查询开始时间 - dwendtime//单位结束时间 - yuanaddtime//预案查询开始时间 - yuanendtime//预案查询结束时间 + integrityScoreMin//完整度最小值 integrityScoreMax//完整度最大值 - organizationName: any //当前单位组织机构名称 - treedata: any //组织机构树型数据 + + newArr: any = [] - newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段 - //得到当前单位所在组织机构的tree型数据 - getpresentOrganization() { - this.newallorganizations = this.allorganizations - this.newallorganizations.forEach(item => { - item.children = [] - this.newallorganizations.forEach(element => { - if (element.parentId == item.id) { - item.children.push(element) - } - }); - }); - this.http.get("/api/Account/Profiles").subscribe( - (data: any) => { - this.organizationName = data.organizationName - if (this.organizationName) { - this.newallorganizations.forEach(item => { - if (item.name == this.organizationName) { - this.dataSource.data = [item] - } - }); - } else { - this.dataSource.data = this.tree.toTree(this.treedata); - } - } - ) - } - //获得所有组织机构 - getOrganizations() { - this.http.get('/api/Organizations').subscribe( - (data: any) => { - this.allorganizations = data - this.treedata = this.tree.toTree(data); - this.getpresentOrganization(); - } - ) - } - //获得所有单位类型 - getUnittype() { - this.http.get('/api/BuildingTypes/Simple').subscribe( - data => { - this.allunittype = data - } - ) - } + + //辖区中队div是否显示 isorganizationbox: boolean = false //点击辖区中队树，将选择的辖区中队添加到变量 add(node) { this.isorganizationbox = false - if(this.preparelevels==0){ + if (this.preparelevels == 0) { this.js = node.name this.jsId = node.id - }else if(this.preparelevels==1){ - this.yuanjs=node.name - this.yuanjsId=node.id + } else if (this.preparelevels == 1) { + this.yuanjs = node.name + this.yuanjsId = node.id } - + } //关闭辖区中队隐藏框 closeorganizationbox() { @@ -460,108 +397,124 @@ export class CombinedQueryComponent implements OnInit { closediv() { this.isorganizationbox = false } + + + //查询 onSubmit(e) { let config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(this.dwendtimethis.yuanendtime){ + if (this.dwendtime < this.dwaddtime || this.yuanaddtime > this.yuanendtime) { this.snackBar.open('开始时间不能早于结束时间', '确定', config); } this.getAllPlanInfo(); } - companyName: any //单位名称 - js: any //单位所选组织机构 - jsId: any //单位所选组织机构的id - jscheck: boolean //单位所选组织机构勾选框 - yuanjs: any //预案所选组织机构 - yuanjsId: any //预案所选组织机构的id - yuanjscheck: boolean //预案所选组织机构勾选框 - unittype=[] //单位类型 - reservePlanType=[] //预案类型 - preparelevel=[1] //单位状态 - plcheck: boolean //编制级别勾选框 - planCategory=[] //预案级别 - integritySort=1 //单位排序字段 - yuanintegritySort=1 //预案排序字段 + //重置 reset() { - if(this.preparelevels==0){ - this.js = '' - this.jsId = '' - this.jscheck = false + if (this.preparelevels == 0) { + this.js = this.organizationName + this.jsId = this.organizationId + this.jscheck = true this.unittype = [] - this.preparelevel = [0] - this.dwaddtime = '' - this.dwendtime = '' - }else if(this.preparelevels==1){ - this.yuanaddtime='' - this.yuanendtime='' - this.yuanjs='' - this.yuanjsId='' - this.yuanjscheck=false - this.reservePlanType = [] - this.planCategory = [] + this.allunittype.forEach(element => { + this.unittype.push(element.id) + }); + this.preparelevel = [1] + this.dwaddtime = '2020-01-01'//单位查询开始时间 + this.dwendtime = this.getNowFormatDate()//单位结束时间 + } else if (this.preparelevels == 1) { + this.yuanjs = this.organizationName + this.yuanjsId = this.organizationId + this.yuanaddtime = '2020-01-01'//预案查询开始时间 + this.yuanendtime = this.getNowFormatDate()//预案查询结束时间 + this.yuanjscheck = true + this.reservePlanType = ['1', '2', '4', '16'] + this.planCategory = ['1', '2', '3', '4', '5'] } - //重新获取初始化列表 this.getAllPlanInfo(); } - exal(){ - var uri = 'data:application/vnd.ms-excel;base64,', - template = '{table}
    ', - base64 = function(s) { + //进入下一层 + clicktd(key, element) { + // console.log(key) + // console.log(element) + // console.log(this.allorganizations) + if (key == 0) { + this.allorganizations.forEach(item => { + if (element === item.name) { + if (this.preparelevels == 0) { + this.js = element + this.jsId = item.id + } else if (this.preparelevels == 1) { + this.yuanjs = element + this.yuanjsId = item.id + } + this.getAllPlanInfo(); + } + }); + } + + } + + exal() { + var uri = 'data:application/vnd.ms-excel;base64,', + + template = '{table}
    ', - return window.btoa(unescape(encodeURIComponent(s))) + base64 = function (s) { - }, + return window.btoa(unescape(encodeURIComponent(s))) - format = function(s, c) { + }, - return s.replace(/{(\w+)}/g, function(m, p) { + format = function (s, c) { - return c[p]; + return s.replace(/{(\w+)}/g, function (m, p) { - }) + return c[p]; - } + }) - return function(table, name) { + } + + return function (table, name) { - if (!table.nodeType) table = document.getElementById(table); + if (!table.nodeType) table = document.getElementById(table); - var ctx = { + var ctx = { - worksheet: name || 'Worksheet', + worksheet: name || 'Worksheet', - table: table.innerHTML + table: table.innerHTML - }; + }; - window.location.href = uri + base64(format(template, ctx)); + window.location.href = uri + base64(format(template, ctx)); } } - export(){ + export() { const httpOptions = { responseType: 'blob' as 'json' }; - this.http.post(`/api/StatisticsAnalysis/Excel?queryMode=${this.preparelevels}`,this.excelData,httpOptions).subscribe((data:any) => { + this.http.post(`/api/StatisticsAnalysis/Excel?queryMode=${this.preparelevels}`, this.excelData, httpOptions).subscribe((data: any) => { // // 文件名中有中文 则对文件名进行转码 const link = document.createElement('a'); - const blob = new Blob([data], {type: 'application/vnd.ms-excel'}); + const blob = new Blob([data], { type: 'application/vnd.ms-excel' }); link.setAttribute('href', window.URL.createObjectURL(blob)); - link.setAttribute('download', '报表统计'+'.xls'); + link.setAttribute('download', '报表统计' + '.xls'); link.style.visibility = 'hidden'; document.body.appendChild(link); link.click(); document.body.removeChild(link); }) } - + } diff --git a/src/styles.scss b/src/styles.scss index e1d5e9b..c50ff5d 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,26 +1,32 @@ @import "./app/theme.scss"; -@import "./app/ngZorroTree.css"; /* 引入组件样式 */ +@import "./app/ngZorroTree.css"; +/* 引入组件样式 */ // @import "~ng-zorro-antd/style/index.min.css"; /* 引入基本样式 */ -@import "~ng-zorro-antd/tree-select/style/index.min.css"; /* 引入组件样式 */ +@import "~ng-zorro-antd/tree-select/style/index.min.css"; + +/* 引入组件样式 */ @font-face { - font-family: Regular; - src: url("./assets/font/SourceHanSansCN-Regular.otf"); + font-family: Regular; + src: url("./assets/font/SourceHanSansCN-Regular.otf"); } html, body { - touch-action: none; - width: 100%; - height: 100%; - margin: 0 auto; - padding: 0; - overflow: hidden; - font-family: Regular; - textarea { - font-family: Regular; - } - user-select: auto !important; + touch-action: none; + width: 100%; + height: 100%; + margin: 0 auto; + padding: 0; + overflow: hidden; + font-family: Regular; + + textarea { + font-family: Regular; + } + + user-select: auto !important; } + ul, ol, dl, @@ -47,9 +53,10 @@ time, mark, main, canvas { - margin: 0; - padding: 0; + margin: 0; + padding: 0; } + b, strong, i, @@ -60,91 +67,106 @@ h3, h4, h5, h6 { - font-weight: 500; - font-style: normal; + font-weight: 500; + font-style: normal; } + img { - border: none; + border: none; } + a { - text-decoration: none; - color: #000; + text-decoration: none; + color: #000; } + ul, ol, li { - list-style: none; - overflow-x: hidden; + list-style: none; + overflow-x: hidden; } + .clearfn:after { - content: ""; - clear: both; - display: block; - overflow: hidden; - height: 0; - visibility: hidden; + content: ""; + clear: both; + display: block; + overflow: hidden; + height: 0; + visibility: hidden; } //root标签 app-root { - height: 100%; + height: 100%; } + h1 { - font-size: 16px; + font-size: 16px; } + .mat-expansion-panel-body { - padding: 0px !important; + padding: 0px !important; } + .mat-expansion-indicator::after { - color: white; + color: white; } + .example-sidenav .mat-drawer-inner-container { - overflow: hidden; + overflow: hidden; } + table th.mat-header-cell:last-of-type, table td.mat-cell:last-of-type, table td.mat-footer-cell:last-of-type { - padding-right: 0px; + padding-right: 0px; } + .mat-tab-body { - height: 100%; - overflow-y: auto; + height: 100%; + overflow-y: auto; } + .mat-content { - //可展开面板垂直居中 - align-items: center; + //可展开面板垂直居中 + align-items: center; } //滚动条样式 ::-webkit-scrollbar { - width: 5px; - background-color: white; + width: 5px; + background-color: white; } + ::-webkit-scrollbar-thumb { - background-color: #999; + background-color: #999; } //x轴滚动条隐藏 .example-sidenav-content { - overflow-x: hidden; - overflow-y: auto; + overflow-x: hidden; + overflow-y: auto; } .mat-tab-body-wrapper { - height: 100%; + height: 100%; } + .mat-tab-body-content { - overflow: hidden !important; + overflow: hidden !important; } + //gis单位信息tabs样式 #gis { - .mat-tab-label { - height: 38px; - line-height: 38px; - min-width: 80px; - padding: 0; - } + .mat-tab-label { + height: 38px; + line-height: 38px; + min-width: 80px; + padding: 0; + } } + //可展开面板按钮颜色 #gisbasicinfo, #planlist, @@ -153,45 +175,50 @@ table td.mat-footer-cell:last-of-type { #keysite, #functionpartition, #realisticpicture { - .mat-expansion-indicator::after { - color: #333333; - } + .mat-expansion-indicator::after { + color: #333333; + } } + #waitexamineergis { - .mat-expansion-indicator::after { - color: #fff; - } - mat-expansion-panel { - box-shadow: 0 0 black; - border: 1px solid #eef1f5; - } + .mat-expansion-indicator::after { + color: #fff; + } + + mat-expansion-panel { + box-shadow: 0 0 black; + border: 1px solid #eef1f5; + } } + //gis标点弹出框样式 #gispopupbox { - .btn { - width: 92px; - height: 36px; - background: #ffffff; - border: 1px solid #eef1f5; - opacity: 1; - border-radius: 4px; - margin: 0 5px; - font-size: 14px; - // font-family: Source Han Sans CN; - font-weight: 400; - line-height: 36px; - color: #0080ff; - opacity: 1; - cursor: pointer; - display: table-cell; //主要是这个属性 - text-align: center; - img { - vertical-align: middle; - margin-right: 3px; - padding-bottom: 2px; - } - } + .btn { + width: 92px; + height: 36px; + background: #ffffff; + border: 1px solid #eef1f5; + opacity: 1; + border-radius: 4px; + margin: 0 5px; + font-size: 14px; + // font-family: Source Han Sans CN; + font-weight: 400; + line-height: 36px; + color: #0080ff; + opacity: 1; + cursor: pointer; + display: table-cell; //主要是这个属性 + text-align: center; + + img { + vertical-align: middle; + margin-right: 3px; + padding-bottom: 2px; + } + } } + //弹出框样式取消padding #shareDialog, #lookPlanDialog, @@ -202,250 +229,286 @@ table td.mat-footer-cell:last-of-type { #addLinkageForce, #videodialog2, #gisImgDialog { - padding: 0; + padding: 0; } #setPosition, #map { - .custom-content-marker { - position: relative; - width: 29px; - height: 36px; - } - - .custom-content-marker img { - width: 100%; - height: 100%; - } - - .custom-content-marker .btnbox { - position: absolute; - left: -20px; - bottom: -36px; - width: 68px; - height: 30px; - background: #ffffff; - border-radius: 60px; - color: #ebebeb; - display: flex; - justify-content: space-around; - box-sizing: border-box; - padding: 0 5px; - align-items: center; - img { - width: 20px; - height: 20px; - cursor: pointer; - } - } - - .custom-content-marker .close-btn:hover { - background: #666; - } + .custom-content-marker { + position: relative; + width: 29px; + height: 36px; + } + + .custom-content-marker img { + width: 100%; + height: 100%; + } + + .custom-content-marker .btnbox { + position: absolute; + left: -20px; + bottom: -36px; + width: 68px; + height: 30px; + background: #ffffff; + border-radius: 60px; + color: #ebebeb; + display: flex; + justify-content: space-around; + box-sizing: border-box; + padding: 0 5px; + align-items: center; + + img { + width: 20px; + height: 20px; + cursor: pointer; + } + } + + .custom-content-marker .close-btn:hover { + background: #666; + } } + #fireForceTree { - .mat-tree-node { - min-height: 40px; - flex: none; - box-sizing: border-box; - } - .mat-icon-button { - width: 30px; - height: 30px; - line-height: 30px; - } + .mat-tree-node { + min-height: 40px; + flex: none; + box-sizing: border-box; + } + + .mat-icon-button { + width: 30px; + height: 30px; + line-height: 30px; + } } + #linkageForcesSwiper { - .swiper-container { - --swiper-navigation-size: 26px; /* 设置按钮大小 */ - } + .swiper-container { + --swiper-navigation-size: 26px; + /* 设置按钮大小 */ + } } + .KedaPosImg { - width: 30px; - height: 36px; - background-size: 100%; - background: no-repeat center; + width: 30px; + height: 36px; + background-size: 100%; + background: no-repeat center; } + .KedaPosIcon { - width: 30px; - height: 30px; - background-size: 100%; - background: no-repeat center; + width: 30px; + height: 30px; + background-size: 100%; + background: no-repeat center; } + //点聚合自定义图片大小 .clusterImg { - width: 30px; - height: 30px; + width: 30px; + height: 30px; } + //水源采集点聚合 .clusterImgCollection { - width: 30px; - height: 30px; + width: 30px; + height: 30px; } + #unitBasicInfo { - .mat-expansion-indicator::after { - color: black; - } + .mat-expansion-indicator::after { + color: black; + } } + td { - word-break: break-all; + word-break: break-all; } + @media screen and (max-width: 1400px) { - .mat-toolbar-row, - .mat-toolbar-single-row { - height: 50px !important; - } + + .mat-toolbar-row, + .mat-toolbar-single-row { + height: 50px !important; + } } + #firefightingdevicelook, #firefightingdevice { - .expansionheader { - height: auto !important; - } + .expansionheader { + height: auto !important; + } } + #planContainer { - .custom-content-marker { - position: relative; - width: 28px; - height: 28px; - } - - .custom-content-marker img { - width: 100%; - height: 100%; - } - - .custom-content-marker .close-btn { - position: absolute; - top: -6px; - right: -8px; - width: 15px; - height: 15px; - font-size: 12px; - background: #ccc; - border-radius: 50%; - color: #fff; - text-align: center; - line-height: 15px; - box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2); - } - - .custom-content-marker .close-btn:hover { - background: #666; - } + .custom-content-marker { + position: relative; + width: 28px; + height: 28px; + } + + .custom-content-marker img { + width: 100%; + height: 100%; + } + + .custom-content-marker .close-btn { + position: absolute; + top: -6px; + right: -8px; + width: 15px; + height: 15px; + font-size: 12px; + background: #ccc; + border-radius: 50%; + color: #fff; + text-align: center; + line-height: 15px; + box-shadow: -1px 1px 1px rgba(10, 10, 10, 0.2); + } + + .custom-content-marker .close-btn:hover { + background: #666; + } } #setUnitPosition, #setUnitPositionLook { - .custom-content-marker { - position: relative; - // border: 1px solid red; - width: 68px; - height: 68px; - overflow: hidden; - display: flex; - justify-content: center; - .positionimg { - width: 30px; - height: 36px; - } - } - - .custom-content-marker .btnbox { - position: absolute; - left: 0px; - bottom: 0px; - width: 68px; - height: 30px; - background: #ffffff; - border-radius: 60px; - color: #ebebeb; - display: flex; - justify-content: space-around; - box-sizing: border-box; - padding: 0 5px; - align-items: center; - img { - width: 20px; - height: 20px; - cursor: pointer; - } - } - .custom-content-marker .btnbox2 { - position: absolute; - left: 0px; - bottom: 0px; - width: 68px; - height: 30px; - opacity: 0; - border-radius: 60px; - color: #ebebeb; - display: flex; - justify-content: space-around; - box-sizing: border-box; - padding: 0 5px; - align-items: center; - } - - .custom-content-marker .close-btn:hover { - background: #666; - } + .custom-content-marker { + position: relative; + // border: 1px solid red; + width: 68px; + height: 68px; + overflow: hidden; + display: flex; + justify-content: center; + + .positionimg { + width: 30px; + height: 36px; + } + } + + .custom-content-marker .btnbox { + position: absolute; + left: 0px; + bottom: 0px; + width: 68px; + height: 30px; + background: #ffffff; + border-radius: 60px; + color: #ebebeb; + display: flex; + justify-content: space-around; + box-sizing: border-box; + padding: 0 5px; + align-items: center; + + img { + width: 20px; + height: 20px; + cursor: pointer; + } + } + + .custom-content-marker .btnbox2 { + position: absolute; + left: 0px; + bottom: 0px; + width: 68px; + height: 30px; + opacity: 0; + border-radius: 60px; + color: #ebebeb; + display: flex; + justify-content: space-around; + box-sizing: border-box; + padding: 0 5px; + align-items: center; + } + + .custom-content-marker .close-btn:hover { + background: #666; + } } + .mat-paginator-container { - min-height: 40px !important; + min-height: 40px !important; } + #carcontent { - .cartopbox { - nz-tree-select { - width: 81.4%; - margin-right: 22px; - } - .ant-select-selector { - background-color: #f2f4f6; - height: 40px; - border: none; - border-radius: 5px; - padding-top: 5px; - box-sizing: border-box; - width: 104.7%; - } - input{ - height: 40px; - } - - - } - .carTwoItemBox{ - nz-tree-select { - width: 71.6%; - margin-right: 22px; - } - .ant-select-selector { - height: 34px; - border: none; - border-radius: 4px; - border: 1px solid #EBEBEB; - box-sizing: border-box; - padding-top: 1px; - width: 104.9%; - } - } - .carTwoItemBox2,.carTwoItemBox3{ - nz-tree-select { - width: 64.3%; - margin-right: 22px; - } - .ant-select-selector { - height: 34px; - border: none; - border-radius: 4px; - border: 1px solid #EBEBEB; - box-sizing: border-box; - padding-top: 1px; - width: 104.9%; - } - } -} - -.carTreeDropdown{ - max-height: 239px; + .cartopbox { + nz-tree-select { + width: 81.4%; + margin-right: 22px; + } + + .ant-select-selector { + background-color: #f2f4f6; + height: 40px; + border: none; + border-radius: 5px; + padding-top: 5px; + box-sizing: border-box; + width: 104.7%; + } + + input { + height: 40px; + } + + + } + + .carTwoItemBox { + nz-tree-select { + width: 71.6%; + margin-right: 22px; + } + + .ant-select-selector { + height: 34px; + border: none; + border-radius: 4px; + border: 1px solid #EBEBEB; + box-sizing: border-box; + padding-top: 1px; + width: 104.9%; + } + } + + .carTwoItemBox2, + .carTwoItemBox3 { + nz-tree-select { + width: 64.3%; + margin-right: 22px; + } + + .ant-select-selector { + height: 34px; + border: none; + border-radius: 4px; + border: 1px solid #EBEBEB; + box-sizing: border-box; + padding-top: 1px; + width: 104.9%; + } + } +} + +.carTreeDropdown { + max-height: 239px; +} + + +#combinedQuery { + .mat-tab-body-content { + display: flex; + flex-direction: column; + + } }