宽度(像素)
-
+
高度(像素)
-
+
角度
{ });
}
-
//上传素材图片
selectFile(e){
let imgFile = e.target.files[0] || null //上传的文件
@@ -391,6 +391,7 @@ export class CollectionToolsComponent implements OnInit {
ngAfterViewInit(): void {
// 监听canvas组件选中素材事件
this.canvas.on("select",obj=>{
+ console.log(obj.assetData)
//选中素材属性注入函数
this.setAssetsProperty(obj.assetData)
})
@@ -486,11 +487,11 @@ export class CollectionToolsComponent implements OnInit {
}else{
//如果是单位 总平面图
if(this.checkedBuildingIndex==-1){
+ //保存平面图数据
this.http.post("/api/CompanyAccount/SitePlanData",SitePlanData).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -504,11 +505,11 @@ export class CollectionToolsComponent implements OnInit {
this.snackBar.open('平面图数据保存失败','确定',config);
})
+ //保存建筑数据
this.http.post("/api/CompanyAccount/CompanyData",CompanyData).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -525,10 +526,9 @@ export class CollectionToolsComponent implements OnInit {
//批量保存单位毗邻
let CompanyAdjoins = this.canvasData.getCompanyAdjoinInfo()
this.http.post("/api/CompanyAccount/CompanyAdjoins/Batch",CompanyAdjoins).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -541,13 +541,13 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.isChange = true
this.snackBar.open('单位毗邻保存失败','确定',config);
})
+
//批量保存单位重点部位
let CompanyImportantLocations = this.canvasData.getCompanyImportantLocations()
this.http.post("/api/CompanyAccount/CompanyImportantLocations/Batch",CompanyImportantLocations).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -560,13 +560,13 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.isChange = true
this.snackBar.open('单位重点部位保存失败','确定',config);
})
+
//批量保存单位消防设施素材
let CompanyFacilityAssets = this.canvasData.getAllCompanyFacilityAssetInfo()
this.http.post("/api/CompanyAccount/CompanyFacilityAssets/Batch",CompanyFacilityAssets).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -579,13 +579,14 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.isChange = true
this.snackBar.open('单位消防设施素材保存失败','确定',config);
})
+
}else{ //如果是建筑
+ //建筑平面图数据
this.http.post("/api/CompanyAccount/BuildingAreaData",SitePlanData).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -599,11 +600,11 @@ export class CollectionToolsComponent implements OnInit {
this.snackBar.open('平面图数据保存失败','确定',config);
})
+ //建筑数据
this.http.post("/api/CompanyAccount/BuildingData",CompanyData).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -620,10 +621,9 @@ export class CollectionToolsComponent implements OnInit {
//批量保存建筑毗邻
let buildingAdjoins = this.canvasData.getBuildingAdjoinInfo()
this.http.post(`/api/CompanyAccount/BuildingAdjoins/Batch?buildingId=${this.canvasData.selectStorey.buildingId}`,buildingAdjoins).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -636,13 +636,13 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.isChange = true
this.snackBar.open('建筑毗邻保存失败','确定',config);
})
+
//批量保存建筑重点部位
let buildingImportantLocations = this.canvasData.getBuildingImportantLocations()
this.http.post(`/api/CompanyAccount/BuildingImportantLocations/Batch?buildingId=${this.canvasData.selectStorey.buildingId}`,buildingImportantLocations).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -655,13 +655,13 @@ export class CollectionToolsComponent implements OnInit {
this.canvasData.isChange = true
this.snackBar.open('建筑重点部位保存失败','确定',config);
})
+
//批量保存建筑消防设施素材
let buildingFacilityAssets = this.canvasData.getAllBuildingFacilityAssetInfo()
this.http.post(`/api/CompanyAccount/BuildingFacilityAssets/Batch?buildingId=${this.canvasData.selectStorey.buildingId}`,buildingFacilityAssets).subscribe(data => {
- this.canvasData.isChange = false
this.saveNum.push("1")
if(this.saveNum.length == 5){
- this.canvas.refresh()
+ this.canvasData.isChange = false
let config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
From fd078d358418fdb35550506fdfd69800060011f0 Mon Sep 17 00:00:00 2001
From: "DESKTOP-474NEJQ\\xzsjob" <359059686@qq.com>
Date: Tue, 8 Sep 2020 10:11:23 +0800
Subject: [PATCH 7/7] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=20=E5=8D=95=E7=82=B9?=
=?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=BC=A9=E6=94=BE=E5=9B=BA=E5=AE=9A=E5=A4=A7?=
=?UTF-8?q?=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/working-area/working-area.component.ts | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 9891df1..4d9e2f7 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -140,6 +140,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
if (delta > 0) {
if (this.backgroundImage.scale.x >= 32) {
this.backgroundImage.scale.x = 32;
+ this.backgroundImage.scale.y = 32;
+ this.emit('mouseWheel', this.backgroundImage.scale.x);
return;
}
this.backgroundImage.pivot.set(pivot.x, pivot.y);
@@ -151,7 +153,9 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.backgroundImage.position.y += delY;
} else if (delta < 0) {
if (this.backgroundImage.scale.x <= 0.1) {
+ this.backgroundImage.scale.x = 0.1;
this.backgroundImage.scale.y = 0.1;
+ this.emit('mouseWheel', this.backgroundImage.scale.x);
return;
}
this.backgroundImage.pivot.set(pivot.x, pivot.y);
@@ -162,6 +166,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV
this.backgroundImage.position.x += delX;
this.backgroundImage.position.y += delY;
}
+ this.emit('mouseWheel', this.backgroundImage.scale.x);
}
/**
* 创建画布
@@ -845,8 +850,8 @@ export class SinglePointIcon extends PIXI.Container {
this.y = this.assetData.Point.y;
this.name = this.assetData.Id;
const singlePointIcon = PIXI.Sprite.from(this.assetData.ImageUrl);
- singlePointIcon.x = 0; // this.assetData.Point.x;
- singlePointIcon.y = 0; // this.assetData.Point.y;
+ singlePointIcon.x = 0;
+ singlePointIcon.y = 0;
singlePointIcon.width = this.assetData.Width;
singlePointIcon.height = this.assetData.Height;
@@ -892,6 +897,14 @@ export class SinglePointIcon extends PIXI.Container {
});
+ this.workingArea.on('mouseWheel', data => {
+ if (this.assetData.FixedSize) {
+ const scale = 1 / data;
+ console.log(scale);
+ this.scale.set(scale);
+ }
+ });
+
this.text.x = singlePointIcon.x;
this.text.y = singlePointIcon.y - singlePointIcon.height / 2;
this.text.anchor.set(0.5, 1);