diff --git a/package.json b/package.json index 65628c7..00ad7bb 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "ng": "ng", "start": "ng serve --proxy-config proxy.config.json --open", "build": "ng build", + "build-prod": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod", "publish": "ng build --prod --verbose", "test": "ng test", "lint": "ng lint", diff --git a/src/app/external-links-plan/external-links-plan.component.ts b/src/app/external-links-plan/external-links-plan.component.ts index c3f65b8..99c8647 100644 --- a/src/app/external-links-plan/external-links-plan.component.ts +++ b/src/app/external-links-plan/external-links-plan.component.ts @@ -105,12 +105,30 @@ export class ExternalLinksPlanComponent implements OnInit { // this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${data.companyId}`) }) } else if (this.planData.planMode == 3) { //预案planMode=3时, 第三方网址' - this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { - data && data.company ? this.companyData = data.company : null - this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(data.url) - this.showType = 2 - }) + // this.http.get(`/api/Plans/${data.companyId}`).subscribe((data: any) => { + // data && data.company ? this.companyData = data.company : null + // this.threedUrl = this.sanitizer.bypassSecurityTrustResourceUrl(data.url) + // this.showType = 2 + // }) + let localhostPath = window.document.location.href.substring( 0, window.document.location.href.indexOf(window.document.location.pathname)) + //localhostPath : http://39.106.78.171:8000/ + let url = data.url + if(url.indexOf(localhostPath) != -1){ + window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` + }else{ + // let substr = url.split('/').splice(3,url.split('/').length) + // let port = url.split(':')[2] + // if(port.indexOf('/') != -1){ + // port = port.split('/')[0] + // } + // let ip = localhostPath.split(':') + // ip.pop() + // let newurl = ip.join(':') + ":" + port + "/" + substr.join('/'); + // // console.log('xxx',newurl) + // window.location.href = `${newurl}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` + window.location.href = `${url}?unitId=${data.company.id}&unitName=${data.company.name}&editMode=false` + } } } } diff --git a/src/app/gis-management/allaround/allaround.component.scss b/src/app/gis-management/allaround/allaround.component.scss index dd828a2..45cd0e0 100644 --- a/src/app/gis-management/allaround/allaround.component.scss +++ b/src/app/gis-management/allaround/allaround.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/basic-info/basic-info.component.scss b/src/app/gis-management/basic-info/basic-info.component.scss index 282cfe8..6003c92 100644 --- a/src/app/gis-management/basic-info/basic-info.component.scss +++ b/src/app/gis-management/basic-info/basic-info.component.scss @@ -2,12 +2,6 @@ table,table tr th, table tr td { border: 1px solid #EEF1F5; } table { text-align: center; border-collapse: collapse; padding:2px;} *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/cad-draw/cad-draw.component.scss b/src/app/gis-management/cad-draw/cad-draw.component.scss index ddf1517..ff9b22f 100644 --- a/src/app/gis-management/cad-draw/cad-draw.component.scss +++ b/src/app/gis-management/cad-draw/cad-draw.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/fire-facilities/fire-facilities.component.scss b/src/app/gis-management/fire-facilities/fire-facilities.component.scss index 180645e..f5d7706 100644 --- a/src/app/gis-management/fire-facilities/fire-facilities.component.scss +++ b/src/app/gis-management/fire-facilities/fire-facilities.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/function-partition/function-partition.component.scss b/src/app/gis-management/function-partition/function-partition.component.scss index df4d0d5..64dba43 100644 --- a/src/app/gis-management/function-partition/function-partition.component.scss +++ b/src/app/gis-management/function-partition/function-partition.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/gis-labeling/lookPlan.scss b/src/app/gis-management/gis-labeling/lookPlan.scss index c9936e4..6124465 100644 --- a/src/app/gis-management/gis-labeling/lookPlan.scss +++ b/src/app/gis-management/gis-labeling/lookPlan.scss @@ -1,14 +1,4 @@ -// table,table tr th, table tr td { border: 1px solid #EEF1F5; } table { text-align: center; border-collapse: collapse; padding:2px;} -*{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - .box{ position: relative; display: flex; diff --git a/src/app/gis-management/key-site-look/key-site.component.scss b/src/app/gis-management/key-site-look/key-site.component.scss index f085649..ea61a5e 100644 --- a/src/app/gis-management/key-site-look/key-site.component.scss +++ b/src/app/gis-management/key-site-look/key-site.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/plan-list/plan-list.component.scss b/src/app/gis-management/plan-list/plan-list.component.scss index fd8de1e..866a192 100644 --- a/src/app/gis-management/plan-list/plan-list.component.scss +++ b/src/app/gis-management/plan-list/plan-list.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss b/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss index 2354ca6..35b37f2 100644 --- a/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss +++ b/src/app/gis-management/realistic-picture-look/realistic-picture.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/key-unit/basicinfo/addhouseinfo.component.html b/src/app/key-unit/basicinfo/addhouseinfo.component.html index 3ce162d..e4afdf0 100644 --- a/src/app/key-unit/basicinfo/addhouseinfo.component.html +++ b/src/app/key-unit/basicinfo/addhouseinfo.component.html @@ -1,14 +1,14 @@
新增建筑
- + - {{input.value?.length || 0}}/20 + {{input.value?.length || 0}}/30 diff --git a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html index 1c41e4c..80599ab 100644 --- a/src/app/key-unit/edit-plan-info/edit-plan-info.component.html +++ b/src/app/key-unit/edit-plan-info/edit-plan-info.component.html @@ -5,8 +5,8 @@ - - + + diff --git a/src/app/key-unit/realistic-picture/realistic-picture.component.ts b/src/app/key-unit/realistic-picture/realistic-picture.component.ts index 0af6721..9c61489 100644 --- a/src/app/key-unit/realistic-picture/realistic-picture.component.ts +++ b/src/app/key-unit/realistic-picture/realistic-picture.component.ts @@ -79,6 +79,17 @@ export class RealisticPictureComponent implements OnInit { } }).subscribe((data: any) => { this.allRealPicture = data + this.allRealPicture.unshift({ + companyId: sessionStorage.getItem('companyId'), + id: '重点部位', + name: "重点部位", + realityImages: null + }, { + companyId: sessionStorage.getItem('companyId'), + id: '安全出口', + name: "安全出口", + realityImages: null + }) this.selectReal = data[this.selectRealIndex] }) } @@ -93,7 +104,7 @@ export class RealisticPictureComponent implements OnInit { pageSize: this.pageSize, } this.http.get('/api/CompanySafetyExits/GetCompanySafetyExitImages', { params: params }).subscribe((data: any) => { - console.log('当前单位安全出口', data) + // console.log('当前单位安全出口', data) this.allImages = data.items this.length = data.totalCount this.pageSize = this.pageSize @@ -220,6 +231,17 @@ export class RealisticPictureComponent implements OnInit { } }).subscribe((data: any) => { this.allRealPicture = data + this.allRealPicture.unshift({ + companyId: sessionStorage.getItem('companyId'), + id: '重点部位', + name: "重点部位", + realityImages: null + }, { + companyId: sessionStorage.getItem('companyId'), + id: '安全出口', + name: "安全出口", + realityImages: null + }) this.selectReal = data[this.selectRealIndex] this.allImages = [] this.getAllRealPicture() @@ -522,7 +544,7 @@ export class previewImg { }) export class addRealPicture { - constructor(private router: Router, private route: ActivatedRoute, private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef) { } + constructor(private router: Router, private route: ActivatedRoute, private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef, public snackBar: MatSnackBar) { } ngOnInit(): void { this.companyId = sessionStorage.getItem('companyId') @@ -537,9 +559,16 @@ export class addRealPicture { name: e.name, companyId: companyId } - this.http.post('/api/RealityImageGroups', data).subscribe(data => { - this.dialogRef.close(data); - }) + if(e.name == '安全出口' || e.name == '重点部位'){ + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('不允许创建名为安全出口或者重点部位的文件夹', '确定', config); + }else{ + this.http.post('/api/RealityImageGroups', data).subscribe(data => { + this.dialogRef.close(data); + }) + } } } @@ -555,7 +584,7 @@ export class addRealPicture { export class editRealPicture { constructor(private router: Router, private route: ActivatedRoute, private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { } + @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } ngOnInit(): void { this.name = this.data.name @@ -571,6 +600,12 @@ export class editRealPicture { name: e.name, companyId: companyId } + if(e.name == '安全出口' || e.name == '重点部位'){ + let config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('文件名不允许为安全出口或者重点部位', '确定', config); + }else this.http.put(`/api/RealityImageGroups/${this.data.id}`, data).subscribe(data => { this.dialogRef.close('success'); }) diff --git a/src/app/key-unit/view-unit-details/view-unit-details.component.html b/src/app/key-unit/view-unit-details/view-unit-details.component.html index bb14cf9..008636b 100644 --- a/src/app/key-unit/view-unit-details/view-unit-details.component.html +++ b/src/app/key-unit/view-unit-details/view-unit-details.component.html @@ -5,8 +5,8 @@ - - + + diff --git a/src/app/plan-audit/allaround/allaround.component.scss b/src/app/plan-audit/allaround/allaround.component.scss index 87171e1..6d4ee84 100644 --- a/src/app/plan-audit/allaround/allaround.component.scss +++ b/src/app/plan-audit/allaround/allaround.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/basic-info/basic-info.component.scss b/src/app/plan-audit/basic-info/basic-info.component.scss index abf4034..fe40bb3 100644 --- a/src/app/plan-audit/basic-info/basic-info.component.scss +++ b/src/app/plan-audit/basic-info/basic-info.component.scss @@ -2,12 +2,6 @@ table,table tr th, table tr td { border: 1px solid #EEF1F5; } table { text-align: center; border-collapse: collapse; padding:2px;} *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/cad-draw/cad-draw.component.scss b/src/app/plan-audit/cad-draw/cad-draw.component.scss index e86625f..553eedc 100644 --- a/src/app/plan-audit/cad-draw/cad-draw.component.scss +++ b/src/app/plan-audit/cad-draw/cad-draw.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/fire-facilities/fire-facilities.component.scss b/src/app/plan-audit/fire-facilities/fire-facilities.component.scss index 4603c4f..ac7d109 100644 --- a/src/app/plan-audit/fire-facilities/fire-facilities.component.scss +++ b/src/app/plan-audit/fire-facilities/fire-facilities.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/function-partition/function-partition.component.scss b/src/app/plan-audit/function-partition/function-partition.component.scss index ae374e8..19abfea 100644 --- a/src/app/plan-audit/function-partition/function-partition.component.scss +++ b/src/app/plan-audit/function-partition/function-partition.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/key-site-look/key-site.component.scss b/src/app/plan-audit/key-site-look/key-site.component.scss index 0a53cc5..a6c0cae 100644 --- a/src/app/plan-audit/key-site-look/key-site.component.scss +++ b/src/app/plan-audit/key-site-look/key-site.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/plan-list/plan-list.component.scss b/src/app/plan-audit/plan-list/plan-list.component.scss index 9f43ce3..11d3e00 100644 --- a/src/app/plan-audit/plan-list/plan-list.component.scss +++ b/src/app/plan-audit/plan-list/plan-list.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-audit/realistic-picture-look/realistic-picture.component.scss b/src/app/plan-audit/realistic-picture-look/realistic-picture.component.scss index 9eed8fb..a105673 100644 --- a/src/app/plan-audit/realistic-picture-look/realistic-picture.component.scss +++ b/src/app/plan-audit/realistic-picture-look/realistic-picture.component.scss @@ -1,10 +1,4 @@ *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss index 5218c8c..434fc0c 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -1,10 +1,4 @@ * { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; scrollbar-width: none; /* Firefox */ } ::-webkit-scrollbar { 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 b7977e0..d443744 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 @@ -106,7 +106,6 @@ export class EntryPlanLookComponent implements OnInit { } //查看预案 lookPlan(e) { - console.log(e) if (e.planType == 16 || e.planType == 4 || e.planType == 8) { if (e.planType == 16&&e.attachmentUrls == null){ window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}&pattern=false`) @@ -161,7 +160,11 @@ export class EntryPlanLookComponent implements OnInit { window.location.href = e.url } else { sessionStorage.setItem("url", e.url) - window.open(`/planManagement/webLook`) + if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案 + window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=false`) + } else { + window.open(`/planManagement/webLook`) + } } } } @@ -203,8 +206,18 @@ export class EntryPlanLookComponent implements OnInit { } } - else { - + else if (e.planType == 2) { //三维预案 + if (e.url.indexOf('app') == 0) { + window.location.href = e.url + } else { + sessionStorage.setItem("url", e.url) + if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案 + window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`) + } else { + window.open(`/planManagement/webLook`) + } + } + } else { this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config); } } else { @@ -243,7 +256,18 @@ export class EntryPlanLookComponent implements OnInit { } } - else { + else if (e.planType == 2) { //三维预案 + if (e.url.indexOf('app') == 0) { + window.location.href = e.url + } else { + sessionStorage.setItem("url", e.url) + if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案 + window.open(`${e.url}?unitId=${this.companyId}&unitName=${this.unitdata.unitname}&editMode=true`) + } else { + window.open(`/planManagement/webLook`) + } + } + } else { this.snackBar.open('只有二维预案和文本预案可以编辑!', '确定', config); } diff --git a/src/app/tabbar/tabbar.component.scss b/src/app/tabbar/tabbar.component.scss index d19e1b6..7884a74 100644 --- a/src/app/tabbar/tabbar.component.scss +++ b/src/app/tabbar/tabbar.component.scss @@ -187,7 +187,6 @@ mat-icon{ } //计分规则按钮 .scoringRule,.isUpdates{ - user-select: none; position: absolute; left: 440px; cursor: pointer; diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html index 2286f3a..0205cc7 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.html +++ b/src/app/ui/collection-tools-building/collection-tools.component.html @@ -55,7 +55,7 @@
- +
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index 6c833bd..a4da17b 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -490,7 +490,6 @@ export class CollectionToolsPlanComponent implements OnInit { multipleAssetData: any//当前多选的素材 firstMultipleAssetData: any//当前多选的第一个素材 ngOnInit(): void { - let _this = this AxMessageSystem.addListener('selectionChanged', () => { if (this.canvas.selection.size() == 1) {//如果是单选 @@ -762,7 +761,7 @@ export class CollectionToolsPlanComponent implements OnInit { isShowLegend: boolean = true; //图例是否显示 changeLegend(e) { this.canvasData.selectPanelPoint.BackgroundImageUrl ? null : this.canvas.setLegendVisible(this.isShowLegend) } - basicInfo: boolean = true //基本信息名称显隐 + basicInfo: boolean = false //基本信息名称显隐 wantToWork: boolean = true //想定作业名称显隐 //点击基本信息名称 basicInfoClick() { diff --git a/src/app/ui/collection-tools-plan/panel.scss b/src/app/ui/collection-tools-plan/panel.scss index a55f935..541d600 100644 --- a/src/app/ui/collection-tools-plan/panel.scss +++ b/src/app/ui/collection-tools-plan/panel.scss @@ -48,6 +48,7 @@ .mat-icon { font-size: 20px; } + overflow: hidden; } //火源/力量 图标 diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 15ac2a7..340a82e 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -178,7 +178,7 @@ export class CollectionToolsComponent implements OnInit { //基本信息编辑模式 baseInfo() { if (!this.pattern) { - this.basicInfo = true + this.basicInfo = false this.canvas.setNameVisible(this.basicInfo, 1) this.pattern = true diff --git a/src/app/working-area/model/axShape.ts b/src/app/working-area/model/axShape.ts index 7675dae..aee9466 100644 --- a/src/app/working-area/model/axShape.ts +++ b/src/app/working-area/model/axShape.ts @@ -2,6 +2,7 @@ import { Constructor } from '@angular/material/core/common-behaviors/constructor import * as PIXI from 'pixi.js'; import { Point, Rectangle, Graphics, Container } from 'pixi.js'; import { WorkingAreaComponent } from '../working-area.component'; +import { PaintMode } from './paintModel'; /** * 安信形状 @@ -35,14 +36,16 @@ export class AxShape extends Graphics { // this.buttonMode = true; this .on('pointerdown', event => { - event.stopPropagation(); - if (this.allowSelect - && event.data.button === 0) { - this.workingArea.select(this); - } - if (this.allowEdit) { - this.mouseDragging = true; - this.mousePosition = event.data.getLocalPosition(this.workingArea.backgroundImage); + if (workingArea.getPaintMode() !== PaintMode.Pipeline) { + event.stopPropagation(); + if (this.allowSelect + && event.data.button === 0) { + this.workingArea.select(this); + } + if (this.allowEdit) { + this.mouseDragging = true; + this.mousePosition = event.data.getLocalPosition(this.workingArea.backgroundImage); + } } }) .on('pointerup', event => { diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index c7a005a..e6bd50e 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -779,7 +779,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.enterPaint(); }); this.backgroundImage.addChild(this.enterPaintEndButton); - this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length + 200; this.enterPaintEndButton.visible = false; } /** @@ -865,7 +865,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV if (this.paintPoints.length >= 2) { this.enterPaintEndButton.position = this.circleShadow.position; this.enterPaintEndButton.visible = true; - this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length + 200; } if (this.paintingIcon !== null) { @@ -932,7 +932,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.enterPaintEndButton.position = this.circleShadow.position; } else if (this.paintPoints.length >= 3) { this.enterPaintEndButton.visible = true; - this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length + 200; } this.paintPoints.forEach((value, index, array) => { if (index === 0) { @@ -961,7 +961,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.previewLineSegment.visible = true; this.enterPaintEndButton.position = this.circleShadow.position; this.enterPaintEndButton.visible = true; - this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; + this.enterPaintEndButton.zIndex = this.backgroundImage.children.length + 200; // this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); // this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); var point = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); diff --git a/src/styles.scss b/src/styles.scss index 61e0f2b..9391785 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -19,6 +19,7 @@ html,body{ textarea{ font-family: Regular } + user-select:auto!important } ul,ol,dl,li,dt,dd,p,form,input,h1,h2,h3,h4,h5,h6,section,article,aside,header,footer,nav,figure,time,mark,main,canvas{ margin:0;