From 3b7566b50e2881fccccb0e354a05e983019a5798 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Mon, 17 Jan 2022 10:18:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=9F=E8=AE=A1=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BB=A5=E5=8F=8A=E7=B3=BB=E7=BB=9F=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=94=BE=E5=BC=80=E7=94=B5=E8=AF=9D=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E7=AD=89=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entry-plan-look.component.ts | 3 +- .../add-unit-one/add-unit-one.component.ts | 2 +- .../add-unit-two-time.component.ts | 2 +- .../add-unit-two-type-statistics.component.ts | 3 +- .../scheduled-updates.component.ts | 30 ++++++++++++------- .../state/page-one/page-one.component.ts | 6 ++-- src/app/ui/usermanagement/editUser.html | 6 ++-- 7 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 6c963a1..58fb14f 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -1599,6 +1599,7 @@ export class ChangeUrl{ this.dialogRef.close(); } onSubmit(value) { + console.log(value) let headers = new HttpHeaders({ 'Content-Type': 'text/json' }); @@ -1606,7 +1607,7 @@ export class ChangeUrl{ headers }; let body = { - url: value.url, + url: value.name, auditStatus:8 } this.http.put(`/api/PlanComponents/${this.data.element.id}`, body, options).subscribe(data => { diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index 32e38a2..0003d87 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -205,7 +205,7 @@ export class AddUnitOneComponent implements OnInit { countall+=this.tishiData[i].count } this.res= '
'+datas.name+'
' - this.res+='
'; + this.res+='
'; this.res+=''; this.res+=''; this.res+='' diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts index c427fd1..371ffa8 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts @@ -138,7 +138,7 @@ export class AddUnitTwoTimeComponent implements OnInit { let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59 for(var i=0;i=e.selectStartYear&&this.tabledata[0][i].year<=e.selectEndYear){ - this.date2.push(this.tabledata[0][i].month) + this.date2.push(this.tabledata[0][i].year) this.dateNum2.push(this.tabledata[0][i].count) this.zongcount=this.zongcount+this.tabledata[0][i].count } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index 2392957..0c678c5 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts @@ -442,10 +442,11 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { item.echart.setOption(option); item.echart.getZr().on('click', (params) => { const pointInPixel= [params.offsetX, params.offsetY]; + console.log(this.data.level) if (item.echart.containPixel('grid',pointInPixel)){ let xIndex=item.echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; if(this.zhiorbuild=='zhi'){ - if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>1){ + if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>=1){ //总队，支队跳转 this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex],'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts index 13c6c96..70ea367 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts @@ -517,7 +517,7 @@ export class verifiedComponent implements OnInit { tishiData res tableTooltip(datas){ - this.tishiData=this.tabledata[0].items[0].organizations + this.tishiData=this.echartsData.zhiorBuinding=='zhi'? this.tabledata[0].items[0].organizations:this.tabledata[0].items[0].buildingTypes var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 @@ -655,11 +655,11 @@ export class verifiedComponent implements OnInit { this.echartsData.findShow=false //this.echartsData.scheduledUpdatesToggle = -2 - if(this.echartsData.level=='0'&&this.tabledata[0].items[xIndex].organizations.length>=1){ + if(this.echartsData.level=='0'&&this.tabledata[0].items[xIndex].buildingTypes.length>=1){ this.echartsData.scheduledUpdatesToggle = 2 //this.echartsData.time=xIndex //this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${this.route.snapshot.queryParams.type}&TimeType=${this.TimeType}`); - }else if(this.echartsData.level=='1' &&this.tabledata[0].items[xIndex].organizations.length>=1){ + }else if(this.echartsData.level=='1' &&this.tabledata[0].items[xIndex].buildingTypes.length>=1){ this.echartsData.scheduledUpdatesToggle = 2//原来是3 } }else{ @@ -865,12 +865,22 @@ export class yueDateComponent implements OnInit { this.zhiNameData=[] this.ynum=[] this.organizationId=[] - this.tabledata[0].items[0].organizations.forEach(element => { - this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) - this.ynum.push(element.count) - this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) - //this.ydatayue.push(element.count) - }); + if(this.echartsData.zhiorBuinding=='zhi'){ + this.tabledata[0].items[0].organizations.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + }else{ + this.tabledata[0].items[0].buildingTypes.forEach(element => { + this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName) + this.ynum.push(element.count) + this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId) + //this.ydatayue.push(element.count) + }); + } + this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.ynum,this.zhiNameData) this.twoInit() }else{ @@ -932,7 +942,7 @@ export class yueDateComponent implements OnInit { this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp'); var option = { title: { - text:this.router.snapshot.queryParams.pieid=='pieTwo'?'': this.echartsData.scheduledUpdatesXName+`已核查总数:(${this.tabledata[0].totalCount})`, + text:this.router.snapshot.queryParams.pieid=='pieTwo'?`已核查总数:(${this.tabledata[0].totalCount})`: this.echartsData.scheduledUpdatesXName+`已核查总数:(${this.tabledata[0].totalCount})`, top: -4, left: '35%', textStyle:{ diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts index 6fd7db3..deb5e63 100644 --- a/src/app/statistic-analysis/state/page-one/page-one.component.ts +++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts @@ -109,13 +109,13 @@ export class PageOneComponent implements OnInit { if(array[index].planStatusName=='New'){ this.planStatusesData.push({name:'预案新增',value:array[index].count,type:1,planStatusName:array[index].planStatusName}) }else if(array[index].planStatusName=='Auditing'){ - this.planStatusesData.push({name:'预案审核通过',value:array[index].count,type:3,planStatusName:array[index].planStatusName}) + this.planStatusesData.push({name:'预案审核中',value:array[index].count,type:3,planStatusName:array[index].planStatusName}) }else if(array[index].planStatusName=='Approved'){ - this.planStatusesData.push({name:'预案编制',value:array[index].count,type:5,planStatusName:array[index].planStatusName}) + this.planStatusesData.push({name:'预案审核通过',value:array[index].count,type:5,planStatusName:array[index].planStatusName}) }else if(array[index].planStatusName=='Rejected'){ this.planStatusesData.push({name:'预案审核退回',value:array[index].count,type:4,planStatusName:array[index].planStatusName}) }else if(array[index].planStatusName=='Editing'){ - this.planStatusesData.push({name:'预案审核中',value:array[index].count,type:2,planStatusName:array[index].planStatusName}) + this.planStatusesData.push({name:'预案编制',value:array[index].count,type:2,planStatusName:array[index].planStatusName}) } }); } diff --git a/src/app/ui/usermanagement/editUser.html b/src/app/ui/usermanagement/editUser.html index 62202bf..fd7b331 100644 --- a/src/app/ui/usermanagement/editUser.html +++ b/src/app/ui/usermanagement/editUser.html @@ -11,13 +11,13 @@
- +
- +
@@ -29,7 +29,7 @@
-
名称数量