消除bug

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>