From e9c0e294e8aff3f76679f7c7f890d2dbf74639d3 Mon Sep 17 00:00:00 2001
From: wenlong92 <835952234@qq.com>
Date: Mon, 5 Dec 2022 17:45:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4bug;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/resourceManager/components/poolManager.vue      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-portal/src/views/resourceManager/components/poolManager.vue b/admin-portal/src/views/resourceManager/components/poolManager.vue
index 1f1f1d4b..ae6c4bd3 100644
--- a/admin-portal/src/views/resourceManager/components/poolManager.vue
+++ b/admin-portal/src/views/resourceManager/components/poolManager.vue
@@ -67,7 +67,7 @@
             </el-table-column>
             <el-table-column label="操作">
                 <template slot-scope="scope">
-                    <el-button v-if="scope.row.default===false" type="text" @click="delete(scope.row)">删除</el-button>
+                    <el-button v-if="scope.row.default===false" type="text" @click="handleDeletePool(scope.row)">删除</el-button>
                     <el-button type="text" @click="handleEdit( scope.row)">编辑</el-button>
                 </template>
             </el-table-column>
@@ -489,7 +489,7 @@
                 })
             },
             // 删除确认
-            delete(val) {
+            handleDeletePool(val) {
                 this.$confirm('此操作将永久删除该资源规格, 是否继续?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
-- 
2.34.1


From 7b29f9d56a061f2a93a94cc5dfb952e52179f226 Mon Sep 17 00:00:00 2001
From: wenlong92 <835952234@qq.com>
Date: Tue, 6 Dec 2022 09:13:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90,=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=A1=86;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resourceManager/components/resource.vue   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/admin-portal/src/views/resourceManager/components/resource.vue b/admin-portal/src/views/resourceManager/components/resource.vue
index 1c619423..639d78dd 100644
--- a/admin-portal/src/views/resourceManager/components/resource.vue
+++ b/admin-portal/src/views/resourceManager/components/resource.vue
@@ -174,8 +174,8 @@
                     }
                 });
             },
-            handleDelete(row) {
-                deleteResource(row.id).then(response => {
+            deleteRes(val) {
+                deleteResource(val.id).then(response => {
                     if (response.success) {
                         this.$message({
                             message: '删除成功',
@@ -190,6 +190,21 @@
                     }
                 })
             },
+            handleDelete(row) {
+              this.$confirm('此操作将永久删除该资源规格, 是否继续?', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    this.deleteRes(row)
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除'
+                    });
+                });
+                
+            },
             add() {
                 this.ruleForm = {}
                 this.flag = true
-- 
2.34.1