rk
2025-09-29 5805beb0cd42ad56e1e46e6eb49c998f308b9319
Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
已修改2个文件
12 ■■■■ 文件已修改
admin/src/views/business/warning.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/warningRule.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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>
admin/src/views/business/warningRule.vue
@@ -23,7 +23,7 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:warningrule:create', 'business:warningrule:delete']">
        <li><el-button type="primary" @click="$refs.operaWarningRuleWindow.open('新建报警规则配置')" icon="el-icon-plus" v-permissions="['business:warningrule:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:warningrule:delete']">删除</el-button></li>
        <li><el-button @click="deleteByIdInBatch" type="danger" icon="el-icon-delete" v-permissions="['business:warningrule:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
@@ -52,7 +52,7 @@
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaWarningRuleWindow.open('编辑报警规则配置', row)" icon="el-icon-edit" v-permissions="['business:warningrule:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:warningrule:delete']">删除</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete"  style="color: red" v-permissions="['business:warningrule:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>