|
|
@@ -36,6 +36,34 @@
|
|
|
:clearable="timeClearable"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="告警状态" prop="state">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.state"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择告警状态"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sensor_alarm_status"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="设备类型" prop="deviceType">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.deviceType"
|
|
|
+ clearable
|
|
|
+ placeholder="请选择设备类型"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.sensor_device_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
<el-row :gutter="10">
|
|
|
@@ -85,9 +113,9 @@
|
|
|
size="small"
|
|
|
>
|
|
|
<el-table-column label="设备名称" align="center" prop="deviceName" width="220"/>
|
|
|
- <el-table-column label="设备类型" align="center" prop="categoryType"/>
|
|
|
+ <el-table-column label="设备类型" align="center" prop="deviceType"/>
|
|
|
<el-table-column label="所属机构" align="center" prop="orgName" width="220"/>
|
|
|
- <el-table-column label="告警状态" align="center" prop="alarmStatus" width="220"/>
|
|
|
+ <el-table-column label="告警状态" align="center" prop="stateText" width="220"/>
|
|
|
<el-table-column label="最近一次上报时间" align="center" prop="updateTime" width="220"/>
|
|
|
<el-table-column label="上报内容" align="center" prop="info" width="220" show-overflow-tooltip="showOverflowTooltip"/>
|
|
|
<el-table-column
|
|
|
@@ -131,7 +159,7 @@ import { mapGetters } from "vuex";
|
|
|
export default {
|
|
|
components: { OrgTree, DataRangePicker,DetailDialog },
|
|
|
name: "Task",
|
|
|
- dicts: ["sys_org_type"],
|
|
|
+ dicts: ["sys_org_type",'sensor_alarm_status','sensor_device_type'],
|
|
|
data() {
|
|
|
return {
|
|
|
// 遮罩层
|
|
|
@@ -156,6 +184,8 @@ export default {
|
|
|
pageSize: 10,
|
|
|
dateRange: [],
|
|
|
checkSub: true,
|
|
|
+ deviceType: null,
|
|
|
+ state: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|