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: '取消',

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