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/panManagement/index.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/contingencyManagement/panManagement/index.vue b/src/views/contingencyManagement/panManagement/index.vue
index 798e7e2..46cdbb7 100644
--- a/src/views/contingencyManagement/panManagement/index.vue
+++ b/src/views/contingencyManagement/panManagement/index.vue
@@ -172,12 +172,12 @@
 'element-plus';
 import { Plus, Edit, Delete, Upload, Download, Refresh, VideoPause, VideoPlay, EditPen, FullScreen } from '@element-plus/icons-vue';
 import OpenAdd from '/@/views/contingencyManagement/panManagement/component/openAdd.vue';
-// import StartUp from '/@/views/contingencyManagement/panManagement/component/startUp.vue';
+// import StartUp from '/@/views/contingencyManagement/panManagement/components/startUp.vue';
 import AbolishLibrary from '/@/views/contingencyManagement/panManagement/component/abolishLibrary.vue';
 import ApprovalProcess from '/@/views/contingencyManagement/panManagement/component/approvalProcess.vue';
 import InitiateApproval from '/@/views/contingencyManagement/panManagement/component/initiateApproval.vue';
 import Approval from '/@/views/contingencyManagement/panManagement/component/approval.vue';
-// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
+// import UpData from '/@/views/contingencyManagement/panManagement/components/upData.vue';
 import { emergencyPlanApi } from '/@/api/contingencyManagement/emergencyPlan';
 import { emergencyPlanLogApi } from '/@/api/contingencyManagement/emergencyPlanLog';
 

--
Gitblit v1.9.2