From 714da1862f0b9a5e8b951abb8df3cdb9b8a55bc2 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 25 Feb 2021 14:50:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/key-unit/basicinfo/basicinfo.component.ts | 2 +- .../collection-tools-building/collection-tools.component.html | 4 +++- .../collection-tools-building/collection-tools.component.ts | 3 ++- .../ui/collection-tools-plan/collection-tools.component.html | 3 +++ .../ui/collection-tools-plan/collection-tools.component.ts | 3 ++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts index 1cb5e90..f390739 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.ts +++ b/src/app/key-unit/basicinfo/basicinfo.component.ts @@ -2152,7 +2152,7 @@ export class BasicinfoComponent implements OnInit { this.snackBar.open('请检查输入数据是否有误','确定',config); }) } - if(item.buildtype == "地铁类"){ + if(item.buildtype.indexOf('地铁') != -1){ let newObj = _.cloneDeep(item) delete newObj.username delete newObj.name 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 2a4a2b1..32b5a8e 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.html +++ b/src/app/ui/collection-tools-building/collection-tools.component.html @@ -16,10 +16,12 @@ - + + 多选 + 适应缩放 diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts index 071ddff..754ba6d 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -830,7 +830,8 @@ export class CollectionToolsBuildingComponent implements OnInit { this.canvas.paste(companyId,buildingId,floorId) this.renovateTreeData(false) } - + isMultiSelect:boolean = false; // 多选/单选 切换 + changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) } basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 //点击基本信息名称 diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html index c2c2e9f..ec36c3d 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.html +++ b/src/app/ui/collection-tools-plan/collection-tools.component.html @@ -20,6 +20,9 @@ + + 多选 + 适应缩放 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 1baff01..0e2ac4f 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -833,7 +833,8 @@ export class CollectionToolsPlanComponent implements OnInit { this.canvas.paste(companyId,buildingId,floorId) // this.renovateTreeData(false) } - + isMultiSelect:boolean = false; // 多选/单选 切换 + changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) } basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 //点击基本信息名称 From 764c32e0c7eedfcdda4567d3e076e994a50502c1 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Thu, 25 Feb 2021 15:09:02 +0800 Subject: [PATCH 2/7] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=98=BE=E9=9A=90=E5=9B=BE=E4=BE=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.html | 11 ++++++++--- .../collection-tools.component.ts | 6 +++++- .../collection-tools.component.html | 15 +++++++-------- .../collection-tools.component.ts | 6 +++++- .../collection-tools.component.html | 3 ++- 5 files changed, 27 insertions(+), 14 deletions(-) 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 32b5a8e..d253c0f 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.html +++ b/src/app/ui/collection-tools-building/collection-tools.component.html @@ -12,6 +12,13 @@ 基本信息名称 visibility + + + 多选 + + + 显示图例 + - - 多选 - + 适应缩放 diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts index 754ba6d..aeddad8 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.ts +++ b/src/app/ui/collection-tools-building/collection-tools.component.ts @@ -830,8 +830,12 @@ export class CollectionToolsBuildingComponent implements OnInit { this.canvas.paste(companyId,buildingId,floorId) this.renovateTreeData(false) } + isMultiSelect:boolean = false; // 多选/单选 切换 changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) } + isShowLegend:boolean = true; //图例是否显示 + changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) } + basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 //点击基本信息名称 @@ -1479,6 +1483,7 @@ export class CollectionToolsBuildingComponent implements OnInit { isRefresh? await this.canvas.refresh() : null this.canvas.setNameVisible(this.basicInfo,0) this.canvas.setNameVisible(this.wantToWork,1) + this.canvas.setLegendVisible(this.isShowLegend) //图例显隐 isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -1508,7 +1513,6 @@ export class CollectionToolsBuildingComponent implements OnInit { //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ params = {companyId: sessionStorage.getItem('companyId')} - // params = {companyId: this.route.snapshot.queryParams.id} allFireElements:any = []; //当前 单位/建筑 下的消防要素 isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html index ec36c3d..0fdc889 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.html +++ b/src/app/ui/collection-tools-plan/collection-tools.component.html @@ -8,21 +8,20 @@ list - + + 多选 + + + 显示图例 + - - - 多选 - + 适应缩放 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 0e2ac4f..528ba81 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -833,8 +833,12 @@ export class CollectionToolsPlanComponent implements OnInit { this.canvas.paste(companyId,buildingId,floorId) // this.renovateTreeData(false) } + isMultiSelect:boolean = false; // 多选/单选 切换 changeMultiSelect (e) { this.canvas.setMulitSelect(this.isMultiSelect) } + isShowLegend:boolean = true; //图例是否显示 + changeLegend (e) { this.canvasData.selectPanelPoint.BackgroundImageUrl? null : this.canvas.setLegendVisible(this.isShowLegend) } + basicInfo:boolean = true //基本信息名称显隐 wantToWork:boolean = true //想定作业名称显隐 //点击基本信息名称 @@ -1490,6 +1494,7 @@ export class CollectionToolsPlanComponent implements OnInit { isRefresh? await this.canvas.refresh() : null this.canvas.setNameVisible(this.basicInfo,0) this.canvas.setNameVisible(this.wantToWork,1) + this.canvas.setLegendVisible(this.isShowLegend) //图例显隐 isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false isRefresh? this.isShowProperty = true : null isRefresh? this.isShowAttribute = true : null @@ -1518,7 +1523,6 @@ export class CollectionToolsPlanComponent implements OnInit { //陈鹏飞↓↓↓ //陈鹏飞↓↓↓ params = {companyId: sessionStorage.getItem('companyId')} - // params = {companyId: this.route.snapshot.queryParams.id} allFireElements:any = []; //当前 单位/建筑 下的消防要素 isShowAttribute:boolean = true; //属性栏 是否显示 默认数据 diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 27b1d13..921ba69 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -7,6 +7,7 @@ + 基本信息名称visibility @@ -20,10 +21,10 @@ 显示图例 + - From 5721d29ef2adb84358ed69df6840c1a45a69d3f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Thu, 25 Feb 2021 16:46:14 +0800 Subject: [PATCH 3/7] =?UTF-8?q?1.3.0=20=E6=96=B0=E5=A2=9E=20=E5=A4=9A?= =?UTF-8?q?=E7=82=B9=E8=BF=9E=E7=BA=BF=E3=80=81=E5=A4=9A=E8=BE=B9=E5=BD=A2?= =?UTF-8?q?=E7=AD=89=E6=8C=89=E4=BD=8Fshift=E7=BB=98=E5=88=B6=E5=9E=82?= =?UTF-8?q?=E7=9B=B4=E7=BA=BF=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../working-area/working-area.component.ts | 128 ++++++++++++++++-- src/assets/images/enterPaintButton.png | Bin 36289 -> 939 bytes 2 files changed, 114 insertions(+), 14 deletions(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index fae03ae..12e5771 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -90,7 +90,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV */ public selection: AxSelection = new AxSelection(); /** - * 当前鼠标的点 + * 当前鼠标点击的点 */ public currentClickPoint: PIXI.Graphics = new PIXI.Graphics(); /** @@ -151,6 +151,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV public animationTime; // 是否按下Ctrl键 isCtrlKeyClicked = false; + // 是否开启多点连线垂直绘制 + isDrawVerticalLine = false; /** * 本软件版本号由四部分组成：<主版本号><次版本号><修订版本号><日期加希腊字母版本号> 例如：1.0.0.20210105_beta * Alpha版: 此版本表示该软件在此阶段主要是以实现软件功能为主，通常只在软件开发者内部交流，一般而言，该版本软件的Bug较多，需要继续修改。 @@ -162,7 +164,8 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 重大调整-主版本号增加 * 日期变更-日期版本号增加 */ - public VERSION = '1.2.2.20210220_beta'; + // todo shift绘制垂直线段 + public VERSION = '1.3.0.20210220_beta'; /** * 数据初始化 */ @@ -171,12 +174,31 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV PIXI.utils.skipHello(); this.sayHello(); this.eventManager.addGlobalEventListener('window', 'keydown', (event: any) => { - + // if (event.keyCode === 16) { + // this.isDrawVerticalLine = true; + // } + switch (event.keyCode) { + case 16: + this.isDrawVerticalLine = true; + break; + default: + break; + } }); this.eventManager.addGlobalEventListener('window', 'keyup', (event: any) => { - // 按Del键删除选中的图标 - if (event.keyCode === 46) { - this.deleteSelectedShape(); + // // 按Del键删除选中的图标 + // if (event.keyCode === 46) { + // this.deleteSelectedShape(); + // } + switch (event.keyCode) { + case 16: // shift + this.isDrawVerticalLine = false; + break; + case 46: // delete + this.deleteSelectedShape(); + break; + default: + break; } }); } @@ -774,8 +796,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV break; case PaintMode.lineIcon: this.previewLineSegment.visible = true; - 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); + if (this.isDrawVerticalLine && this.paintPoints.length !== 0) { + // 起点距离终点水平距离 + const dh = Math.abs(point.x - this.currentClickPoint.x); + // 起点距离终点垂直距离 + const dv = Math.abs(point.y - this.currentClickPoint.y); + if (dh >= dv) { + // 绘制水平线 + point = new PIXI.Point(this.circleShadow.x, this.currentClickPoint.y); + + } else { + // 绘制垂直线 + point = new PIXI.Point(this.currentClickPoint.x, this.circleShadow.y); + } + this.currentClickPoint.position = new PIXI.Point(point.x, point.y); + } else { + this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); + } + // 添加数据 + this.paintPoints.push(point); if (this.paintPoints.length >= 2) { this.enterPaintEndButton.position = this.circleShadow.position; @@ -832,8 +873,28 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV break; case PaintMode.polygonIcon: this.previewLineSegment.visible = true; - this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); - this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); + // 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); + if (this.isDrawVerticalLine && this.paintPoints.length !== 0) { + // 起点距离终点水平距离 + const dh = Math.abs(point.x - this.currentClickPoint.x); + // 起点距离终点垂直距离 + const dv = Math.abs(point.y - this.currentClickPoint.y); + if (dh >= dv) { + // 绘制水平线 + point = new PIXI.Point(this.circleShadow.x, this.currentClickPoint.y); + + } else { + // 绘制垂直线 + point = new PIXI.Point(this.currentClickPoint.x, this.circleShadow.y); + } + this.currentClickPoint.position = new PIXI.Point(point.x, point.y); + } else { + this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); + } + // 添加数据 + this.paintPoints.push(point); if (this.paintPoints.length === 1) { this.enterPaintEndButton.position = this.circleShadow.position; } else if (this.paintPoints.length >= 3) { @@ -868,8 +929,28 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.enterPaintEndButton.position = this.circleShadow.position; this.enterPaintEndButton.visible = true; this.enterPaintEndButton.zIndex = this.backgroundImage.children.length; - this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); - this.paintPoints.push(new PIXI.Point(this.circleShadow.x, this.circleShadow.y)); + // 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); + if (this.isDrawVerticalLine && this.paintPoints.length !== 0) { + // 起点距离终点水平距离 + const dh = Math.abs(point.x - this.currentClickPoint.x); + // 起点距离终点垂直距离 + const dv = Math.abs(point.y - this.currentClickPoint.y); + if (dh >= dv) { + // 绘制水平线 + point = new PIXI.Point(this.circleShadow.x, this.currentClickPoint.y); + + } else { + // 绘制垂直线 + point = new PIXI.Point(this.currentClickPoint.x, this.circleShadow.y); + } + this.currentClickPoint.position = new PIXI.Point(point.x, point.y); + } else { + this.currentClickPoint.position = new PIXI.Point(this.circleShadow.x, this.circleShadow.y); + } + // 添加数据 + this.paintPoints.push(point); if (this.paintPoints.length < 2) { return; } @@ -1207,10 +1288,29 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * @param pointB 点B */ private refreshPreviewLineSegment(pointA: PIXI.Point, pointB: PIXI.Point) { + const ps: PIXI.Point = pointA; + let pe: PIXI.Point = pointB; + if (this.isDrawVerticalLine) { + // 起点距离终点水平距离 + const dh = Math.abs(pointB.x - pointA.x); + // 起点距离终点垂直距离 + const dv = Math.abs(pointB.y - pointA.y); + if (dh >= dv) { + // 绘制水平线 + pe = new PIXI.Point(pointB.x, pointA.y); + + } else { + // 绘制垂直线 + pe = new PIXI.Point(pointA.x, pointB.y); + } + } + this.previewLineSegment.clear(); this.previewLineSegment.lineStyle(1 / this.backgroundImage.scale.x, 0x00ff00, 1); - this.previewLineSegment.moveTo(pointA.x, pointA.y); - this.previewLineSegment.lineTo(pointB.x, pointB.y); + // this.previewLineSegment.moveTo(pointA.y, pointA.y); + // this.previewLineSegment.lineTo(pointB.x, pointB.y); + this.previewLineSegment.moveTo(ps.x, ps.y); + this.previewLineSegment.lineTo(pe.x, pe.y); } /** * 创建半径图标影子 diff --git a/src/assets/images/enterPaintButton.png b/src/assets/images/enterPaintButton.png index e6b99b7cbc2c938e9d2b370556f08de89ad42487..e5abb92f51eefda7821cdf03e3a7832f9f72b8e7 100644 GIT binary patch literal 939 zcmV;c162HpP)P000>X1^@s6#OZ}&00009a7bBm000XT z000XT0n*)m`~Uz0T}ebiR7i=fmQP3&Q5?s=JI%JzuCD8%9n`1{6@}dX95Tq14n-#; zC=NI;2G)1pR|di9!-hNyY4tmS(K3>;5qv*L@T3?TpUs z&O*EOg~z=2=FRW(e!qG1`;AT%Ma0rE@6DY6>;Osu6lp9Q0niJ;@y2{*DwZ8hNZArI z-UQ%$%pF9_NuPO}8V!qr9Q8C;)13h@#{rP#1yJ2*Y3z;(IkLzA?Fkr4u%s95t4NVTu(lUWX^!rKo2I@U64X&>rZc(;^>HoXd)ua zL}dNAnh^%HrB9yPYA%tfOOS-Kol^$?gtTd@|2w?BKy$d2Hdk~11`9`FthGePM1BnQjs6GY1vuh@wf@j%PSPBU+Z!thG@=&~nVJ<}ApeHP{ zb^69o=Zf}dVD%@vz7KxI9PzO}JruO<(5J951t{z}xS5=~DI)5e%8<#e(>IP<*Xs=c z?SEVeL!Pb;;6~s%>(iqxiyjIOS&?lxseN7|(?nLTm4zR9$1uI-Wv6FU2*>}y(kM(@ zlUPDr0f+kJvW@j^oG5E1F9N#o;|uU%Cby2XxKXbrN(>m?W!8jik4Dz z0U@vv0w*Cr9F4BGMFKQEQOY!STmJ8|(H|L&C4Exab_5D9YyWov_yb&7#lGGknA89O N002ovPDHLkV1hI~u@nFR literal 36289 zcmce+1yr0(lPC-Xhd^)*GLQhl-3AS=0fIZj;I4xwxRU_EU4y&3y99z;aCi4RdF}gl z|J{G@x%Zq4%rMhWb#+yBRdq>+d{B^liAszL0|WC?T1reA`u_;}Iz&cg0B&85S$A-*5YB*`g%khD1t(gpsZH>T85NkUqGz<(-2x4alvIIL( z7=caAZ3FF=Qb7KL3I;T8~yxn`SnYom^16ajf;Umc162xl^5E7&SLinHvtieu( z6cB4G8%I8f0N@Y2e9+IohnWEse}Fhy3IIfYFG!&w|AFGYtpk{Xi;0C1#KOWx!OhFW z%EiIX#lk?r#=^$J%)-XZ%Ff8b%E!XZ$HqqS*AD=?nuD{HTob33R znO$97nOxbKY#mIQS$TPRf8$_dV}wF5I=b078A2Fs9I5`sAO>~>IhflyncLb>{KjZ# zWb5oC0Dw~ZCkxhg^78*6wsHJRP*9OELk#VhS(#Xvt*w9a^#`=0lei0X@?T{9m(Y$M z-R!{3%3w!ZX9o~i+y!joMD?%f%HV%-@xL)03jWVzW6(bf+c`T}{lUF4h#71JwuY|Z z2ql&EA3E*KY@KW!&1~)dnerbN`{(f={QXUxlex)%L)`Bt{{a*XG5>Ese?R#TpiqtZ zuZj3uyuX)+?g5{eEy(#dC(>enYn8Dr$lRFkA7c5~d0DwljJbIjS)l5}2m*0%F&eQM z8ZmNl^02Z%e|bSBEPrE@wsCYav;l#CV}s&nGKXT~-~@pwjK-`ShKxMy zJlu>RLqirrBVH3j5D(km^A#P;p@v~-_3u=1v2b&-vWv2ca`Ccrh_mv%XXE4*7v*8) z;^pCF73bmtP#A;wOl%#j4WT+>Zf$4^X12321yKBpgZH*pwhr>P#$W*e`@fG%zkmP1 z!Pdmw3i<#*@mt({(!b}cn;Scs2>{qQp}7AwDhIYP{g1;Re(yKb0v*gj(l$#l5by^|jo-Rz<@_f!D>Lg~@S6Yi@V`b?ZOox; zLcxD;IiEQ6O%3ee_{W+oZ0vuJ|G}{e)Y(8e|c`I)TNYFDPG7=fTLr3;p}Z%E`yZ!N<-*&%(pU@}~yyL4|B?;`aXq z<>upH;p61^51>$485=qo{!hTa9pE3DDrN5IWb5Gemy1#X+yC{+%ADd42f=3u`cs;Y zhAv=Zz+Z#r|Aj_!85yw}8*yGW~xjdgk9})SoKF{GYY$&+lS?3Qgj-#2uZW zCj{UBjb{Cx5B0PEc;5fn$Njmc?f;2?{H+N8a)y7qRuQP1{%uf>e`%hmq3J(5DEL3o z1N=i^R_4$de|-9LGV}lcDu4JrQFEu?-tbSq_}7B}Zp(r^|Azbbu0R+0ABO&Y^Zv^< z{s8#5h~#gop<&MNkN?D1&@cZ)XkZ(tT{=MHFBPl>d>9zN6lpP$kC2puN4I9<8P(+o zpX+7Q;@!xlx^1;OlYvU(f!-J^;Aeyc7*_Vxm#=6(Q={8|dieCET~<^SSsIy=8D8$J zRXSmN;Kgj*sg-6e!$4Bsk(%quf@|?^xX1Ad`F+adb*)5^cH>fs`vu)p$zGw#_QzD` zX+2AUea%j-A^2_Xrz;`%#1k+5YAwdHg~M78mDH{!o9m%Ne_&GXN&E$8>D@mNFWAh%d@@Pt`248 z`B=a1ejKkUa*V0^L#BuaRXCy11ANgPGH34{mH(?0zG+Fifa80A!`a2=c1gOP!NEZy z?G=mq`7~jf4>A-1QLj+55qhP<Hx}gq1EmQr0BIa=T&Q$KFQ@ zp?6E8=ILUGNwSa4`=w+b&Awk6|)hDqL4xo7dOA^5-C$dot~4Lwn*7TGj5 zG`<>55q^?V;0`nm7m0TnQsxcKVodkSTMcCsL;kEh`YYhe)D_3H)+
sQ{LB6qK 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�|_;%J^efHM?C0LVJ`EF~0CUOvx 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%0Ak zW)ut9I8q2I+M{|Kmg6@?t;?v=t2uPeI}I3g)%X{Y88OdjPi<)LJkj^w81eQku1^2y z9g5HKpcrFi*jDW zVq5L&PtjTygpi7(#iFX5^G`CQ5#y|+pbh>ZEWI5$yw@k5SiIrq#Idf+-Wg(La(Pw6 zlAoKp(LQ_3D-Bk z<@+&}+N$QQ@BDihr{5r*BCG~QW%sF1_6$nl$yxO@_#si3E6M;xG-W|Pf|zSdP}gTr z%Wd#o%MT9<6k>w!7=yP5FtZB2%VXmdku!|buna>)6eA+xU2u{D` zw|?pQ%K~Gr{@>u4ZqQ6>kDQ3!Y4IEVxbRy;#L?S+kYa9vvV@AmtZa2H{Frq~o`QAfT=my-8ktcvBEA^pyLC|0!R?ZIfICZoLNrm^7} z*4$tO&ot$DU8=-g&o}t%Sx^44(pwZdT=vdsHNH&M z;Yt>VoIj*V&l|ki`?2D9gs{SU95zR9x-{i=cbMtN%8Ll;5?f!N`Dz-t6l`&b3M*uz zIv*7Gbm#cPGS+uBkm%ft53;GPG!0Y??tVykptNBmJ@dFfaXJ#p;k(nQ7m|_d{)ib$ zhF0@{Daf_l$rd|K&p6FBomO$#cJVEXhi8^wmKR$?OUC~6VuzueQ?~^lMLOe|$liS8 zi^}W>--rm+irc90qqq@Th9eQx9z0Otx9-20DvNG~tg-z z%=Kq%AvusQwaq?VobgT1N0U~iZEClLcA}Ncr(k}pHnMPH|LJX___;)M86KdIia9RuGy#O;p9b<*?>bH{=O62T~(kW zcl(VZ+WR^;WNYJN6TWMck>ayG0qQMv9*w9QjKU}RBg1B-Lx7MaN9Q<#VMUXCg#sZh zui<;_U|Af^nb854kCb5~!8j^Dj{|V8z)|rpM07qSg!2&@XA&a$6?1! zgG=YD(NF3egvAv2Sz!(M*w==9&M@u$W+XOslT7+s^5}OKOO5PD>F_!lO!RO5@=S}N zBXtq8W)W8*E$W;COF*JfVz?oJizcw93DL$!cpCn-9kMSa5A2)YD(8VeH3cw zcb4Z^!_MxhA-4d2_pj`ox6h=h1gxbsGJ1JA!i=3DVVvRj-EQ8dLC-K|>{Q>!58KAi z4FxeSaqQt=akqVsEp>BcOl;q=4JxD4ACBlGg|Nbida=;wJy{>-LEIYp+||GkhdEnn zLdsoznUkkG5-D{fO?#3}RH!Pu#_LWmZ%$KO)05*Kf;!TuE7Cvg(aS1mpgR6^aY_>6 z@3`8$AtwDei%7&~DjJBPxQz)TGcd0d9Yxp79VpyD6<#zvt@f@M`|*2^g9JR|iyZox1a- zs~G_uLcHi~lQZNDz#y{hdpB{MrObgv>#|kY_TF}@^>>DNybh*|#8_rAICy}PQ$?+( ztx^t5HJ4|(H9wL_f+tYr8PC`d=r7sh&HpUMfXLnvhWGv>&gK)KRrSUw`KAg+WnG2T z(PLs8nUzn`uzzktJX8ouLc2?bp3*S@&r@-WfjM((gGce17R~pGw^a0|-u{P{W>Z!o zD;YK($vA>hmQ8%mKq?w3v|6*O8ZEr4z9@+Ue?sypIj-vc zl$u=a%o8!d$N$)!LUZG(7I}NL*=F+~zH2rF-{;v^ijv$zAYDGmWS&uFx(Tj7CSN@I zmfQE0yP_gtfkhD*-Zc0P5|MuIeKgJ8{N#dCQS!%k$FRnPb?^d*ujZKmvh))%cW6PJ zVTwX^Jw0CuX`~gKh4Xq%Tp(leCon5w{G9Ube3FQGAs=i3`MMOYZb+q~(1bREISBgP zHy_q%5>nGtdGPio-H1p#J7dMA_4$X@cQ+wlgtZN09)c(dTPrH@D_Twa4z;%No;8cO2Uj#hE@{N3x8<=ccc5$fX`{Vx>l7Wa2{8@fVX%dkr4Tt|b^Mw+Gdb+3nv&N}oka96zx#?0Ip(*Mu(Fa6FqTGK~x{nw<7h(7HK)a*;G zsM}8x^C*QV@O;lZT3M&OauQKIkNU00ZM>EHT-ySCi|4a2ur7|>rmTY-?u%vHD_Jid z-wxy#7vF{CBbcONjOhhlt(oFy+4)2{NvyI(UgfU;_(T-SePY^rUOX`lJB#cwV3uX| z*H}Yhw!?(kD{VRQ4Hv6@0Y1;`Vk;3N|EZrHGzKi{Ccx)h06gOL8xOyzW;kNHGKt^3 z(%lBSsY#`}g7e1$r^~Lb`?3^jQJJY0wcy`*9r?wvX_Is*6g;y~BC$lg&MBO)eNX<6 z-Qu+)C7M;G(Sm+eyYSGH^5GB!lO3qc3oaF&lut`XCRuEyU0kfc4BA^>q39ZTkqiqc4B8yr^)!S#x9qR zbfacH{f*CBFs6!mkag)c^hH5akYF;Fph&6&5ANMgfVl0Ej9lknac9QQ9|2E`SjzOy z1NIwkd37}DSk(yr6k!19iD7ij6Mb@WQuO0(HUhXNYc!FyA zITgNZ46PT0wGiNOS8l*!Z=v%1kZYLmBq;&I^$2W!8Pv|8ZUQLbCM=QX60#<}m9(g* z+sC5b@M0zXuqnFW8sROmfYCe(qH8S})3+u6vM##l1p78IZU;HYWd*7HVeOkd=aT~G z!e!TZ1Z4q@UkT=fBs{0xA<=km4Dh_S42qc0&<&&VU41ED@kl|!lYh9FJ$ZWXgmvM( zZp$fA%1-r~66snZbyjKbjo35YGiKxXu6*{7vy$ZABDyC4zQ96iX>DlStTNqWzF_L< zTwP0RpBVoIvYFQ|JzW+-G-@=5l_*Rb*~j@qc?@oA3Ocej*ya9wU+#1TQh*}bo~iH7 zJ23DDlF#EjABeLHa;bl7EG-m~ulOvKH)^tqK=um5^WImPdQ3BWY}kG@hy1SczIZ>S zPk!1E-zC%l!N}r(~6&~4rWar4f|YcWzw?h1@G~OE20aB zyGgnkye~>nH6CjKWoBqk>1Z+MTb7V$G2kY_F5Ux=LD>NZ4;F>S+c$dpAk5~tff{2P zg!z^LA;Bg_6@Xu6fijXRv!=yc#jE6P?@te9a%i6zt3`#;GzN;Y#%ifv@27^*cT@Pj zLhJhwu}MAs&))ZK7*D6XwbYqMS+CTx>Qr`P5b_ihN{X>%ecJCJSWWY$ zXaIhzJ?nyZ+C%eSBBy3ME$25T=DZrT0hGBr(B-wmIYXod;zMYKQ2q6^g15QHj*oK# zpvU)1G`((_3|;R4Q0}Yo$af?+*T1u_l;ZSM1aUX^Bd5I27X!d7fT)1QKyWT_8Sh$Dj8aXQtB_`%BNe z{BG;}yXSMD-K=EnX?14peI3V|I~x@Uoy@U~4jp8tFp(|aFo-ukp!_mX}292^|9#g7!T`EH7ey;wUZ0=m1($j!ZO z2G_i9?X_)N*8`}maDKj=oAQra>vcr3EH-G`5P4@Mj~o+x5yisZf@ZgTAaA&Cdz)1P z3l^a0^C!rmfd2n@pa*QTnd0QS-mfh3Z;e~ypoiwcp+!%$(BEFR<6j6Y_bdrfv zpL^BT(+}OQuZwfEWn{+4IqL$Ka#O_0eJFSXE)1m;HMf{+!O#1quQ6dMSA@xXj1#m} zhLX#f#t4(xGgKS-at1CQ3AXjDsL_pniP0;onMa*vmC|5!($U6a5hyP~@>_}5@^cG0 z1KF-be4k-ocUjD!V{HRHZEde)guGN3rTXC4kIy^)JSdQ~6PNv)lxd&G`VEh>N*;$> zLLhY8$liMzbU~MN!mRM4;uA zpLj@iG$b3XIifccq>E}?m(kcz5~{^eMyr+w!O8&-M{e~hw>K0!-aA><>WwA|C?PZC zZw3q$%$k93XZZV3p8Qichx>Hf2$&A(%xu`tm5``n2dQEh?SuPSQ+WIjpKIic;pEO6 z^?tVbL;HJ_2z+hdBgBotyx;^+Z;5Dd~P$Qvkl~-!XAo9BpQXn@*FL2DB8yBdX!o@O5U^YK6s+3~ z!L0@Sg+b)rfouu4h$7~YVVu&Kgo94~aMR@#oCH>6gqj$l|`vc?G#Hz&!M)@dU}eD?^3U# zpL<`e<56Py?WbD{P6`5 zGBBibKzPtzgla-(74INx`*kwrSe6!M|Ml^7^{&|bLJGV(uJ85zr$g2CCSM>h)r0#w6_8q3Z0&q;Rg`$N4`w(bMgne4AV;Q>4A!9%8&wn$DA(~4!qQtI28M$gVAyDU zEWnlm0`R@PJy-s0YoAd(^qr)uZn3W0BwkG!-d+YNNG(Q|3UZduVo_T6gTwi_CZU#fr{#S6ZF#HR z?%Z1^pFZYz#Vp0Q&z!hqq*a(p*DhS&s&Tcnv_HWtoT3uE;{S>>TE{X)Euo{O{rHXRxu|iphWt&7qZJV5D2k>P zMJ6fpHtsa7+q9opHMy$>zrk!j-dvfPE)&(GnV%B(|7~Fp8X{kYJ~SVQ_xJ^vm-_sP z%56*r1>*HTWST)@Fcdap7Bi?^@3?6d%TEGv7glo6s$WN+J~s9=Fo!gXgReU7roP?X z-MM99BdAVumv&wiEOGZr;W~@!=)`|rhw#7KPPwF;TDN?igQy= zCa@TtMj|9*?E$1FkkZWfP$dm5on%$4c>@cXxt)8suKKfCl zaw~!%m}RcXB$CK``F=)lKq>CV8_mm=ti9ygeMN@t;>b2s3?c?PTpb5T4^ORxXHhgs_<3WoqX@VbAucX}VGj!D;?#T|o->qVZK zky0s-G)*{24UaWz+498XEjj|uEe+nrS3z#6yXWf5@&A=SxKvKRD-W~cm zS~S>2!9DqY9zZ|<65H+*cRYZ3!KFc#wqqoocJ$~3ObivpJ_&`$TwiP5vz zzn1!+KHk~CZqzc*ygdY$YO}xIk3BPGLw4;rW_7Z5^2Axa{{R>A@T#?az6CL8y7|FA z!TUIvGw``j${|$~<=w#CAOioLyk5zG#2*3sv|0+~LBDGJdFp>58jc}ky55X&7WMUe zoi2s=o37s94Z+kYSKUPO`9#u&`BQSAAf)Yp1(*ED(89m2Y3xQOl~+8CkVRoum-`pQ z%_tEux#s$@!Tz~>XG7$+q~noWDD$~)`w8LsM%oS8lhBnR5P)f|ZzZ&XMO*t z4xuMsbp@ka-um&l&Pz#Zo<>w?%zy!0s0f_$F^tG0Uy(DO{wt#o3<3o`jNqs~3X{SD zN?_(e4k#s$k6+^XUuIxz)BwXO`1A1BTl(iY}$)JHqPEh!4-r`R^0=V;5sKPkVB~m#)!C(RZi~Vog3b6_r35VPoFDO zzFYtBicX62zj~kC-A~o{zVA201{g@9h=A4^Ku=`~0g-KX?6EuZgB=eZH&=DSWXC_v zLsFUfbv@YpAoNjS>)Gu4Y3(w&6_PoB&_+VLu`(r(@*OLoQW?TJ0x`z3%7l@E9M9GN zLfC)?5F#4@;63SP>Cd49;}23VILBVyvBlM=kA>#dgJv?gfuINMPMw6Ujsw~N6kh##*oM_`rN^yW_2_6h8A; zl0t26gH4fT1q#(NgGGDj>6Vmd;3#kj0vq<_@BGSaYUeQgUqANY5){w>>5O_eS9ZQP zcYn_vye@^n4R?)e&>3KDgA^yd| z?CM>OTz%2l>AHLuyOi%~>f$ow*md`o>F9I(RKH0_h$JXNMCQH=<-Wzg@qFEj+Bubo zM%M%P^_eakIp|bC4^L?wpqhdZrsnm)sj}Ez%Haw7n=CSjAk!AP1nVt}*J*UQndhk< zwXFe9n32ip%o7iJcI(C(y@8#enA8~=abY(m#Z*{SV+lau7rb|JwN(TjG{E zMrNSUcY@#8Ift;%&G8Kl4gH_xRp4^>ChQyRDjSC(pQg%P;B~&?NbZ7JwLX-=C4atR z>#fv(N#w!kv+@5;!UXOJ*FEMy^}jyk(Mih1fs|HQ2e*UPSfFmqlgzG9Q&<`1j!okMht%U22HDaK0wZXyKt^_oshxju=_Le!33-WFG2kj zig~Xz8pTpH{X|#5QlYOLg&2cw5+3Jewk?NB{^v|)+HJb@odmZl3jPm_`n_p*5OrVk zg#cB<(!r7&HEt3pS}@4&{FF3)u3$J~t>4${5#7tk)EBme0c@uoXw|Fa`=v}e+h+BB zdPm~L6eFuHxhp*(E(JB!Zk0h2^+v2%Jd2EkbCe1g;!BN~CG*UW^uvZeM2n_T;cYkN z&wrOr|3qu40%5KnyPt7iqRO?7W;W(YXgR!|8TKca(Ze&wJDR&}^F{w6<_KqN5KmZA zyKJJ4lf!o)1bs8{)>G98vO_Y7=G_|0v(Ri?U-7w6(wZKd%pg06MwOlDQ9PsBPlCW4jr5+0 zV4ly9fL`MDY~4i1pmNm~kYwL`>%FjYwpA7{e@$NFT%`&!s->GF!=%|+h1&`8_prQ? zV|$yo=VOkj+D8?y%COu#l!6*TMhq1)5_STXRGWOT5EvX)=)gEg#FM&U{$^%&d>+AjzceMb=O5OW1!>hC_UbvWIfYsh0)Ke<_I_^$@pc5Wa&>aW?!gCF;uwwR4^c{*A(bM&k9Pr5|KY?EXH@?CHSy;zemgN9T)BwOWr5uB*v zXDt~?3^B`IU;zE)ru}qdw6#uZIX`m+=PsDnc~W#_beDoJt1WNqD)c{N+(3k1l%8~T zOISv*LXiFh>aPW;)M7hfC%EVa19^5jyHqf{e+&8wkyazk2hYq~D0Mg3KcT4BMoamkx zV?WhE3`Bj3KAdqCy|o-B!2q;Ny9>GO_nWLt_|Fey%Qk~*_gye;uS|Jc?=$SC4ByX} zb?(fcQ=D-moMg@NgLZWZcJo1OM)u*!*{NLzU9@uWq86#llbnPb`K=$8*)6WJyzH~F z5bVbiAx(=SmG(@P|BigF#~>pUk_hHR6a{r*V^HRimORk4euXHGO@p`RWoyf-CG=kX zN&Gl5$)xb^bhr_2MfKk1R=Cv363+?$^Zf)3_~G(bK6JIyFI1EB<}bFf_`Ta7>yqy8 z`sj6Ej_jx1zV-{=)G$+j8lnU!gmUeMa=0mxfMBa5=A2XlDM9JG#xE#G|>9Q-5vGfPEF^ftf zjI-z*toD}1ME;F0MS_wMRtxgX5~_qGZjh$lB38nEb(Rt?()l`4kt2!~#-uE?XR$6P ziXv+5ahhTZo${^!`O(wwe&qJ&S7m(h>7)|wQGDdH?;5}GqR}r9wXf-zLkO9n;*e?U zGngnD7E?#QsIfEF&ky&!;-Wp3LM;YQayQ!dcLc>c(O!^z5z<%WN?MdtDVXIwqh841 zfNR_nZXr}VaC}d=rK{if`-=uZ)uxX0mrpZX2==1b4#NRpA%1R`)`S)1Io2||I0eCfs9mCMK?urZDhT#R)^&7)wt z@4UUCDA&Io++Skd@?xo9(-j{OY>68fYzlOJ@QC8~%j5b}#q`ct>|Y2A7afhVAaO_s zp%F+E6T1Z4t&_MGfgR(Om*)BD<9jdq&Od+u`4hdzbB#*4C&>*DzTM4rWjNwoU~2vAsEx|c3ER2Rs5Tupj}0<}^mD+-9H%-( zCc%)TJ6LV7H!9;d<)Be-uj)Ixqq@twX4i9Z`vuu^jgNYH50>8mP)XYR&N+v*#eVCL ziBuUfT2#4nL0@o-Fb9xQ61Wjm+Jv-0&>bPLW8D7XFIS>H1uEg5Bu_o{)F&JJ-7}Nx zn-5K0Sf?=_AY+Mf4r7dWn-vJ5P+^Et0X>WK8W_``z3`ZptOmb0y_6yytP5LiyWQ?U z-B{%pYe;{L$xYw6%D!~(B@p}n8;K>9k}tmZp-QaFq;i!{6Mw$_8X1ik6OC9@l%dr; z#&*f9K}X)=E)M$m-x-{K=~+P8Zy9T5dC#bHmF;WDCCf6OEF8abN;*}1_5z$gD*mEu zFUo;)zH&qm1W4;}&h#vCX`Q8Y)TY-F=utAG>C9Tba?`(6!d)hn#XU_J<7@kNY)TO4 zh$KY?7O7+}J;*Sn(Lf|Vkv$us+y%IyBK=epDP_qFzYdC8*HmBqHqX6%i#ILe*2 zJrSpAN~b+XCrc4|a@iTZnRA57;+_Sz-gmV#axpZpT#ja>!AOmY99ra9ERGy449;ns z@Qr`OOf2sL20|zY`?^YnNFxD Date: Mon, 1 Mar 2021 10:58:03 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=BD=AC=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/canvas-share-data.service.ts | 442 ++++++++++++++------------- 1 file changed, 236 insertions(+), 206 deletions(-) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 2c62212..dbc257c 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -1,6 +1,6 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import {ReplaySubject} from 'rxjs'; +import { ReplaySubject } from 'rxjs'; import { Observable } from 'rxjs'; import { GameMode } from './working-area/model/gameMode'; @@ -8,7 +8,7 @@ import { GameMode } from './working-area/model/gameMode'; providedIn: 'root' }) export class CanvasShareDataService { - constructor(private http:HttpClient) { } + constructor(private http: HttpClient) { } private _sendMessage: ReplaySubject = new ReplaySubject(1); examDisposalNodesData; // 考生进入时获取当前试卷的处置节点 @@ -18,22 +18,22 @@ export class CanvasShareDataService { - isChange:boolean = false; // 数据 是否改动 + isChange: boolean = false; // 数据 是否改动 - selectTemplateData:any; // 选择当前 模板数据 + selectTemplateData: any; // 选择当前 模板数据 // 总平面图/建筑 楼层 - selectStorey: any = {area: '', details: ''}; // 选择当前 楼层 数据 + selectStorey: any = { area: '', details: '' }; // 选择当前 楼层 数据 originalcompanyBuildingData: any; // 单位/建筑 数据 originaleveryStoreyData: any; // 总平面图/楼层/区域 楼层数据 // 总平面图/建筑 楼层 // 处置 节点 allDisposalNode: any = []; // 所有 处置节点 - allNodeMarkers: any = { highlightMarkers:{}, markers:{} }; // 灾情 标签信息 + allNodeMarkers: any = { highlightMarkers: {}, markers: {} }; // 灾情 标签信息 selectPanelPoint: DisposalNodeData = new DisposalNodeData(); // 当前数据节点 - selectPanelPointBaseData: any = {description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: ''}; // 当前 数据节点 对应 父级节点 - customizeDisposalNode:any; // 新建 自定义数据节点 底图+名称 + selectPanelPointBaseData: any = { description: '', notes: '', weather: '', airTemperature: '', windDirection: '', windScale: '' }; // 当前 数据节点 对应 父级节点 + customizeDisposalNode: any; // 新建 自定义数据节点 底图+名称 // 处置 节点 /** @@ -42,36 +42,36 @@ export class CanvasShareDataService { gameMode: GameMode = GameMode.BasicInformation; facilityAssetsName = new Map([ - [ '消防水池', '消防水池'], - [ '疏散楼梯', '疏散楼梯'], - [ '消防电梯', '消防电梯'], - [ '避难区域', '避难区域'], - [ '安全出口', '安全出口'], - [ '地上消火栓', '室外消火栓' ], - [ '地下消火栓', '室外消火栓' ], - [ '室内消火栓', '室内消火栓' ], - [ '供水管网', '供水管网'], - [ '湿式自动喷淋系统', '湿式自动喷淋系统'], - [ '水幕系统', '水幕系统' ], - [ '消防泵房', '消防泵房'], - [ '水泵接合器（地上）', '水泵接合器'], - [ '水泵接合器（地下）', '水泵接合器'], - [ '水泵接合器（墙壁）', '水泵接合器'], - [ '消防水泵房', '消防水泵房'], - [ '箱式消火栓', '箱式消火栓'], - [ '固定水炮', '消防水炮' ], - [ '消防水罐', '储水罐'], - [ '消防水罐2', '储水罐'], - [ '卧式水罐', '储水罐'], - [ '消防泵', '水泵' ], - [ '泡沫泵', '水泵' ], - [ '泡沫泵房', '泡沫站'], - [ '泡沫栓', '泡沫栓' ], - [ '泡沫枪', '泡沫枪'], - [ '泡沫发生器', '泡沫发生器' ], - [ '消防管网', '消防管网'], - [ '泡沫管网', '消防管网'], - [ 'DCS控制室', 'DCS控制室'] + ['消防水池', '消防水池'], + ['疏散楼梯', '疏散楼梯'], + ['消防电梯', '消防电梯'], + ['避难区域', '避难区域'], + ['安全出口', '安全出口'], + ['地上消火栓', '室外消火栓'], + ['地下消火栓', '室外消火栓'], + ['室内消火栓', '室内消火栓'], + ['供水管网', '供水管网'], + ['湿式自动喷淋系统', '湿式自动喷淋系统'], + ['水幕系统', '水幕系统'], + ['消防泵房', '消防泵房'], + ['水泵接合器（地上）', '水泵接合器'], + ['水泵接合器（地下）', '水泵接合器'], + ['水泵接合器（墙壁）', '水泵接合器'], + ['消防水泵房', '消防水泵房'], + ['箱式消火栓', '箱式消火栓'], + ['固定水炮', '消防水炮'], + ['消防水罐', '储水罐'], + ['消防水罐2', '储水罐'], + ['卧式水罐', '储水罐'], + ['消防泵', '水泵'], + ['泡沫泵', '水泵'], + ['泡沫泵房', '泡沫站'], + ['泡沫栓', '泡沫栓'], + ['泡沫枪', '泡沫枪'], + ['泡沫发生器', '泡沫发生器'], + ['消防管网', '消防管网'], + ['泡沫管网', '消防管网'], + ['DCS控制室', 'DCS控制室'] ]); /** * 向其他组件发送信息 * @@ -79,15 +79,15 @@ export class CanvasShareDataService { public sendMessage(message: any) { this._sendMessage.next(message); } - public getMessage(): Observable { + public getMessage(): Observable { return this._sendMessage.asObservable(); } //分段上传 - sectionUpload (companyId:string,file) { - let data = {filename: file.name} - return new Promise ((resolve, reject)=>{ - this.http.post(`/api/NewMultipartUpload/PlanPlatform/${companyId}/DisposalNode`,{},{params:data}).subscribe(async (data:any)=>{ //初始化分段上传 + sectionUpload(companyId: string, file) { + let data = { filename: file.name } + return new Promise((resolve, reject) => { + this.http.post(`/api/NewMultipartUpload/PlanPlatform/${companyId}/DisposalNode`, {}, { params: data }).subscribe(async (data: any) => { //初始化分段上传 let objectName = data.objectName let uploadId = data.uploadId let PartNumberETag = []; //每次返回需要保存的信息 @@ -95,30 +95,30 @@ export class CanvasShareDataService { let fileSize = file.size || null //上传文件的总大小 let shardSize = 5 * 1024 * 1024 //5MB一个分片 let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 - - for (let i = 0;i < allSlice;i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 - let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 - let formData = new FormData() - formData.append("file",file.slice(start, end)) - - //同步写法实现异步调用 - let result = await new Promise((resolve, reject) => { - // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/PlanPlatform/${objectName}?uploadId=${uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ - let msg = { "partNumber":data.partNumber || null, "eTag": data.eTag || null } - resolve(msg) // 调用 promise 内置方法处理成功 - }) - }); - PartNumberETag.push(result) - - if (PartNumberETag.length === allSlice) { //分块上传完成 - let data = PartNumberETag - let paramsData = {uploadId:uploadId} - this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${objectName}`,data,{params:paramsData}).subscribe(data=>{ - resolve(objectName) - }) - } + + for (let i = 0; i < allSlice; i++) { //循环分段上传 + let start = i * shardSize //切割文件开始位置 + let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 + let formData = new FormData() + formData.append("file", file.slice(start, end)) + + //同步写法实现异步调用 + let result = await new Promise((resolve, reject) => { + // await 需要后面返回一个 promise 对象 + this.http.post(`/api/MultipartUpload/PlanPlatform/${objectName}?uploadId=${uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { + let msg = { "partNumber": data.partNumber || null, "eTag": data.eTag || null } + resolve(msg) // 调用 promise 内置方法处理成功 + }) + }); + PartNumberETag.push(result) + + if (PartNumberETag.length === allSlice) { //分块上传完成 + let data = PartNumberETag + let paramsData = { uploadId: uploadId } + this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${objectName}`, data, { params: paramsData }).subscribe(data => { + resolve(objectName) + }) + } }//for循环 //分块 处理 @@ -127,7 +127,7 @@ export class CanvasShareDataService { } // 处置节点 筛选出 匹配数据 匹配不到 return undefined - findDisposalNode(parentId: string= null, name: string= null) { + findDisposalNode(parentId: string = null, name: string = null) { if (parentId && name) { // 匹配 父id, name const returnData = this.allDisposalNode.find(item => item.parentId === parentId && item.name === name); return returnData; @@ -154,7 +154,7 @@ export class CanvasShareDataService { /** * 删除建筑数据中当前楼层的数据 */ - public deleteBuildingDataByCurrentFloorData():void { + public deleteBuildingDataByCurrentFloorData(): void { Object.keys(this.originaleveryStoreyData.data).forEach((key) => { // 删除建筑数据 delete this.originalcompanyBuildingData.data[key]; @@ -294,7 +294,22 @@ export class CanvasShareDataService { facility.Id = ''; facility.Name = this.facilityAssetsName.get(item.Name); facility.AssetName = item.Name; - facility.PropertyInfos = item.PropertyInfos; + facility.PropertyInfos = []; + item.PropertyInfos.forEach(e => { + var p: PropertyInfo = new PropertyInfo(); + p.Enabled = e.Enabled; + p.Order = e.Order; + p.PhysicalUnit = e.PhysicalUnit; + p.PropertyName = e.PropertyName; + p.PropertyType = e.PropertyType; + p.PropertyValue = e.PropertyValue.toString(); + p.Required = e.Required; + p.RuleName = e.RuleName; + p.RuleValue = e.RuleValue; + p.Tag = e.Tag; + p.Visible = e.Visible; + facility.PropertyInfos.push(p); + }); facility.SitePlanId = item.FloorId; list.push(facility); } @@ -315,7 +330,22 @@ export class CanvasShareDataService { facility.Id = ''; facility.Name = this.facilityAssetsName.get(item.Name); facility.AssetName = item.Name; - facility.PropertyInfos = item.PropertyInfos; + facility.PropertyInfos = []; + item.PropertyInfos.forEach(e => { + var p: PropertyInfo = new PropertyInfo(); + p.Enabled = e.Enabled; + p.Order = e.Order; + p.PhysicalUnit = e.PhysicalUnit; + p.PropertyName = e.PropertyName; + p.PropertyType = e.PropertyType; + p.PropertyValue = e.PropertyValue.toString(); + p.Required = e.Required; + p.RuleName = e.RuleName; + p.RuleValue = e.RuleValue; + p.Tag = e.Tag; + p.Visible = e.Visible; + facility.PropertyInfos.push(p); + }); facility.BuildingAreaId = item.FloorId; list.push(facility); } @@ -364,7 +394,7 @@ export class CompanyAdjoinInfo { * 建筑毗邻 */ export class BuildingAdjoinInfo { - public BuildingId: string; + public BuildingId: string; public Id: string; public Name: string; public Direction: number; @@ -406,7 +436,7 @@ export class CompanyFacilityAssetInfo { public Id: string; public Name: string; public AssetName: string; - public PropertyInfos: string; + public PropertyInfos: PropertyInfo[]; public AssetId: string; public CompanyId: string; public SitePlanId: string; @@ -418,7 +448,7 @@ export class BuildingFacilityAssetInfo { public Id: string; public Name: string; public AssetName: string; - public PropertyInfos: string; + public PropertyInfos: PropertyInfo[]; public AssetId: string; public BuildingId: string; public BuildingAreaId: string; @@ -558,62 +588,62 @@ export class DisposalNode { * 方向。 */ export enum Direction { - /** - * 东 - */ - East, - /** - * 西 - */ - West, - /** - * 南 - */ - South, - /** - * 北 - */ - North, - /** - * 东南 - */ - Southeast, - /** - * 西南 - */ - Southwest, - /** - * 东北 - */ - Northeast, - /** - * 西北 - */ - Northwest + /** + * 东 + */ + East, + /** + * 西 + */ + West, + /** + * 南 + */ + South, + /** + * 北 + */ + North, + /** + * 东南 + */ + Southeast, + /** + * 西南 + */ + Southwest, + /** + * 东北 + */ + Northeast, + /** + * 西北 + */ + Northwest } /** * 风力等级 */ export enum WindScale { - WS0, - WS1, - WS2, - WS3, - WS4, - WS5, - WS6, - WS7, - WS8, - WS9, - WS10, - WS11, - WS12, - WS13, - WS14, - WS15, - WS16, - WS17, - WS18 + WS0, + WS1, + WS2, + WS3, + WS4, + WS5, + WS6, + WS7, + WS8, + WS9, + WS10, + WS11, + WS12, + WS13, + WS14, + WS15, + WS16, + WS17, + WS18 } /** * 处置节点数据 @@ -635,9 +665,9 @@ export class DisposalNodeData { * 图片地址 */ public BackgroundImageUrl: string; - /** - * 图片地址 - */ + /** + * 图片地址 + */ public BackgroundImageAngle: number; /** * 处置节点编号 @@ -669,105 +699,105 @@ export class FloorNodeData { * 素材数据 */ export class AssetData { - ///

- /// 模板编号 - /// + /// + /// 模板编号 + /// public TemplateId: string; - /// - /// 编号 - /// + /// + /// 编号 + /// public Id: string; - /// - /// 名称 - /// + /// + /// 名称 + /// public Name: string; - /// - /// 角度 - /// + /// + /// 角度 + /// public Angle: number; - /// - /// 颜色 - /// + /// + /// 颜色 + /// public Color: string; - /// - /// 坐标 - /// + /// + /// 坐标 + /// public Point: PIXI.Point; - /// - /// 宽度 - /// + /// + /// 宽度 + /// public Width: number; - /// - /// 高度 - /// + /// + /// 高度 + /// public Height: number; - /// - /// 是否启用 - /// + /// + /// 是否启用 + /// public Enabled: boolean; - /// - /// 填充方式 - /// + /// + /// 填充方式 + /// public FillMode: FillMode; - /// - /// 图片地址 - /// + /// + /// 图片地址 + /// public ImageUrl: string; - /// - /// 是否固定大小 - /// - public FixedSize: boolean; - /// - /// 点路径 - /// + /// + /// 是否固定大小 + /// + public FixedSize: boolean; + /// + /// 点路径 + /// public MultiPoint: PIXI.Point[]; - /// - /// 建筑ID - /// + /// + /// 建筑ID + /// public BuildingId: string; - /// - /// 单位ID - /// + /// + /// 单位ID + /// public CompanyId: string; - /// - /// 楼层编号 - /// + /// + /// 楼层编号 + /// public FloorId: string; - /// - /// 楼层名称 - /// + /// + /// 楼层名称 + /// public FloorName: string; - /// - /// 消防要素编号 - /// + /// + /// 消防要素编号 + /// public FireElementId: string; - /// - /// 属性列表 - /// + /// + /// 属性列表 + /// public PropertyInfos: PropertyInfo[]; - /// - /// 交互方式 - /// + /// + /// 交互方式 + /// public InteractiveMode: InteractiveMode; - /// - /// 是否来自建筑 - /// + /// + /// 是否来自建筑 + /// public IsFromBuilding: boolean; - /// - /// 渲染方式。 - /// + /// + /// 渲染方式。 + /// public DrawMode: ImageType; - /// - /// 9宫格边框数值。 - /// + /// + /// 9宫格边框数值。 + /// public Border: Border; - /// - /// 厚度。 - /// + /// + /// 厚度。 + /// public Thickness: number; - /// - /// 素材类型 - /// + /// + /// 素材类型 + /// public GameMode: GameMode; } /** @@ -808,9 +838,9 @@ export enum ImageType { */ export class Border { - public x: number; + public x: number; - public y: number; + public y: number; public z: number; From 5cc32ac599ce110f88d625385664155d821b1149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Mon, 1 Mar 2021 11:13:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=AE=AD=E5=A4=B4=E7=B4=A0=E6=9D=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/箭头.png | Bin 0 -> 296 bytes src/assets/images/箭头2.png | Bin 0 -> 316 bytes src/assets/images/箭头3.png | Bin 0 -> 274 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/assets/images/箭头.png create mode 100644 src/assets/images/箭头2.png create mode 100644 src/assets/images/箭头3.png diff --git a/src/assets/images/箭头.png b/src/assets/images/箭头.png new file mode 100644 index 0000000000000000000000000000000000000000..78c5a092cc29d0394a1c29bb92289aebc0060385 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^JRmj)8<3o<+3y6TI14-?iy0WWg+Q3`(%rg0K*3v{ zE{-7@6O;e^|8LLCr*QtjfdvdxtvG@YHF=j77H+(`GI+U|nYsDlt1&wY8XFl?nDt^p zLPTcGo%{Fa|NsB@J5>Dt_jmt?tb~LFfe)WP?Q);OHX+H}e7p4b_xJyc%EgTe~DWM4ftH*Y; literal 0 HcmV?d00001 diff --git a/src/assets/images/箭头2.png b/src/assets/images/箭头2.png new file mode 100644 index 0000000000000000000000000000000000000000..88610906fe6b2b1baee0c18f4c2b54df93d04e55 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3HFQ8hUO4Db50q$YKTtZXpn6ymYtj4^Z%( zr;B5V#>C`5|Nq+`Zs8QJla!D!IN*?*`&QoAc=L~Y_wHTg*}>rP_}|~(^?(2Wm+#rU zd9%H^sAy}`k&lULC7dL0wozX@-gwQ+Wv zyYUsF$~lVdzQ!KHC!!VJKjbY+IU5%j_uV0owb$y8l;e(FyQ1_gEPk-+%v&gB_*hW3 z=KsIDF-}fR(y=n@k3D+y=mOAcT^>%(MEimV49pzyI|>>>fRVvPPOI?njm}>{pEG#6 L`njxgN@xNAcIb&; literal 0 HcmV?d00001 diff --git a/src/assets/images/箭头3.png b/src/assets/images/箭头3.png new file mode 100644 index 0000000000000000000000000000000000000000..a838f47e52c79b2a17a0fdd0d4ec8fc19d0b6a9c GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^96&6@!3HGLoaUDSDb50q$YKTtZXpn6ymYtj4^Z%k zr;B5V#>C`5|Nq-F^N5Ixw>Qn$yLa#EhfNBs3NaxeBD>Pg&f-_#NjiKaP~|@maJNhp zH9UR#^z{|1SNn5uaV53RT(xxR(O*wbi=W?F{QO?(moH!D96fw^G0UWaqM}RxK0iPI z-MO9bF7wC#e}8|MIXZE+S*{iHqQ8Is_#`Cx@UR^C5O6?3MrO~9&Q4FEBO5nw4o*r; ze0XPj{{2va|EH(xf0uAf%u7u*wYIRB!5#U$jaORY-v0XgE(V)8+|2*696oS>f#K__ W>9Koc)b0cQ!{F)a=d#Wzp$P!n+;yb@ literal 0 HcmV?d00001 From 80892fe9c7097c070a29cf10d6e2c3cb0e0def98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Mon, 1 Mar 2021 11:14:11 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9A=82=E5=AD=98=20=20=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/model/axImageShape.ts | 24 +++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/app/working-area/model/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index 2a91bd1..f8bf366 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -5,7 +5,7 @@ import { PaintMode } from './paintModel'; import * as PIXI from 'pixi.js'; import { PropertyInfo } from './PropertyInfo'; import { AxShape } from './axShape'; -import { Sprite } from 'pixi.js'; +import { Sprite, Point } from 'pixi.js'; import { AxArrowConnector } from './axArrowConnector'; /** @@ -72,11 +72,33 @@ export class AxImageShape extends AxShape { this.addChild(this.selectionBox); //// + var leftUpPos = new Point(0, 0); + var upLeftDrag = false; + var leftDownPos = new Point(0, 0); + var rightUpPos = new Point(0, 0); + var rightDownPos = new Point(0, 0); // up-left this.upLeft = new PIXI.Sprite(this.pointTexture); this.upLeft.anchor.set(0.5); this.addChild(this.upLeft); this.upLeft.interactive = true; + this.upLeft.on('pointerdown', event => { + event.stopPropagation(); + upLeftDrag = true; + // this.pivot.set(1); + var imageRect = this.image.getLocalBounds(); + rightDownPos = new Point(imageRect.right, imageRect.bottom); + + + }); + this.upLeft.on('pointermove', event => { + // 移动时调整形状大小，然后重绘边框 + // 检查右下角距离鼠标的位置， + event.stopPropagation(); + leftUpPos = this.toLocal(event.data.global); + this.image.width = Math.abs(leftUpPos.x - rightDownPos.x); + this.image.height = Math.abs(leftUpPos.y - rightDownPos.y); + }); this.upLeft.visible = false; // up-right this.upRight = new PIXI.Sprite(this.pointTexture); From 9d2539ec47ee4ae8738f796fa15a5c81daa8e99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Mon, 1 Mar 2021 17:46:14 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=B7=A6=E4=B8=8A?= =?UTF-8?q?=E8=A7=92=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/working-area/model/axImageShape.ts | 109 +++++++-------------- src/app/working-area/model/axShape.ts | 66 ++++++------- 2 files changed, 70 insertions(+), 105 deletions(-) diff --git a/src/app/working-area/model/axImageShape.ts b/src/app/working-area/model/axImageShape.ts index f8bf366..5225df6 100644 --- a/src/app/working-area/model/axImageShape.ts +++ b/src/app/working-area/model/axImageShape.ts @@ -5,7 +5,7 @@ import { PaintMode } from './paintModel'; import * as PIXI from 'pixi.js'; import { PropertyInfo } from './PropertyInfo'; import { AxShape } from './axShape'; -import { Sprite, Point } from 'pixi.js'; +import { Sprite, Point, Rectangle } from 'pixi.js'; import { AxArrowConnector } from './axArrowConnector'; /** @@ -31,6 +31,7 @@ export class AxImageShape extends AxShape { wordWrapWidth: 100, }); + text = new PIXI.Text(this.assetData.Name + '\r\n' + this.assetData.PropertyInfos?.find(item => item.PropertyName === '名称/编号')?.PropertyValue, this.style); @@ -79,41 +80,67 @@ export class AxImageShape extends AxShape { var rightDownPos = new Point(0, 0); // up-left this.upLeft = new PIXI.Sprite(this.pointTexture); + this.upLeft.cursor = 'nwse-resize'; this.upLeft.anchor.set(0.5); this.addChild(this.upLeft); this.upLeft.interactive = true; this.upLeft.on('pointerdown', event => { - event.stopPropagation(); + upLeftDrag = true; - // this.pivot.set(1); - var imageRect = this.image.getLocalBounds(); + var imageRect = new Rectangle(this.image.x, this.image.y, this.image.width, this.image.height); + console.log('图片的边界大小', imageRect); rightDownPos = new Point(imageRect.right, imageRect.bottom); - + this.image.anchor.set(1); + this.image.position.set(this.image.position.x + (this.image.width / 2), this.image.position.y + (this.image.height / 2)); + event.stopPropagation(); }); this.upLeft.on('pointermove', event => { + // 移动时调整形状大小，然后重绘边框 // 检查右下角距离鼠标的位置， - event.stopPropagation(); - leftUpPos = this.toLocal(event.data.global); - this.image.width = Math.abs(leftUpPos.x - rightDownPos.x); - this.image.height = Math.abs(leftUpPos.y - rightDownPos.y); + if (upLeftDrag) { + leftUpPos = event.data.getLocalPosition(this.upLeft.parent); + console.log('鼠标点击位置的坐标', leftUpPos); + + this.assetData.Width = Math.abs(leftUpPos.x); + this.assetData.Height = Math.abs(leftUpPos.x); + this.refresh(); + } + + }); + this.upLeft.on('pointerup', event => { + if (upLeftDrag) { + upLeftDrag = false; + this.image.anchor.set(0.5); + this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y - (this.image.height / 2)); + } + }); + this.upLeft.on('pointerupoutside', event => { + if (upLeftDrag) { + upLeftDrag = false; + this.image.anchor.set(0.5); + this.image.position.set(this.image.position.x - (this.image.width / 2), this.image.position.y - (this.image.height / 2)); + } }); this.upLeft.visible = false; // up-right this.upRight = new PIXI.Sprite(this.pointTexture); + this.upRight.cursor = 'nesw-resize'; this.upRight.anchor.set(0.5); this.addChild(this.upRight); this.upRight.interactive = true; this.upRight.visible = false; // down-left this.downLeft = new PIXI.Sprite(this.pointTexture); + this.downLeft.cursor = 'nesw-resize'; this.downLeft.anchor.set(0.5); this.addChild(this.downLeft); this.downLeft.interactive = true; this.downLeft.visible = false; // down-right this.downRight = new PIXI.Sprite(this.pointTexture); + this.downRight.cursor = 'nwse-resize'; this.downRight.anchor.set(0.5); this.addChild(this.downRight); this.downRight.interactive = true; @@ -215,71 +242,8 @@ export class AxImageShape extends AxShape { this.downRight.scale.set(scale); } } - // paintingPipeline(x: number, y: number) { - // if (this.assetData.CanConnect) { - // if (this.workingArea.getPaintMode() === PaintMode.Pipeline) { - // if (this.workingArea.paintingShape === null) { - // this.workingArea.previewLineSegment.visible = true; - // this.workingArea.currentClickPoint.position = - // new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y); - // this.workingArea.paintPoints.push(new PIXI.Point(x, y)); - // const json = JSON.parse(JSON.stringify(this.workingArea.canvasData.selectTemplateData.propertyInfos)); - // const list = []; - // json.forEach(element => { - // const property = new PropertyInfo(element); - // list.push(property); - // }); - // const tempData = { - // TemplateId: this.workingArea.canvasData.selectTemplateData.id, - // CanConnect: this.workingArea.canvasData.selectTemplateData.canConnect, - // Pipelines: new Array(), - // FloorId: this.workingArea.canvasData.selectStorey.id, - // Angle: this.workingArea.canvasData.selectTemplateData.angle, - // Color: this.workingArea.canvasData.selectTemplateData.color, - // Enabled: this.workingArea.canvasData.selectTemplateData.enabled, - // FillMode: this.workingArea.canvasData.selectTemplateData.fillMode, - // FireElementId: this.workingArea.canvasData.selectTemplateData.fireElementId, - // FixedSize: this.workingArea.canvasData.selectTemplateData.fixedSize, - // Height : 32, - // Width : 32, - // Id: ObjectID.default.generate(), - // ImageUrl: this.workingArea.canvasData.selectTemplateData.imageUrl, - // InteractiveMode: this.workingArea.canvasData.selectTemplateData.interactiveMode, - // MultiPoint : JSON.parse(JSON.stringify(this.workingArea.paintPoints)), - // Point: new PIXI.Point(0, 0), - // Name : this.workingArea.canvasData.selectTemplateData.name, - // PropertyInfos: list, - // Border : this.workingArea.canvasData.selectTemplateData.border, - // DrawMode : this.workingArea.canvasData.selectTemplateData.drawMode, - // Thickness : this.workingArea.canvasData.selectTemplateData.thickness, - // IsFromBuilding : this.workingArea.canvasData.selectTemplateData.isFromBuilding, - // GameMode: this.workingArea.canvasData.gameMode, - // LinkedObjects: new Array(this.assetData.Id), - // Tag: this.workingArea.canvasData.selectTemplateData.tag - // }; - // this.workingArea.paintingShape = new AxArrowConnector(tempData, this.workingArea, false, true); - // this.assetData.Pipelines.push(this.workingArea.paintingShape.assetData.Id); - // this.workingArea.emit('createIcon', this.workingArea.paintingShape); - // } else { - // this.workingArea.previewLineSegment.visible = false; - // this.workingArea.currentClickPoint.position = - // new PIXI.Point(this.workingArea.circleShadow.x, this.workingArea.circleShadow.y); - // this.workingArea.paintPoints.push(new PIXI.Point(x, y)); - // this.workingArea.paintingShape.assetData.MultiPoint = - // JSON.parse(JSON.stringify(this.workingArea.paintPoints)); - // this.workingArea.paintingShape.assetData.LinkedObjects.push(this.assetData.Id); - // this.assetData.Pipelines.push(this.workingArea.paintingShape.assetData.Id); - // this.workingArea.paintingShape.redraw(); - // this.workingArea.initPipelineData(); - // } - // } - // } - // } // 刷新 public refresh() { - if (this.assetData.CanConnect) { - - } this.image.width = this.assetData.Width; this.image.height = this.assetData.Height; this.image.angle = this.assetData.Angle; @@ -289,5 +253,6 @@ export class AxImageShape extends AxShape { this.text.x = this.image.x; this.text.y = this.image.y - this.image.height / 2; this.angle = -this.workingArea.backgroundImage.angle; + this.drawBorder(1 / this.workingArea.backgroundImage.scale.x); } } diff --git a/src/app/working-area/model/axShape.ts b/src/app/working-area/model/axShape.ts index 5c6ce51..85ab02c 100644 --- a/src/app/working-area/model/axShape.ts +++ b/src/app/working-area/model/axShape.ts @@ -32,7 +32,7 @@ export class AxShape extends Graphics { this.workingArea.backgroundImage.addChild(this); this.zIndex = 200; this.interactive = true; - this.buttonMode = true; + // this.buttonMode = true; this .on('pointerdown', event => { event.stopPropagation(); @@ -88,10 +88,10 @@ export class AxShape extends Graphics { public hideBorder() { this.border.visible = false; } - /** - * 设置点显示状态 - * @param value 显示状态 - */ + /** + * 设置点显示状态 + * @param value 显示状态 + */ public setPointVisiable(value: boolean) { } @@ -112,7 +112,7 @@ export class AxShape extends Graphics { const spaceLength = scale * 1; const lineLenght = rect.width + 0.5 + 0.5; - const dashLength = scale * ( lineLenght + spaceLength - Math.floor((rect.width + rect.height) / 2 / 4.1)) / Math.floor((rect.width + rect.height) / 2 / 4.1); + const dashLength = scale * (lineLenght + spaceLength - Math.floor((rect.width + rect.height) / 2 / 4.1)) / Math.floor((rect.width + rect.height) / 2 / 4.1); this.drawDash(this.border, p1.x - 0.5 * scale, p1.y, p2.x + 0.5 * scale, p2.y, dashLength, spaceLength); this.drawDash(this.border, p2.x, p2.y - 0.5 * scale, p3.x, p3.y + 0.5 * scale, dashLength, spaceLength); this.drawDash(this.border, p3.x + 0.5 * scale, p3.y, p4.x - 0.5 * scale, p4.y, dashLength, spaceLength); @@ -126,36 +126,36 @@ export class AxShape extends Graphics { this.border.lineTo(p4.x, p4.y); this.border.closePath(); // this.border.endFill(); - } - // 画虚线 - drawDash(target, x1, y1, x2, y2, dashLength = 5, spaceLength = 1) { - const x = x2 - x1; - const y = y2 - y1; - let hyp = Math.sqrt((x) * (x) + (y) * (y)); - const units = hyp / (dashLength + spaceLength); - const dashSpaceRatio = dashLength / (dashLength + spaceLength); - const dashX = (x / units) * dashSpaceRatio; - const spaceX = (x / units) - dashX; - const dashY = (y / units) * dashSpaceRatio; - const spaceY = (y / units) - dashY; + } + // 画虚线 + drawDash(target, x1, y1, x2, y2, dashLength = 5, spaceLength = 1) { + const x = x2 - x1; + const y = y2 - y1; + let hyp = Math.sqrt((x) * (x) + (y) * (y)); + const units = hyp / (dashLength + spaceLength); + const dashSpaceRatio = dashLength / (dashLength + spaceLength); + const dashX = (x / units) * dashSpaceRatio; + const spaceX = (x / units) - dashX; + const dashY = (y / units) * dashSpaceRatio; + const spaceY = (y / units) - dashY; - target.moveTo(x1, y1); + target.moveTo(x1, y1); - while (hyp > 0) { - x1 += dashX; - y1 += dashY; - hyp -= dashLength; - if (hyp < 0) { - x1 = x2; - y1 = y2; + while (hyp > 0) { + x1 += dashX; + y1 += dashY; + hyp -= dashLength; + if (hyp < 0) { + x1 = x2; + y1 = y2; + } + target.lineTo(x1, y1); + x1 += spaceX; + y1 += spaceY; + target.moveTo(x1, y1); + hyp -= spaceLength; } - target.lineTo(x1, y1); - x1 += spaceX; - y1 += spaceY; - target.moveTo(x1, y1); - hyp -= spaceLength; - } - target.moveTo(x2, y2); + target.moveTo(x2, y2); } // 计算多边形重心 public calculatePolygonGravityCenter(points: PIXI.Point[]) {