|
@@ -23,9 +23,9 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="状态" prop="type">
|
|
|
+ <el-form-item label="状态" prop="status">
|
|
|
<el-select
|
|
|
- v-model="queryParams.type"
|
|
|
+ v-model="queryParams.status"
|
|
|
placeholder="请选择状态"
|
|
|
clearable
|
|
|
filterable
|
|
@@ -60,7 +60,6 @@
|
|
|
</el-row>
|
|
|
|
|
|
<el-table
|
|
|
-
|
|
|
:data="GATHERWARNINGList"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
@@ -89,9 +88,9 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="状态" align="center" prop="cancelBy">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.status == 0">预警</span>
|
|
|
- <span v-else-if="scope.row.status == 1">已解除</span>
|
|
|
- <span v-else-if="scope.row.status == 2">已取消</span>
|
|
|
+ <el-tag v-if="scope.row.status == 0" type="danger">预警</el-tag>
|
|
|
+ <el-tag v-else-if="scope.row.status == 1" type="success">已解除</el-tag>
|
|
|
+ <el-tag v-else-if="scope.row.status == 2" type="info">已取消</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="取消人" align="center" prop="cancelBy">
|
|
@@ -130,6 +129,7 @@
|
|
|
@confirm="handleCancel(scope.row)"
|
|
|
>
|
|
|
<el-button
|
|
|
+ style="margin-left: 5px;"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
slot="reference"
|