1

src/views/alarmConfiguration/index.vue

@@ -64,13 +64,17 @@
               @click="handleEdit(row, 'edit')"
               >编辑</el-link
             >
-            <el-link
-              type="danger"
-              :underline="false"
-              @click="handleDelete(row)"
-              style="margin-left: 8px"
-              >删除</el-link
+            <el-popconfirm
+              class="ele-action"
+              title="确定要删除此告警设置吗？"
+              @confirm="handleDelete(row)"
             >
+              <template v-slot:reference>
+                <el-link type="danger" :underline="false" icon="el-icon-delete">
+                  删除
+                </el-link>
+              </template>
+            </el-popconfirm>
           </template>
         </ele-pro-table>
       </div>
@@ -207,10 +211,10 @@
       handleEdit(row, type) {
         this.$refs.alarmDialogRef.open(row, type);
       },
-      remove(row) {
+      handleDelete(row) {
         remove([row.id]).then((res) => {
           this.$message.success('删除成功！');
-          this.reload();
+          this.handleReset();
         });
       },
       // 搜索

src/views/useEnergyWarning/index.vue

@@ -298,19 +298,19 @@
             width: '280px',
             placeholder: '编码、名称'
           },
-          {
-            label: '告警等级',
-            value: 'level',
-            type: 'select',
-            placeholder: '请选择',
-            planList: [
-              { value: 1, label: '提示' },
-              { value: 2, label: '一般' },
-              { value: 3, label: '严重' },
-              { value: 4, label: '紧急' },
-              { value: 5, label: '致命' }
-            ]
-          }
+          // {
+          //   label: '告警等级',
+          //   value: 'level',
+          //   type: 'select',
+          //   placeholder: '请选择',
+          //   planList: [
+          //     { value: 1, label: '提示' },
+          //     { value: 2, label: '一般' },
+          //     { value: 3, label: '严重' },
+          //     { value: 4, label: '紧急' },
+          //     { value: 5, label: '致命' }
+          //   ]
+          // }
         ];
       }
     },