chenjingyu 4 years ago
parent
commit
f8d799c232
  1. 1
      package.json
  2. 28
      src/app/external-links-plan/external-links-plan.component.ts
  3. 6
      src/app/gis-management/allaround/allaround.component.scss
  4. 6
      src/app/gis-management/basic-info/basic-info.component.scss
  5. 6
      src/app/gis-management/cad-draw/cad-draw.component.scss
  6. 6
      src/app/gis-management/fire-facilities/fire-facilities.component.scss
  7. 6
      src/app/gis-management/function-partition/function-partition.component.scss
  8. 10
      src/app/gis-management/gis-labeling/lookPlan.scss
  9. 6
      src/app/gis-management/key-site-look/key-site.component.scss
  10. 6
      src/app/gis-management/plan-list/plan-list.component.scss
  11. 6
      src/app/gis-management/realistic-picture-look/realistic-picture.component.scss
  12. 6
      src/app/key-unit/basicinfo/addhouseinfo.component.html
  13. 4
      src/app/key-unit/edit-plan-info/edit-plan-info.component.html
  14. 47
      src/app/key-unit/realistic-picture/realistic-picture.component.ts
  15. 4
      src/app/key-unit/view-unit-details/view-unit-details.component.html
  16. 6
      src/app/plan-audit/allaround/allaround.component.scss
  17. 6
      src/app/plan-audit/basic-info/basic-info.component.scss
  18. 6
      src/app/plan-audit/cad-draw/cad-draw.component.scss
  19. 6
      src/app/plan-audit/fire-facilities/fire-facilities.component.scss
  20. 6
      src/app/plan-audit/function-partition/function-partition.component.scss
  21. 6
      src/app/plan-audit/key-site-look/key-site.component.scss
  22. 6
      src/app/plan-audit/plan-list/plan-list.component.scss
  23. 6
      src/app/plan-audit/realistic-picture-look/realistic-picture.component.scss
  24. 6
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss
  25. 34
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  26. 1
      src/app/tabbar/tabbar.component.scss
  27. 2
      src/app/ui/collection-tools-building/collection-tools.component.html
  28. 221
      src/app/ui/collection-tools-building/collection-tools.component.scss
  29. 2
      src/app/ui/collection-tools-building/collection-tools.component.ts
  30. 1
      src/app/ui/collection-tools-building/panel.scss
  31. 4
      src/app/ui/collection-tools-plan/addPlaneFigure.html
  32. 3
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  33. 1
      src/app/ui/collection-tools-plan/panel.scss
  34. 2
      src/app/ui/collection-tools/collection-tools.component.ts
  35. 19
      src/app/working-area/model/axShape.ts
  36. 8
      src/app/working-area/working-area.component.ts
  37. 1
      src/styles.scss

1
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",

28
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`
}
}
}
}

6
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 {

6
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 {

6
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 {

6
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 {

6
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 {

10
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;

6
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 {

6
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 {

6
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 {

6
src/app/key-unit/basicinfo/addhouseinfo.component.html

@ -1,14 +1,14 @@
<div mat-dialog-title>新增建筑</div>
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
<mat-form-field hintLabel="名字不多于20个字">
<mat-form-field hintLabel="名字不多于30个字">
<input matInput id="name" name="name"
required
maxlength="20"
maxlength="30"
ngModel #name="ngModel" placeholder="建筑名称"
#input
>
<mat-hint align="end">{{input.value?.length || 0}}/20</mat-hint>
<mat-hint align="end">{{input.value?.length || 0}}/30</mat-hint>
</mat-form-field>
<mat-form-field>

4
src/app/key-unit/edit-plan-info/edit-plan-info.component.html

@ -5,8 +5,8 @@
<label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 9">*重点部位、安全出口、外观各自不低于两张图片方可满分</label>
<label class="scorePrompt" *ngIf="selected.value == 10">*保证至少有一个文件可得满分</label>
</div>
<mat-tab-group style="height: 100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">

47
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<addRealPicture>) { }
constructor(private router: Router, private route: ActivatedRoute, private http: HttpClient, public dialog: MatDialog, public dialogRef: MatDialogRef<addRealPicture>, 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<editRealPicture>,
@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');
})

4
src/app/key-unit/view-unit-details/view-unit-details.component.html

@ -5,8 +5,8 @@
<label class="scorePrompt" *ngIf="selected.value == 3">*总平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 4 || selected.value == 5">*层平面图模块标注完整可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 6">*填写2条以上可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 9">*外观,室内,安全出口各上传2张图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 10">*上传2张CAD图片可得满分</label>
<label class="scorePrompt" *ngIf="selected.value == 9">*重点部位、安全出口、外观各自不低于两张图片方可满分</label>
<label class="scorePrompt" *ngIf="selected.value == 10">*保证至少有一个文件可得满分</label>
</div>
<mat-tab-group style="height:100%;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
<mat-tab label="1.基本信息">

6
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 {

6
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 {

6
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 {

6
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 {

6
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 {

6
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 {

6
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 {

6
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 {

6
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 {

34
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);
}

1
src/app/tabbar/tabbar.component.scss

@ -187,7 +187,6 @@ mat-icon{
}
//计分规则按钮
.scoringRule,.isUpdates{
user-select: none;
position: absolute;
left: 440px;
cursor: pointer;

2
src/app/ui/collection-tools-building/collection-tools.component.html

@ -55,7 +55,7 @@
<div class="headerOperate">
<button mat-button *ngFor="let item of allBuildings;let key = index" (click)="checkedBuilding(item,key)"
class="bigeditdeletebtn" [ngClass]="{'buildingbtnchecked': checkedBuildingIndex==key}">
<span>{{item.name}}</span>
<span class="bigeditdeletebtnname" [title]="item.name">{{item.name}}</span>
<span class="editdeletebtn" *ngIf="isEditPattern && pattern">
<mat-icon (click)="editBuilding($event,item)"
style="font-size: 23px;vertical-align:sub;margin-left: 6px;color: rgb(26, 194, 26);">create</mat-icon>

221
src/app/ui/collection-tools-building/collection-tools.component.scss

@ -1,9 +1,11 @@
@import './panel.scss';
html{
::-webkit-scrollbar {display:none}
@import "./panel.scss";
html {
::-webkit-scrollbar {
display: none;
}
}
.icongray{
color: #D9D0DC;
.icongray {
color: #d9d0dc;
}
.content {
width: 100%;
@ -14,8 +16,8 @@ html{
display: flex;
flex-direction: column;
.buildingbtnchecked{
background-color: #34A6FD;
.buildingbtnchecked {
background-color: #34a6fd;
color: white;
}
}
@ -25,39 +27,42 @@ html{
position: relative;
flex: 5%;
display: flex;
align-items:center;
align-items: center;
min-height: 40px;
background-color: #fff;
.zoom{
.zoom {
display: flex;
align-items: center;
margin-left: 15px;
cursor: pointer;
img{
img {
margin-right: 3px;
}
}
.marginLeftRight {
margin: 0 8px;
font-size: 16px;
user-select: none;
user-select: none;
cursor: pointer;
.mat-icon { vertical-align: middle; font-size: 24px; }
.mat-icon {
vertical-align: middle;
font-size: 24px;
}
}
.copytobutn{
.copytobutn {
width: 60px;
min-width: 60px;
display: flex;
justify-content: center;
}
span{
span {
height: 24px;
line-height: 24px;
}
.patternSwitch{
.patternSwitch {
position: absolute;
right: 140px;
span{
span {
font-size: 18px;
cursor: pointer;
margin: 0 3px;
@ -66,7 +71,7 @@ html{
border-radius: 3px;
padding: 0 5px;
}
.selectedPattern{
.selectedPattern {
background-color: #2196f3;
color: white;
}
@ -75,37 +80,50 @@ html{
cursor: pointer;
position: absolute;
right: 60px;
label { vertical-align: middle; color: #279FFF; }
label {
vertical-align: middle;
color: #279fff;
}
}
}
//头部操作栏
.headerOperate {
img {
width: 24px;
width: 24px;
height: 24px;
vertical-align: middle;
margin-left: 1px;
}
span{
font-size: 18px;
span {
font-size: 15px;
}
flex: 5%;
display: flex;
align-items:center;
align-items: center;
min-height: 40px;
box-sizing: border-box;
margin: 3px 0;
background-color: white;
button{
button {
border: 0.5px solid rgb(208, 211, 214);
margin: 0 2px;
}
.editdeletebtn{
.editdeletebtn {
display: none;
}
.bigeditdeletebtn:hover{
.editdeletebtn{
.bigeditdeletebtn {
max-width: 200px;
.bigeditdeletebtnname {
display: inline-block;
max-width: 120px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
}
.bigeditdeletebtn:hover {
.editdeletebtn {
display: inline-block;
}
}
@ -114,7 +132,7 @@ html{
//功能区
// icon统一样式
.mat-icon {
cursor:pointer;
cursor: pointer;
vertical-align: middle;
}
//左右两侧功能栏 统一样式
@ -139,11 +157,11 @@ html{
margin-left: 0px;
transition: margin-left 0.5s;
min-width: 235px;
border: 1px solid #E6EAEE;
border: 1px solid #e6eaee;
width: 235px;
left: 0;
z-index: 112;
.leftDragDiv{
.leftDragDiv {
position: absolute;
right: 0;
height: 100%;
@ -155,48 +173,45 @@ html{
.functionalDomainRight {
z-index: 1001;
margin-right: 0px;
transition: margin-right 0.5s;
transition: margin-right 0.5s;
border: 1px solid #464646;
width: 235px;
right: 0;
}
@media screen and (max-width:1300px){
.functionalDomainLeft{
@media screen and (max-width: 1300px) {
.functionalDomainLeft {
min-width: 195px;
width: 195px;
}
.functionalDomainRight{
.functionalDomainRight {
width: 195px;
}
}
//右边导航栏显示隐藏
//右边导航栏显示隐藏
.togglePanel2 {
margin-right: -2000px;
transition: margin-right 1s;
transition: margin-right 1s;
}
//左侧导航栏显示隐藏
.togglePanel {
margin-left: -2000px;
transition: margin-left 1s;
}
}
//右边操作栏
.title{
.title {
width: 100%;
height: 35px;
background-color: #464646;
div{
div {
width: 50%;
height: 35px;
line-height: 35px;
background-color: #595959;
border-radius: 5px;
span{
span {
color: white;
font-size: 14px;
font-weight: 400;
@ -206,24 +221,24 @@ html{
}
//右侧属性
.property{
.property {
display: flex;
flex-flow: column;
.siteproperty{
.siteproperty {
height: 100%;
overflow-y: auto;
p{
p {
color: #9c9fa5;
padding-left: 5px;
}
.siteproperty_size{
.siteproperty_size {
background-color: #e3e3e3;
width: 93%;
margin: 0 auto;
border-radius: 3px;
min-height: 21px;
}
.rightAttribute{
.rightAttribute {
width: 12%;
height: 99.5%;
position: absolute;
@ -233,55 +248,55 @@ html{
border: 2px solid #464646;
}
}
.assetsproperty{
.assetsproperty {
overflow-y: auto;
height: 100%;
p{
p {
color: #9c9fa5;
margin:1px 0 3px 8px;
margin: 1px 0 3px 8px;
font-size: 14px;
}
span{
span {
font-size: 15px;
}
input{
input {
height: 18px;
}
.biginput{
.biginput {
display: block;
width: 88%;
margin: 0 auto;
}
.smallinput{
.smallinput {
display: block;
width: 19%;
margin-left: 8px;
}
.textarea{
.textarea {
display: block;
width: 88%;
height: 50px;
margin: 0 auto;
}
.swiper-button-next{
.swiper-button-next {
right: 6px;
}
.swiper-button-prev{
.swiper-button-prev {
left: 6px;
}
.swiper-container{
.swiper-container {
// --swiper-theme-color: #ff6600;/* 设置Swiper风格 */
// --swiper-navigation-color: #00ff33;/* 单独设置按钮颜色 */
--swiper-navigation-size:20px;/* 设置按钮大小 */
--swiper-navigation-size: 20px; /* 设置按钮大小 */
}
.hoverred:hover{
.hoverred:hover {
color: rgb(187, 28, 28);
}
.selectDiv{
.selectDiv {
height: 21px;
position: relative;
margin-bottom: 5px;
select{
select {
width: 98px;
height: 22px;
vertical-align: middle;
@ -292,17 +307,17 @@ html{
border-radius: 2px;
}
}
.colorBigDiv{
.colorBigDiv {
width: 88%;
margin-left: 8px;
.colorBigTemplateDiv{
span{
.colorBigTemplateDiv {
span {
color: #9c9fa5;
font-size: 14px;
height: 26px;
line-height: 26px;
}
.colorTemplateDiv{
.colorTemplateDiv {
width: 65%;
height: 22px;
display: inline-block;
@ -310,21 +325,20 @@ html{
margin-left: 26px;
}
}
.colorDiv{
.colorLi{
.colorDiv {
.colorLi {
width: 24px;
height: 24px;
list-style: none;
float: left;
border: 2px solid white;
}
.coloractive{
.coloractive {
border: 2px solid black;
}
}
}
}
}
.hideAllTreeNode {
@ -335,21 +349,25 @@ html{
height: 24px;
line-height: 24px;
display: flex;
label { display: inline-block; flex: 1; cursor: pointer; }
label {
display: inline-block;
flex: 1;
cursor: pointer;
}
}
//右侧消防要素
.firecategories{
.firecategories {
background-color: #fff;
position: relative;
display: flex;
flex-flow: column;
.firecategoriesTree{
.firecategoriesTree {
overflow-y: auto;
height: 100%;
mat-tree-node{
mat-tree-node {
position: relative;
}
.isLookCss{
.isLookCss {
position: absolute;
right: 6px;
}
@ -362,11 +380,11 @@ div:focus {
}
//没有图片时显示无图片背景图
.noImgCss{
.noImgCss {
background: url(../../../assets/images/noImg.png) no-repeat center center;
background-size: 88% 100%;/*按比例缩放*/
background-size: 88% 100%; /*按比例缩放*/
}
.input{
.input {
width: 18px;
height: 18px;
vertical-align: middle;
@ -374,22 +392,21 @@ div:focus {
margin-right: 3px;
}
// tree
.mat-tree-node{
.mat-tree-node {
min-height: 0;
height: 32px;
line-height: 32px;
font-size: 13px;
cursor: pointer;
}
.treeNode:hover{
.treeNode:hover {
background-color: #ccebf8;
}
.isLookPattern{
.isLookPattern {
display: none;
}
.treeText{
.treeText {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
@ -397,49 +414,49 @@ div:focus {
width: 65px;
}
.bigBox{
.bigBox {
width: 700px;
height: 40px;
position: absolute;
overflow: hidden;
right: 0;
}
.weatherBox{
.weatherBox {
height: 40px;
width: 700px;
line-height: 40px;
position: absolute;
right: 0;
transition: right linear .5s;
.openbtn{
transition: right linear 0.5s;
.openbtn {
font-size: 45px;
height: 45px;
width: 40px;
}
.name{
.name {
font-size: 16px;
vertical-align: middle;
margin-left: 3px;
}
input{
input {
width: 140px;
height: 22px;
margin-left: 3px;
}
select{
select {
width: 96px;
height: 25px;
margin-left: 3px;
vertical-align: middle;
}
}
.open{
.open {
right: 0px;
}
.close{
right:-622px;
.close {
right: -622px;
}
.bottomCss{
.bottomCss {
position: absolute;
left: 232px;
right: 0px;
@ -449,7 +466,7 @@ div:focus {
z-index: 100;
background-color: white;
border: 1px solid #464646;
.dragDiv{
.dragDiv {
width: 100%;
height: 3px;
position: absolute;
@ -457,10 +474,10 @@ div:focus {
z-index: 1000;
cursor: n-resize;
}
.title{
.title {
height: 35px;
background-color: #464646;
div{
div {
background-color: #464646;
float: left;
width: 80px;
@ -469,14 +486,14 @@ div:focus {
padding-left: 5px;
cursor: pointer;
}
.detailsAndattentBtn{
.detailsAndattentBtn {
background-color: #595959;
}
}
.body{
textarea{
.body {
textarea {
width: 100%;
border-radius: 0px;
}
}
}
}
}

2
src/app/ui/collection-tools-building/collection-tools.component.ts

@ -851,7 +851,7 @@ export class CollectionToolsBuildingComponent 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() {

1
src/app/ui/collection-tools-building/panel.scss

@ -47,6 +47,7 @@
.mat-icon {
font-size: 20px;
}
overflow: hidden;
}
//火源/力量 图标

4
src/app/ui/collection-tools-plan/addPlaneFigure.html

@ -12,9 +12,9 @@
</mat-form-field>
</div>
<!-- <div class="keyMargin">
<div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" (click)='toGIS()' [ngClass]="{'uploadBackGroundSelected': selectedType == 'gis'}">导入GIS地图</a>
</div> -->
</div>
<div class="keyMargin">
<a href="javascript:;" class="uploadBackGround" [ngClass]="{'uploadBackGroundSelected': selectedType == 'image'}">

3
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() {

1
src/app/ui/collection-tools-plan/panel.scss

@ -48,6 +48,7 @@
.mat-icon {
font-size: 20px;
}
overflow: hidden;
}
//火源/力量 图标

2
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

19
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 => {

8
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);

1
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;

Loading…
Cancel
Save