From 39cde34f8d36808c55caba20ef6c231d6b1e4807 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Fri, 22 Mar 2024 21:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../perception/eventDetection/components/eventQuery/index.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
index a4466fe3..638c3791 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/index.vue
@@ -46,11 +46,7 @@
         <WgtTitle :title="'感知事件类型分析'"></WgtTitle>
         <div class="unit_con unit_con_02">
           <Empty v-show="!chart2List || chart2List.length <= 0" text="暂无数据..." class="empty"></Empty>
-<<<<<<< HEAD
           <div ref="chart2" class="chart_div" style="width: 540px; height: 270px;" ></div>
-=======
-          <div id="chart2" class="chart_div"></div>
->>>>>>> 25407af3e8fe5fa68f3e9252cc6270c7da576ce6
         </div>
       </div>