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/contingency/index.vue | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/views/contingencyManagement/contingency/index.vue b/src/views/contingencyManagement/contingency/index.vue
index 45d576e..abd6fb3 100644
--- a/src/views/contingencyManagement/contingency/index.vue
+++ b/src/views/contingencyManagement/contingency/index.vue
@@ -30,11 +30,11 @@
<Plus />
</el-icon>新建
</el-button>
-<!-- <el-button size="default" type="warning" plain :disabled="warning">-->
-<!-- <el-icon>-->
-<!-- <Edit />-->
-<!-- </el-icon>修改-->
-<!-- </el-button>-->
+ <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">
<el-icon>
<Delete />
@@ -142,6 +142,7 @@
// Upload,
// Download,
// Refresh,
+ Edit,
View,
EditPen,
} from '@element-plus/icons-vue'
@@ -155,6 +156,7 @@
components: {
OpenAdd,
View,
+ Edit,
EditPen,
Plus,
Delete,
@@ -203,7 +205,7 @@
listQuery.searchParams.teamLevel = '';
onSubmit();
};
- // const warning = ref(true);
+ const warning = ref(true);
const danger = ref(true);
const deleteAll = ref();
const handleSelectionChange = (val: any) => {
@@ -214,13 +216,13 @@
}
deleteAll.value = arr;
if (val.length == 1) {
- // warning.value = false;
+ warning.value = false;
danger.value = false;
} else if (val.length == 0) {
- // warning.value = true;
+ warning.value = true;
danger.value = true;
} else {
- // warning.value = true;
+ warning.value = true;
danger.value = false;
}
};
@@ -346,7 +348,7 @@
onHandleSizeChange,
onHandleCurrentChange,
deleteAll,
- // warning,
+ warning,
danger,
};
},
--
Gitblit v1.9.2