Browse Source

[完善]清除打印信息

zhuzhou
邵佳豪 4 years ago
parent
commit
764a1bc5d2
  1. 10
      src/app/data-collection/fire-force/fire-force.component.ts
  2. 4
      src/app/data-collection/linkage-forces/linkage-forces.component.ts
  3. 6
      src/app/data-collection/water-collection/water-collection.component.ts
  4. 4
      src/app/key-unit/know-route/know-route.component.ts
  5. 2
      src/app/key-unit/training-recordinfo/training-recordinfo.component.ts
  6. 4
      src/app/key-unit/water-road/water-road.component.ts
  7. 6
      src/app/pages/homedetail/homedetail.component.ts
  8. 8
      src/app/plan-audit/plan-record/plan-record.component.ts
  9. 12
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  10. 4
      src/app/plan-management/maintain-up/maintain-up.component.ts
  11. 2
      src/app/plan-management/meet-plan/meet-plan.component.ts
  12. 4
      src/app/plan-management/open-plan/open-plan.component.ts
  13. 8
      src/app/plan-management/pass-plan/pass-plan.component.ts
  14. 4
      src/app/plan-management/reinforce-plan/reinforce-plan.component.ts
  15. 2
      src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts
  16. 2
      src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
  17. 8
      src/app/statistic-analysis/echarts-data.service.ts
  18. 4
      src/app/statistic-analysis/state/page-one/page-one.component.ts
  19. 2
      src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts
  20. 2
      src/app/statistic-analysis/state/page-there/page-there.component.ts
  21. 4
      src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts
  22. 2
      src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts
  23. 2
      src/app/tabbar/tabbar.component.ts
  24. 1
      src/app/ui/navmenus/navmenus.component.ts
  25. 10
      src/app/ui/organization/organization.component.ts
  26. 16
      src/app/ui/usermanagement/usermanagement.component.ts

10
src/app/data-collection/fire-force/fire-force.component.ts

@ -311,7 +311,7 @@ export class FireForceComponent implements OnInit {
this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => { this.http.get(`/api/FireForceDetail/${type}/${node.id}`).subscribe((data:any) => {
this.isMasklayer = false this.isMasklayer = false
this.FireForceDetailInfo = data this.FireForceDetailInfo = data
console.log(888,data) // console.log(888,data)
if(data.location && data.location.x){//如果已经标注单位坐标 if(data.location && data.location.x){//如果已经标注单位坐标
this.positionLngLat = data.location this.positionLngLat = data.location
this.map.setCenter([data.location.x,data.location.y]); this.map.setCenter([data.location.x,data.location.y]);
@ -416,7 +416,7 @@ export class FireForceComponent implements OnInit {
//删除某条消防队 //删除某条消防队
deleteFireForce(item,e){ deleteFireForce(item,e){
e.stopPropagation() e.stopPropagation()
console.log(this.dataSource.data) // console.log(this.dataSource.data)
let isDelete = window.confirm(`确定要删除${item.name}`) let isDelete = window.confirm(`确定要删除${item.name}`)
if(isDelete){ if(isDelete){
// this.http.delete(`/api/CustomFireForce/${item.id}`).subscribe(data => { // this.http.delete(`/api/CustomFireForce/${item.id}`).subscribe(data => {
@ -647,7 +647,7 @@ export class FireForceComponent implements OnInit {
} }
this.FireForceDetailInfo.jurisdictionArea = Number(this.FireForceDetailInfo.jurisdictionArea) this.FireForceDetailInfo.jurisdictionArea = Number(this.FireForceDetailInfo.jurisdictionArea)
this.FireForceDetailInfo.relevantInfomationData = JSON.stringify(this.AttachmentArr) this.FireForceDetailInfo.relevantInfomationData = JSON.stringify(this.AttachmentArr)
console.log(1111,this.FireForceDetailInfo) // console.log(1111,this.FireForceDetailInfo)
//如果是总支大中 //如果是总支大中
this.FireForceDetailInfo.location = {x:'',y:''} this.FireForceDetailInfo.location = {x:'',y:''}
if(this.atLastPositionLngLat.x){ if(this.atLastPositionLngLat.x){
@ -674,7 +674,7 @@ export class FireForceComponent implements OnInit {
this.FireForceDetailInfo.contactData = JSON.stringify(this.DaZhongcontactData) this.FireForceDetailInfo.contactData = JSON.stringify(this.DaZhongcontactData)
this.FireForceDetailInfo.dutyForceData = null this.FireForceDetailInfo.dutyForceData = null
} }
console.log('body',body) // console.log('body',body)
this.http.put(`/api/FireForceDetail/0/${this.selectedFireForce.id}`,body).subscribe(data => { this.http.put(`/api/FireForceDetail/0/${this.selectedFireForce.id}`,body).subscribe(data => {
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
@ -745,7 +745,7 @@ export class FireForceComponent implements OnInit {
submitAudit(){ submitAudit(){
let isTrue = window.confirm('请确认保存后提交审核,否则将无法审核最新内容,是否继续?') let isTrue = window.confirm('请确认保存后提交审核,否则将无法审核最新内容,是否继续?')
if(isTrue){ if(isTrue){
console.log('提交审核的消防力量',this.FireForceDetailInfo) // console.log('提交审核的消防力量',this.FireForceDetailInfo)
let body = { let body = {
title: this.FireForceDetailInfo.stationName, title: this.FireForceDetailInfo.stationName,
operation: this.selectedFireForce.contentVerify ? 1 : 0,//操作方式 operation: this.selectedFireForce.contentVerify ? 1 : 0,//操作方式

4
src/app/data-collection/linkage-forces/linkage-forces.component.ts

@ -81,7 +81,7 @@ export class LinkageForcesComponent implements OnInit {
createMarker(list){ createMarker(list){
let markerArrcluster = [] let markerArrcluster = []
this.cluster ? this.cluster.setData([]) : null this.cluster ? this.cluster.setData([]) : null
console.log(678,list) // console.log(678,list)
list.forEach((item) => { list.forEach((item) => {
let image let image
if(item.linkageForceType == 0){//消火栓 if(item.linkageForceType == 0){//消火栓
@ -175,7 +175,7 @@ export class LinkageForcesComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.getAllFireForce() this.getAllFireForce()
setTimeout(() => { setTimeout(() => {
console.log(document.documentElement.clientWidth) // console.log(document.documentElement.clientWidth)
let slidesPerView let slidesPerView
if(document.documentElement.clientWidth < 1400){ if(document.documentElement.clientWidth < 1400){
slidesPerView = 5 slidesPerView = 5

6
src/app/data-collection/water-collection/water-collection.component.ts

@ -119,7 +119,7 @@ export class WaterCollectionComponent implements OnInit {
this.cluster.on('click',(e)=>{ this.cluster.on('click',(e)=>{
if(e.clusterData.length == 1){ if(e.clusterData.length == 1){
let item = e.clusterData[0].data let item = e.clusterData[0].data
console.log(item) // console.log(item)
this.selectedLiIndex = null this.selectedLiIndex = null
this.clearData() this.clearData()
this.selectedWaterTypeIndex = item.waterSourceType//点击的水源类型 this.selectedWaterTypeIndex = item.waterSourceType//点击的水源类型
@ -134,7 +134,7 @@ export class WaterCollectionComponent implements OnInit {
} }
ngOnInit(): void { ngOnInit(): void {
console.log(88888,navigator.userAgent) // console.log(88888,navigator.userAgent)
this.getAllWaterData() this.getAllWaterData()
setTimeout(() => { setTimeout(() => {
this.createMap() this.createMap()
@ -448,7 +448,7 @@ export class WaterCollectionComponent implements OnInit {
this.waterData.location.x = this.atLastPositionLngLat.x this.waterData.location.x = this.atLastPositionLngLat.x
this.waterData.location.y = this.atLastPositionLngLat.y this.waterData.location.y = this.atLastPositionLngLat.y
} }
console.log(666,this.waterData) // console.log(666,this.waterData)
this.http.put(`/api/WaterSources/${this.waterData.id}`,this.waterData).subscribe(data => { this.http.put(`/api/WaterSources/${this.waterData.id}`,this.waterData).subscribe(data => {
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';

4
src/app/key-unit/know-route/know-route.component.ts

@ -85,11 +85,11 @@ export class KnowRouteComponent implements OnInit {
this.isspinner = false this.isspinner = false
this.imgUrl = data.objectName this.imgUrl = data.objectName
this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299` this.imgsrc = `/api/Objects/PlanPlatform/${this.imgUrl}?x-oss-process=image/resize,m_fill,h_170,w_299`
console.log(this.imgsrc) // console.log(this.imgsrc)
this.uploadSucced[this.chooseid].src=this.imgsrc this.uploadSucced[this.chooseid].src=this.imgsrc
this.inputShow=false this.inputShow=false
console.log(this.uploadSucced) // console.log(this.uploadSucced)
const config = new MatSnackBarConfig(); const config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000

2
src/app/key-unit/training-recordinfo/training-recordinfo.component.ts

@ -19,7 +19,7 @@ export class TrainingRecordinfoComponent implements OnInit {
} }
} }
onCustom($event){ onCustom($event){
console.log($event);//data from child // console.log($event);//data from child
this.tabsSelectedIndex = 1 this.tabsSelectedIndex = 1
} }
selectedtab(e){ selectedtab(e){

4
src/app/key-unit/water-road/water-road.component.ts

@ -128,9 +128,9 @@ export class WaterRoadComponent implements OnInit {
Distance : Distance, Distance : Distance,
WaterSourceTypes :this.selectedWaterList WaterSourceTypes :this.selectedWaterList
} }
console.log('paramsdata',paramsdata) // console.log('paramsdata',paramsdata)
this.http.get("/api/WaterSources",{params:paramsdata}).subscribe((data:any) => { this.http.get("/api/WaterSources",{params:paramsdata}).subscribe((data:any) => {
console.log('所有水源',data) // console.log('所有水源',data)
this.createwaterMarker(data.items) this.createwaterMarker(data.items)
}) })
} }

6
src/app/pages/homedetail/homedetail.component.ts

@ -470,11 +470,11 @@ export class HomedetailComponent implements OnInit {
this.chartYalxtj = echarts.init(this.element.nativeElement.querySelector('#chartYalxtj'),'skinUpp'); this.chartYalxtj = echarts.init(this.element.nativeElement.querySelector('#chartYalxtj'),'skinUpp');
this.chartYalxtj.setOption(this.chartYalxtjOption); this.chartYalxtj.setOption(this.chartYalxtjOption);
this.chartMap = echarts.init(this.element.nativeElement.querySelector('#chartMap')); this.chartMap = echarts.init(this.element.nativeElement.querySelector('#chartMap'));
console.log(this.chartMapOption) // console.log(this.chartMapOption)
this.chartMap.setOption(this.chartMapOption); this.chartMap.setOption(this.chartMapOption);
this.mapInit() //初始化地图 this.mapInit() //初始化地图
}, 0); }, 0);
console.log(echarts) // console.log(echarts)
} }
mapInit () { mapInit () {
@ -553,7 +553,7 @@ export class HomedetailComponent implements OnInit {
// //切换聚焦区域 // //切换聚焦区域
// switch2AreaNode(props.adcode); // switch2AreaNode(props.adcode);
// // } // // }
console.log(props) // console.log(props)
}); });

8
src/app/plan-audit/plan-record/plan-record.component.ts

@ -146,7 +146,7 @@ export class PlanRecordComponent implements OnInit {
tableClick(e,item){ tableClick(e,item){
this.showtype = -1 this.showtype = -1
//e.target.parentElement.bgColor='#2196F3' //e.target.parentElement.bgColor='#2196F3'
console.log(item) // console.log(item)
this.organizationName='' this.organizationName=''
this.itemid=item.itemId this.itemid=item.itemId
this.id=item.id this.id=item.id
@ -171,7 +171,7 @@ export class PlanRecordComponent implements OnInit {
}else{ }else{
this.postlevel = data.level this.postlevel = data.level
} }
console.log('xxx',data) // console.log('xxx',data)
data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null} data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null}
this.fireForceDetailInfo = data.fireForceDetailInfo this.fireForceDetailInfo = data.fireForceDetailInfo
this.showtype = 13 this.showtype = 13
@ -289,7 +289,7 @@ export class PlanRecordComponent implements OnInit {
this.compantData={name:'',buildingTypes:[],address:''} this.compantData={name:'',buildingTypes:[],address:''}
this.planType = this.planData.planMode this.planType = this.planData.planMode
let data = this.planData let data = this.planData
console.log(data) // console.log(data)
if(data.planType==1){ if(data.planType==1){
this.twoOrthree=2 this.twoOrthree=2
}else if(data.planType==2){ }else if(data.planType==2){
@ -338,7 +338,7 @@ export class PlanRecordComponent implements OnInit {
export class recordshow3D{ export class recordshow3D{
constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef<recordshow3D>,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {} constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef<recordshow3D>,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) // console.log(this.data)
this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity) this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity)
} }
threedUrl threedUrl

12
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

@ -104,7 +104,7 @@ export class EntryPlanLookComponent implements OnInit {
//查看预案 //查看预案
lookPlan(e){ lookPlan(e){
if(e.planMode == 0){ if(e.planMode == 0){
console.log(e.attachmentUrls) // console.log(e.attachmentUrls)
var index=e.attachmentUrls[0].indexOf("\/") var index=e.attachmentUrls[0].indexOf("\/")
if(e.attachmentUrls[0].substr(0,index)=='psw'){ if(e.attachmentUrls[0].substr(0,index)=='psw'){
const dialogRef = this.dialog.open(PsViewer, { const dialogRef = this.dialog.open(PsViewer, {
@ -567,7 +567,7 @@ export class AddPlanone {
let file = this.file || null //获取上传的文件 let file = this.file || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小 let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片 let shardSize = 5 * 1024 * 1024 //5MB一个分片
console.log(this.psw) // console.log(this.psw)
if (file && fileSize<=shardSize) { //上传文件<=5MB时 if (file && fileSize<=shardSize) { //上传文件<=5MB时
let formData = new FormData() let formData = new FormData()
@ -972,9 +972,9 @@ export class AddPlanone {
} }
} }
onSubmit2(value){ onSubmit2(value){
console.log(this.webaddress) // console.log(this.webaddress)
var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*') var reg = new RegExp('(http|https):\/\/([\w.!@#$%^&*()_+-=])*\s*')
  console.log(reg.test(this.webaddress)) //console.log(reg.test(this.webaddress))
} }
} }
@ -1021,7 +1021,7 @@ export class DownloadFile {
//点击想要下载的文件 //点击想要下载的文件
addurl(item,key){ addurl(item,key){
console.log(item,key) // console.log(item,key)
this.selectedFileIndex = key this.selectedFileIndex = key
this.selectedFileData = item this.selectedFileData = item
} }
@ -1099,7 +1099,7 @@ export class ChangeName {
export class PsViewer{ export class PsViewer{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<PsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {} constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<PsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) // console.log(this.data)
const viewer = new Viewer({ const viewer = new Viewer({
container: document.querySelector('#viewer'), container: document.querySelector('#viewer'),
panorama:'/api/Objects/PlanPlatform/'+ this.data, panorama:'/api/Objects/PlanPlatform/'+ this.data,

4
src/app/plan-management/maintain-up/maintain-up.component.ts

@ -458,7 +458,7 @@ export class MaintainUpComponent implements OnInit {
//勾选框事件 //勾选框事件
verifyState //判断是否可以修改 verifyState //判断是否可以修改
checkChange(e,element){ checkChange(e,element){
console.log(element) // console.log(element)
if(element.contentVerify!=null){ if(element.contentVerify!=null){
this.verifyState=element.contentVerify.verifyState this.verifyState=element.contentVerify.verifyState
}else{ }else{
@ -567,7 +567,7 @@ export class MaintainUpComponent implements OnInit {
if(selectedunitArr.length == 1){ //带着id跳到删除页面 if(selectedunitArr.length == 1){ //带着id跳到删除页面
let isTrue = confirm('您确定要删除吗') let isTrue = confirm('您确定要删除吗')
if(isTrue){ if(isTrue){
console.log(selectedunitArr) // console.log(selectedunitArr)
let body = { let body = {
// title: item.name, // title: item.name,
operation: 2,//删除操作方式 operation: 2,//删除操作方式

2
src/app/plan-management/meet-plan/meet-plan.component.ts

@ -452,7 +452,7 @@ export class newunitMeet{
planType:16, planType:16,
attachmentUrls:[`${this.objectName}`] attachmentUrls:[`${this.objectName}`]
} }
console.log(body) // console.log(body)
this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{ this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{
this.snackBar.open('创建成功!','确定',config); this.snackBar.open('创建成功!','确定',config);
//console.log(data) //console.log(data)

4
src/app/plan-management/open-plan/open-plan.component.ts

@ -194,7 +194,7 @@ export class OpenPlanComponent implements OnInit {
/* sessionStorage.setItem("companyName",element.companyName) /* sessionStorage.setItem("companyName",element.companyName)
window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6&planType=2`); */ window.open(`/planAudit/planpass?id=${element.companyId}&companyName=${element.companyName}&auditPlanId=${element.id}&auditStatus=${element.auditStatus}&type=6&planType=2`); */
console.log(e) // console.log(e)
if(e.planMode == 0||e.planMode == 1){ if(e.planMode == 0||e.planMode == 1){
//console.log(e.attachmentUrls) //console.log(e.attachmentUrls)
var index=e.attachmentUrls[0].indexOf("\/") var index=e.attachmentUrls[0].indexOf("\/")
@ -319,7 +319,7 @@ export class OpenPlanComponent implements OnInit {
export class GkhtmlPsViewer{ export class GkhtmlPsViewer{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<GkhtmlPsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {} constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<GkhtmlPsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) // console.log(this.data)
const viewer = new Viewer({ const viewer = new Viewer({
container: document.querySelector('#viewer'), container: document.querySelector('#viewer'),
panorama:'/api/Objects/PlanPlatform/'+ this.data, panorama:'/api/Objects/PlanPlatform/'+ this.data,

8
src/app/plan-management/pass-plan/pass-plan.component.ts

@ -321,7 +321,7 @@ export class PassPlanComponent implements OnInit {
} }
//查看单位信息 //查看单位信息
lookUnitInfo(element){ lookUnitInfo(element){
console.log(element) // console.log(element)
// const dialogRef = this.dialog.open(UnitInfo, { // const dialogRef = this.dialog.open(UnitInfo, {
// width: '1500px', // width: '1500px',
// height:'800px' // height:'800px'
@ -335,7 +335,7 @@ export class PassPlanComponent implements OnInit {
//跳转查看预案页面 审核通过预案 //跳转查看预案页面 审核通过预案
routerTo(e){ routerTo(e){
console.log(e) // console.log(e)
if(e.planMode == 0||e.planMode == 1){ if(e.planMode == 0||e.planMode == 1){
//console.log(e.attachmentUrls) //console.log(e.attachmentUrls)
var index=e.attachmentUrls[0].indexOf("\/") var index=e.attachmentUrls[0].indexOf("\/")
@ -485,7 +485,7 @@ export class PassPlanComponent implements OnInit {
export class GkPsViewer{ export class GkPsViewer{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<GkPsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {} constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<GkPsViewer>,@Inject(MAT_DIALOG_DATA) public data: any) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) // console.log(this.data)
const viewer = new Viewer({ const viewer = new Viewer({
container: document.querySelector('#viewer'), container: document.querySelector('#viewer'),
panorama:'/api/Objects/PlanPlatform/'+ this.data, panorama:'/api/Objects/PlanPlatform/'+ this.data,
@ -503,6 +503,6 @@ export class GkPsViewer{
export class UnitInfo{ export class UnitInfo{
constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<UnitInfo>,@Inject(MAT_DIALOG_DATA) public data: any) {} constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<UnitInfo>,@Inject(MAT_DIALOG_DATA) public data: any) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) // console.log(this.data)
} }
} }

4
src/app/plan-management/reinforce-plan/reinforce-plan.component.ts

@ -130,7 +130,7 @@ export class ReinforcePlanComponent implements OnInit {
Sort: '' Sort: ''
} }
this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{ this.http.get("/api/ApprovedPlans/GetReinforcementPlanComponents",{params:paramsdata}).subscribe((data:any)=>{
console.log('增援预案列表',data) // console.log('增援预案列表',data)
this.length = data.totalCount this.length = data.totalCount
this.allPlanInfo = data this.allPlanInfo = data
this.tabledataSource = data.items this.tabledataSource = data.items
@ -232,7 +232,7 @@ export class ReinforcePlanComponent implements OnInit {
//查看预案 //查看预案
openPlan(e){ openPlan(e){
console.log(e) // console.log(e)
let id = e.id let id = e.id
sessionStorage.setItem("planId",id) sessionStorage.setItem("planId",id)
sessionStorage.setItem("companyId",e.companyId) sessionStorage.setItem("companyId",e.companyId)

2
src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts

@ -175,7 +175,7 @@ export class AddUnitTwoTimeComponent implements OnInit {
await this.serviceData.getData(this.zhiorbuild=="zhi"?parbuild:parzhi,`/api/StatisticsAnalysis/Trends`) await this.serviceData.getData(this.zhiorbuild=="zhi"?parbuild:parzhi,`/api/StatisticsAnalysis/Trends`)
this.setTimeoutObj = window.setTimeout(() => { this.setTimeoutObj = window.setTimeout(() => {
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].length;i++){ for(var i=0;i<this.tabledata[0].length;i++){
this.dateNum2.push(this.tabledata[0][i].count) this.dateNum2.push(this.tabledata[0][i].count)
this.zongcount=this.zongcount+this.tabledata[0][i].count this.zongcount=this.zongcount+this.tabledata[0][i].count

2
src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts

@ -46,7 +46,7 @@ export class BuildingTypeOneComponent implements OnInit {
location.reload(); location.reload();
} }
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].buildingTypes.length;i++){ for(var i=0;i<this.tabledata[0].buildingTypes.length;i++){
this.lengthdata.push(this.tabledata[0].buildingTypes[i].buildingTypeName) this.lengthdata.push(this.tabledata[0].buildingTypes[i].buildingTypeName)
this.count=this.count+this.tabledata[0].buildingTypes[i].count this.count=this.count+this.tabledata[0].buildingTypes[i].count

8
src/app/statistic-analysis/echarts-data.service.ts

@ -415,7 +415,7 @@ export class EchartsDataService {
this.tishiData=this.obdata[0].buildingTypes[a].organizations this.tishiData=this.obdata[0].buildingTypes[a].organizations
} }
} }
console.log(this.tishiData) // console.log(this.tishiData)
var countall=0//总计 var countall=0//总计
var countbi=0//站比 var countbi=0//站比
var allCountbi=0//总站比 var allCountbi=0//总站比
@ -447,14 +447,14 @@ export class EchartsDataService {
//支队表格提示 //支队表格提示
biaogeTishida(datas){ biaogeTishida(datas){
console.log(datas) // console.log(datas)
this.tishiData='' this.tishiData=''
for(var a in this.obdata[0].organizations){ for(var a in this.obdata[0].organizations){
if(this.obdata[0].organizations[a].organizationName==datas.name){ if(this.obdata[0].organizations[a].organizationName==datas.name){
this.tishiData=this.obdata[0].organizations[a].subOrganizations this.tishiData=this.obdata[0].organizations[a].subOrganizations
} }
} }
console.log(this.tishiData) // console.log(this.tishiData)
var countall=0//总计 var countall=0//总计
var countbi=0//站比 var countbi=0//站比
var allCountbi=0//总站比 var allCountbi=0//总站比
@ -566,7 +566,7 @@ export class EchartsDataService {
}) })
this.allDate.push(result) this.allDate.push(result)
this.obdata=JSON.parse(JSON.stringify(this.allDate)) this.obdata=JSON.parse(JSON.stringify(this.allDate))
console.log(this.obdata) // console.log(this.obdata)
} }
selectType=0//选择年月 selectType=0//选择年月

4
src/app/statistic-analysis/state/page-one/page-one.component.ts

@ -55,7 +55,7 @@ export class PageOneComponent implements OnInit {
indexData indexData
initCharts(){ initCharts(){
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
var ec = echarts as any; var ec = echarts as any;
this.indexBzt = ec.init(document.getElementById('indexBzt'),'walden'); this.indexBzt = ec.init(document.getElementById('indexBzt'),'walden');
@ -126,7 +126,7 @@ export class PageOneComponent implements OnInit {
] ]
}; };
this.indexBzt.on('click', (params) => { this.indexBzt.on('click', (params) => {
console.log(params) // console.log(params)
for(var i=0;i<this.tabledata[0].plansStatuses.length;i++){ for(var i=0;i<this.tabledata[0].plansStatuses.length;i++){
if(this.tabledata[0].plansStatuses[i].planStatusName==params.data.planStatusName){ if(this.tabledata[0].plansStatuses[i].planStatusName==params.data.planStatusName){
if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.tabledata[0].plansStatuses[i].organizations.length>0){ if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.tabledata[0].plansStatuses[i].organizations.length>0){

2
src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts

@ -49,7 +49,7 @@ export class PageThereYearComponent implements OnInit {
} }
await this.serviceData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) await this.serviceData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)
this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].length;i++){ for(var i=0;i<this.tabledata[0].length;i++){
this.date.push(this.tabledata[0][i].month) this.date.push(this.tabledata[0][i].month)
this.dateNum.push(this.tabledata[0][i].count) this.dateNum.push(this.tabledata[0][i].count)

2
src/app/statistic-analysis/state/page-there/page-there.component.ts

@ -64,7 +64,7 @@ export class PageThereComponent implements OnInit {
} }
await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Plans/Status`) await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Plans/Status`)
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){ for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhiNameData.push(this.tabledata[0].organizations[i].organizationName) this.zhiNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhiNumData.push(this.tabledata[0].organizations[i].count) this.zhiNumData.push(this.tabledata[0].organizations[i].count)

4
src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@ -198,7 +198,7 @@ export class echartsComponent implements OnInit {
} }
await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].length;i++){ for(var i=0;i<this.tabledata[0].length;i++){
if(this.tabledata[0][i].month>=this.echartsData.selectStartMonth||this.tabledata[0][i].month<=this.echartsData.selectEndMonth){ if(this.tabledata[0][i].month>=this.echartsData.selectStartMonth||this.tabledata[0][i].month<=this.echartsData.selectEndMonth){
this.datayuex.push(this.tabledata[0][i].month) this.datayuex.push(this.tabledata[0][i].month)
@ -229,7 +229,7 @@ export class echartsComponent implements OnInit {
await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`)
window.setTimeout(()=>{ window.setTimeout(()=>{
this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].length;i++){ for(var i=0;i<this.tabledata[0].length;i++){
this.dataYearX.push(this.tabledata[0][i].year) this.dataYearX.push(this.tabledata[0][i].year)
this.dataYearY.push(this.tabledata[0][i].count) this.dataYearY.push(this.tabledata[0][i].count)

2
src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts

@ -57,7 +57,7 @@ export class PageZhongDuiDetailsComponent implements OnInit {
} }
await this.data.getData(paramdata,`/api/StatisticsAnalysis/Plans/Status`) await this.data.getData(paramdata,`/api/StatisticsAnalysis/Plans/Status`)
this.tabledata=JSON.parse(JSON.stringify(this.data.allDate)) this.tabledata=JSON.parse(JSON.stringify(this.data.allDate))
console.log(this.tabledata) // console.log(this.tabledata)
for(var i=0;i<this.tabledata[0].organizations.length;i++){ for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhongNameData.push(this.tabledata[0].organizations[i].organizationName) this.zhongNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhongNumData.push(this.tabledata[0].organizations[i].count) this.zhongNumData.push(this.tabledata[0].organizations[i].count)

2
src/app/tabbar/tabbar.component.ts

@ -64,7 +64,7 @@ export class TabbarComponent implements OnInit {
//从维护更新页面进入需要显示提交审核按钮 //从维护更新页面进入需要显示提交审核按钮
if(this.route.snapshot.queryParams["isUpdates"] == '1'){ if(this.route.snapshot.queryParams["isUpdates"] == '1'){
this.contentVerify = JSON.parse(sessionStorage.getItem('contentVerify')) this.contentVerify = JSON.parse(sessionStorage.getItem('contentVerify'))
console.log(6666,JSON.parse(sessionStorage.getItem('contentVerify'))) // console.log(6666,JSON.parse(sessionStorage.getItem('contentVerify')))
this.isUpdates = true this.isUpdates = true
} }
this.tabbarService.getMessage().subscribe((message: any)=>{ this.tabbarService.getMessage().subscribe((message: any)=>{

1
src/app/ui/navmenus/navmenus.component.ts

@ -62,7 +62,6 @@ export class NavmenusComponent implements OnInit {
let _data = this.tree.toTree(data) let _data = this.tree.toTree(data)
this.dataSource.data = _data this.dataSource.data = _data
this.treedata = _data this.treedata = _data
console.log(111,this.treedata)
}) })
} }
hasChild = (_: number, node: any) => node.expandable; hasChild = (_: number, node: any) => node.expandable;

10
src/app/ui/organization/organization.component.ts

@ -342,10 +342,10 @@ export class OrganizationComponent implements OnInit {
OfficesList:any //获得的下级列表 OfficesList:any //获得的下级列表
//获得点击组织机构的下级机关单位 //获得点击组织机构的下级机关单位
getOffices(node){ getOffices(node){
console.log(node) // console.log(node)
this.selectedOrg = node this.selectedOrg = node
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => { this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => {
console.log("获取成功",data) // console.log("获取成功",data)
this.OfficesList = data this.OfficesList = data
}) })
} }
@ -625,7 +625,7 @@ export class addOffices {
} }
onSubmit(value){ onSubmit(value){
console.log(value) // console.log(value)
let body = { let body = {
id: null, id: null,
organizationId: this.data.selectedOrg.id, organizationId: this.data.selectedOrg.id,
@ -656,14 +656,14 @@ export class editOffices {
ngOnInit(): void { ngOnInit(): void {
console.log(this.data) // console.log(this.data)
} }
onNoClick(): void { onNoClick(): void {
this.dialogRef.close(); this.dialogRef.close();
} }
officeName:any = this.data.item.officeName officeName:any = this.data.item.officeName
onSubmit(value){ onSubmit(value){
console.log(value) // console.log(value)
let body = { let body = {
id: this.data.item.id, id: this.data.item.id,
organizationId: this.data.item.organizationId, organizationId: this.data.item.organizationId,

16
src/app/ui/usermanagement/usermanagement.component.ts

@ -87,7 +87,7 @@ export class UsermanagementComponent implements OnInit {
add(node) { add(node) {
this.isorganizationbox = false this.isorganizationbox = false
this.js = node.name this.js = node.name
console.log(this.js) // console.log(this.js)
this.userMechanism = node.id this.userMechanism = node.id
} }
@ -353,10 +353,10 @@ export class CreateNewUser {
OfficesList:any //获得的下级列表 OfficesList:any //获得的下级列表
//获得点击组织机构的下级机关单位 //获得点击组织机构的下级机关单位
getOffices(node){ getOffices(node){
console.log(node) // console.log(node)
this.selectedOrg = node this.selectedOrg = node
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => { this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => {
console.log("获取成功",data) // console.log("获取成功",data)
this.OfficesList = data this.OfficesList = data
}) })
} }
@ -364,7 +364,7 @@ export class CreateNewUser {
selectedOffices:any = {} selectedOffices:any = {}
selectOffice(item){ selectOffice(item){
this.selectedOffices = item this.selectedOffices = item
console.log(item) // console.log(item)
} }
errmsg:any; //捕获错误信息 errmsg:any; //捕获错误信息
//新增用户 //新增用户
@ -418,7 +418,7 @@ export class EditNewUser {
this.affiliateName=this.data.e.organizationName this.affiliateName=this.data.e.organizationName
this.selectedOffices.officeName = this.data.e.organizationOfficeName this.selectedOffices.officeName = this.data.e.organizationOfficeName
this.selectedOffices.id = this.data.e.organizationOfficeId this.selectedOffices.id = this.data.e.organizationOfficeId
console.log(this.data) // console.log(this.data)
} }
private _transformer = (node, level: number) => { private _transformer = (node, level: number) => {
@ -469,10 +469,10 @@ export class EditNewUser {
OfficesList:any //获得的下级列表 OfficesList:any //获得的下级列表
//获得点击组织机构的下级机关单位 //获得点击组织机构的下级机关单位
getOffices(node){ getOffices(node){
console.log(node) // console.log(node)
this.selectedOrg = node this.selectedOrg = node
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => { this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => {
console.log("获取成功",data) // console.log("获取成功",data)
this.OfficesList = data this.OfficesList = data
}) })
} }
@ -480,7 +480,7 @@ export class EditNewUser {
selectedOffices:any = {} selectedOffices:any = {}
selectOffice(item){ selectOffice(item){
this.selectedOffices = item this.selectedOffices = item
console.log(item) // console.log(item)
} }
//编辑 //编辑
onSubmit (e) { onSubmit (e) {

Loading…
Cancel
Save