From 5805beb0cd42ad56e1e46e6eb49c998f308b9319 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 29 九月 2025 18:04:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 admin/src/views/business/warning.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/business/warning.vue b/admin/src/views/business/warning.vue
index 3c0b76e..9bf46b9 100644
--- a/admin/src/views/business/warning.vue
+++ b/admin/src/views/business/warning.vue
@@ -14,7 +14,7 @@
           <el-option label="澶╂皵棰勮" value="4"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="鎶ヨ鍒嗙被" prop="level" >
+      <el-form-item label="鎶ヨ绛夌骇" prop="level" >
         <el-select v-model="searchForm.level" placeholder="璇烽�夋嫨" clearable @change="search">
           <el-option label="浣�" value="0"></el-option>
           <el-option label="涓�" value="1"></el-option>
@@ -22,7 +22,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="璁㈤槄鐘舵��" prop="status" >
-          <el-select v-model="searchForm.level" placeholder="璇烽�夋嫨" clearable @change="search">
+          <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" clearable @change="search">
             <el-option label="鏈闃�" value="0"></el-option>
             <el-option label="宸茶闃�" value="1"></el-option>
           </el-select>
@@ -43,7 +43,7 @@
     <template v-slot:table-wrap>
       <ul class="toolbar" v-permissions="['business:warning:create', 'business:warning:delete']">
         <li><el-button type="primary" @click="$refs.operaWarningWindow.open('鏂板缓鎶ヨ璁板綍淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:warning:create']">鏂板缓</el-button></li>
-        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:warning:delete']">鍒犻櫎</el-button></li>
+        <li><el-button @click="deleteByIdInBatch" type="danger"   icon="el-icon-delete" v-permissions="['business:warning:delete']">鍒犻櫎</el-button></li>
       </ul>
       <el-table
           :height="tableHeightNew"
@@ -94,7 +94,7 @@
         >
           <template slot-scope="{row}">
             <el-button type="text" @click="$refs.operaWarningWindow.open('缂栬緫鎶ヨ璁板綍淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:warning:update']">缂栬緫</el-button>
-            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:warning:delete']">鍒犻櫎</el-button>
+            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" style="color: red" v-permissions="['business:warning:delete']">鍒犻櫎</el-button>
           </template>
         </el-table-column>
       </el-table>

--
Gitblit v1.9.3