From c110a716edf56e38a541123afd78446d37d2906f Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 2 Nov 2023 10:26:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/draw-app/dialogs/CiCjList.vue | 2 +-
 src/components/draw-app/dialogs/CiQdList.vue | 2 +-
 src/drawApp/relayCabinetLayoutApp.ts         | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/draw-app/dialogs/CiCjList.vue b/src/components/draw-app/dialogs/CiCjList.vue
index 75e1f1f..b82302c 100644
--- a/src/components/draw-app/dialogs/CiCjList.vue
+++ b/src/components/draw-app/dialogs/CiCjList.vue
@@ -167,7 +167,7 @@ function updateMap() {
             ? 'Q'
             : 'H';
         if (refDeviceData) {
-          return `${refDeviceData?.device}_${refDeviceData?.combinationtype}_${relay.datas.code}_${pos}`;
+          return `${refDeviceData.device}_${refDeviceData.combinationtype}_${relay.datas.code}_${pos}`;
         } else {
           return `${conbinationData}_${relay.datas.code}_${pos}`;
         }
diff --git a/src/components/draw-app/dialogs/CiQdList.vue b/src/components/draw-app/dialogs/CiQdList.vue
index 0ad8c76..d5cfadc 100644
--- a/src/components/draw-app/dialogs/CiQdList.vue
+++ b/src/components/draw-app/dialogs/CiQdList.vue
@@ -163,7 +163,7 @@ function updateMap() {
           .getDrawApp()
           .queryStore.queryById<Relay>(refRelay);
         if (refDeviceData) {
-          return `${refDeviceData?.device}_${refDeviceData?.combinationtype}_${relay.datas.code}`;
+          return `${refDeviceData.device}_${refDeviceData.combinationtype}_${relay.datas.code}`;
         } else {
           return `${conbinationData}_${relay.datas.code}`;
         }
diff --git a/src/drawApp/relayCabinetLayoutApp.ts b/src/drawApp/relayCabinetLayoutApp.ts
index 0157462..83390c5 100644
--- a/src/drawApp/relayCabinetLayoutApp.ts
+++ b/src/drawApp/relayCabinetLayoutApp.ts
@@ -162,6 +162,7 @@ export function initDrawApp(): IDrawApp {
     refRelaysList = [];
     combinationTypeList = [];
     refRelaysListMap.clear();
+    combinationListMap.clear();
   });
   return drawApp;
 }