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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/contingencyManagement/panManagement/index.vue b/src/views/contingencyManagement/panManagement/index.vue
index 3602b17..46cdbb7 100644
--- a/src/views/contingencyManagement/panManagement/index.vue
+++ b/src/views/contingencyManagement/panManagement/index.vue
@@ -25,7 +25,7 @@
<el-button size="default" type="primary" @click="onOpenAdd">
<el-icon> <Plus /> </el-icon>新建
</el-button>
- <el-button size="default" type="warning" plain :disabled="warning">
+ <el-button size="default" type="warning" plain :disabled="warning" @click="onEdit('修改', deleteAll[0])">
<el-icon> <Edit /> </el-icon>修改
</el-button>
<el-button size="default" type="danger" plain :disabled="danger" @click="onDeleteAll">
@@ -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