From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/goalManagement/safetyAssessment/index.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/goalManagement/safetyAssessment/index.vue b/src/views/goalManagement/safetyAssessment/index.vue
index 4925e9b..a0e4db8 100644
--- a/src/views/goalManagement/safetyAssessment/index.vue
+++ b/src/views/goalManagement/safetyAssessment/index.vue
@@ -39,7 +39,7 @@
<template #default="scope">
<el-button link type="primary" size="default" :icon="View" @click="openD('查看', scope.row.id)">查看</el-button>
<el-button link type="primary" size="default" :icon="View" @click="openD('修改', scope.row.id)">修改</el-button>
- <el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除</el-button>
+ <!--<el-button link type="primary" size="default" :icon="Delete" @click="onDelete(scope.row.id)">删除</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -209,4 +209,4 @@
display: flex;
justify-content: right;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2