From e505b15c20e3766e21ffaa9f147cda9a3356970d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Sat, 24 Jul 2021 10:26:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E6=B6=88=E9=98=B2?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BB=9F=E8=AE=A1=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/canvas-share-data.service.ts | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

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类干粉灭火器', '灭火器'],
+    ['手提式清水灭火器', '灭火器'],
+    ['手推式泡沫灭火器', '灭火器'],
+    ['推车式泡沫灭火器', '灭火器'],
+    ['灭火器', '灭火器']
   ]);
 
   /** * 向其他组件发送信息 *

From 4b0070b2f09c9338de874268b9f6f8c6502f35fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Wed, 28 Jul 2021 10:45:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9PropertyValue=20=E4=B8=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/working-area/working-area.component.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 694c53b..6a02533 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',
         },
       ],

From 1233b10cd29c63eb50525d305158ce2ac1600429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com>
Date: Wed, 28 Jul 2021 14:45:29 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=9B=BE=E4=BE=8B=E6=95=B0=E6=8D=AEPropertyValue?=
 =?UTF-8?q?=E4=B8=BA=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/working-area/working-area.component.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts
index 6a02533..c7a005a 100644
--- a/src/app/working-area/working-area.component.ts
+++ b/src/app/working-area/working-area.component.ts
@@ -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);
     }
   }
   // /**