From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict

---
 src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/flowChart.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/flowChart.vue b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/flowChart.vue
index 8e18978..5dad014 100644
--- a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/flowChart.vue
+++ b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/flowChart.vue
@@ -8,7 +8,7 @@
         :fullscreen="full"
     >
       <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
-      <img class="process-status-img" src="src/assets/icon.png">
+      <!-- <img class="process-status-img" src="src/assets/icon.png"> -->
       <el-tabs type="border-card">
         <el-tab-pane label="流转记录">
           <el-card class="box-card" shadow="hover">

--
Gitblit v1.9.2