From 35eab5ac87a0e30f48875aa1d1e9a759481ed168 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Tue, 25 Jun 2024 15:48:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=B1=E9=87=87=E6=95=B0=E6=8D=AE=E5=8A=A0?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/draw-app/dialogs/CiCjList.vue | 15 +++++++++++++
 src/drawApp/relayCabinetLayoutApp.ts         | 22 ++++++++++++--------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/draw-app/dialogs/CiCjList.vue b/src/components/draw-app/dialogs/CiCjList.vue
index 4ee6634..44a55cd 100644
--- a/src/components/draw-app/dialogs/CiCjList.vue
+++ b/src/components/draw-app/dialogs/CiCjList.vue
@@ -32,6 +32,12 @@
       </div>
     </div>
     <template v-slot:titleButton>
+      <q-btn
+        color="primary"
+        label="清空"
+        style="margin-right: 10px"
+        @click="clearCiCjListData"
+      />
       <q-btn
         color="primary"
         label="设置"
@@ -85,6 +91,7 @@ import {
   loadCiCjList,
   creatCiCjList,
   refRelaysListMap,
+  clearCiCjList,
 } from 'src/drawApp/relayCabinetLayoutApp';
 import { relayCabinetGraphicData } from 'src/protos/relayCabinetLayoutGraphics';
 import { Relay } from 'src/graphics/relay/Relay';
@@ -175,6 +182,14 @@ function updateMap() {
   });
 }
 
+function clearCiCjListData() {
+  clearCiCjList(setCellMessage.value.rows, setCellMessage.value.cols);
+  ciCjList = loadCiCjList();
+  updateMap();
+  setCellDialog.value = true;
+  setCellDialog.value = false;
+}
+
 const showTooltip = ref(false);
 function onMouseOver(e: MouseEvent) {
   if ((e.target as HTMLElement).clientHeight > 30) {
diff --git a/src/drawApp/relayCabinetLayoutApp.ts b/src/drawApp/relayCabinetLayoutApp.ts
index 4ce2a6d..d4885d2 100644
--- a/src/drawApp/relayCabinetLayoutApp.ts
+++ b/src/drawApp/relayCabinetLayoutApp.ts
@@ -384,15 +384,7 @@ export function loadCiCjList() {
 
 export function creatCiCjList(rows: number, cols: number) {
   if (ciCjList == undefined) {
-    ciCjList = new relayCabinetGraphicData.CiCj();
-    ciCjList.dsCount = rows;
-    for (let i = 0; i < cols; i++) {
-      ciCjList.cjList[i] = new relayCabinetGraphicData.CjDataSet();
-      ciCjList.cjList[i].name = 'D' + (i + 1);
-      for (let j = 0; j < rows; j++) {
-        ciCjList.cjList[i].bitList[j] = new relayCabinetGraphicData.CjData();
-      }
-    }
+    clearCiCjList(rows, cols);
   } else {
     const oldRows = ciCjList.dsCount;
     ciCjList.dsCount = rows;
@@ -448,6 +440,18 @@ export function creatCiCjListByCombinationtype(
   }
 }
 
+export function clearCiCjList(rows: number, cols: number) {
+  ciCjList = new relayCabinetGraphicData.CiCj();
+  ciCjList.dsCount = rows;
+  for (let i = 0; i < cols; i++) {
+    ciCjList.cjList[i] = new relayCabinetGraphicData.CjDataSet();
+    ciCjList.cjList[i].name = 'D' + (i + 1);
+    for (let j = 0; j < rows; j++) {
+      ciCjList.cjList[i].bitList[j] = new relayCabinetGraphicData.CjData();
+    }
+  }
+}
+
 //驱动列表的增删改查
 let ciQdList: relayCabinetGraphicData.CiQd;
 export function loadCiQdList() {