From d21c3b3bca304c35d9fa7a45792a091c671d574d Mon Sep 17 00:00:00 2001
From: DIAMOND <276397553@qq.com>
Date: Fri, 30 Dec 2022 09:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/page/Model/LabelEditModel.vue | 16 ++++++++++++++--
 src/views/page/cameraCenter.vue         | 10 ++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/page/Model/LabelEditModel.vue b/src/views/page/Model/LabelEditModel.vue
index c8eca9a..10059a3 100644
--- a/src/views/page/Model/LabelEditModel.vue
+++ b/src/views/page/Model/LabelEditModel.vue
@@ -28,7 +28,7 @@
             <Col :span="24" class="label-attribute">
             <div class="label-btn">
                 <Button type="primary">保存</Button>
-                <Button style="color:black;">取消</Button>
+                <Button style="color:black;" @click="cancel">取消</Button>
             </div>
             </Col>
         </Row>
@@ -37,8 +37,20 @@
 </template>
 
 <script setup lang='ts'>
-import { Input, Row, Col, InputNumber, Button } from 'ant-design-vue'
+import { Input, Row, Col, InputNumber, Button, notification } from 'ant-design-vue'
 import Draggable from '@/components/Draggable.vue'
+import { onMounted } from 'vue';
+
+onMounted(()=>{
+
+})
+
+//取消
+function cancel(){
+    notification.close("editLabel");
+}
+
+
 </script>
 
 <style scoped lang='less'>
diff --git a/src/views/page/cameraCenter.vue b/src/views/page/cameraCenter.vue
index b669af9..3f575e2 100644
--- a/src/views/page/cameraCenter.vue
+++ b/src/views/page/cameraCenter.vue
@@ -26,7 +26,7 @@
                     </div>
                 </div>
                 <template #overlay>
-                    <a-menu @click="({ key: menuKey }) => onContextMenuClick(item.id, menuKey)">
+                    <a-menu @click="({ key: menuKey }) => onContextMenuClick(item, menuKey)">
                         <a-menu-item key="edit">编辑</a-menu-item>
                         <a-menu-item key="delete">删除</a-menu-item>
                     </a-menu>
@@ -148,8 +148,10 @@ function loadVideoCanvas() {
         changeVideoCanvasSize();
     });
 }
-const onContextMenuClick = (labelId: string, menuKey: string) => {
-    console.log(`labelId: ${labelId}, menuKey: ${menuKey}`);
+const onContextMenuClick = (item: any, menuKey: string,) => {
+    console.log(`labelId: ${item.id}, menuKey: ${menuKey}`);
+    // console.log(`item: ${item}`);
+    console.log(item);
     //防止添加多个key值，再次点击不能关闭。数组去重
     if (menuKey == "edit") {
         popup("编辑标签", [h(LabelEditModel)], "editLabel");
@@ -178,7 +180,7 @@ const onContextMenuClick = (labelId: string, menuKey: string) => {
                 danger: true,
             },
             onOk() {
-                deleteLabel(parseInt(labelId))
+                deleteLabel(parseInt(item.id))
 
             },
             style: "top: 250px",