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/emergencyResources/maintenanceOfEmergencyMaterials/index.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
index f45019b..fee9bf1 100644
--- a/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
+++ b/src/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/index.vue
@@ -19,7 +19,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('修改', deletAll[0])">
<el-icon> <Edit /> </el-icon>修改
</el-button>
<el-button size="default" type="danger" plain @click="onDeleteAll" :disabled="danger">
@@ -93,10 +93,10 @@
// FormInstance,
} from 'element-plus';
import { Plus, Search, Delete, Edit, Download, Refresh, View, EditPen } from '@element-plus/icons-vue';
-// import OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/component/openSee.vue';
-// import UpData from '/@/views/contingencyManagement/panManagement/component/upData.vue';
+// import OpenSee from '/@/views/contingencyManagement/emergencyPlanStartRecord/components/openSee.vue';
+// import UpData from '/@/views/contingencyManagement/panManagement/components/upData.vue';
// import EmergencySupplies from '/@/components/emergencySupplies/index.vue';
-// import OpenAdd from '/@/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/component/openAdd.vue';
+// import OpenAdd from '/@/views/contingencyManagement/emergencyResources/maintenanceOfEmergencyMaterials/components/openAdd.vue';
// import { contingencyApi } from '/@/api/contingency';
// import { emergencySuppliesMaintainApi } from '/@/api/emergencySuppliesMaintain';
@@ -319,6 +319,7 @@
onDeleteAll,
onEdit,
onUser,
+ deletAll
};
},
});
@@ -391,4 +392,4 @@
min-width: 30px;
border-radius: 2px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2