diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index 105cfdf..4f40baa 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -51,7 +51,6 @@ export class CanvasShareDataService { ['地下消火栓', '室外消火栓'], ['室内消火栓', '室内消火栓'], ['供水管网', '供水管网'], - ['湿式自动喷淋系统', '湿式自动喷淋系统'], ['水幕系统', '水幕系统'], ['消防泵房', '消防泵房'], ['水泵接合器(地上)', '水泵接合器'], @@ -75,6 +74,25 @@ export class CanvasShareDataService { ['泡沫管网', '消防管网'], ['DCS控制室', 'DCS控制室'], ['消防控制室', '消防控制室'], + ['水喷淋系统', '自动喷水灭火系统'], + ['湿式自动喷淋系统', '自动喷水灭火系统'], + ['干式自动喷淋系统', '自动喷水灭火系统'], + ['消防电话', '消防通信'], + ['扶梯', '自动扶梯'], + ['风机房', '风机房'], + ['风亭', '风亭'], + ['防火卷帘', '防火卷帘'], + ['手提式BC类干粉灭火器', '灭火器'], + ['推车式ABC干粉灭火器', '灭火器'], + ['手提式泡沫灭火器', '灭火器'], + ['推车式BC干粉灭火器', '灭火器'], + ['推车式灭火器', '灭火器'], + ['手提式二氧化碳灭火器', '灭火器'], + ['手提式ABC类干粉灭火器', '灭火器'], + ['手提式清水灭火器', '灭火器'], + ['手推式泡沫灭火器', '灭火器'], + ['推车式泡沫灭火器', '灭火器'], + ['灭火器', '灭火器'] ]); /** * 向其他组件发送信息 * diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 694c53b..c7a005a 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -1239,7 +1239,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV RuleValue: '', PhysicalUnit: '', PropertyName: '列', - PropertyType: 2, + PropertyType: '2', PropertyValue: '2', }, ], @@ -1274,6 +1274,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.emit('createIcon', axLegend); } else { const axLegend = new AxLegend(data, this, shapeMap); + axLegend.assetData.PropertyInfos[0].PropertyValue = String(axLegend.assetData.PropertyInfos[0].PropertyValue); } } // /**