fix alert record

liutao_branch
chenshuichuan 2 years ago
parent d171725541
commit 40472a6fa4

@ -274,4 +274,5 @@ export enum DICT_TYPE {
IOT_DEVICE_USE_TYPE = "iot_device_use_type", IOT_DEVICE_USE_TYPE = "iot_device_use_type",
IOT_ATTRIBUTE_IO_TYPE = "iot_attribute_io_type", IOT_ATTRIBUTE_IO_TYPE = "iot_attribute_io_type",
IOT_ALERT_TYPE = "iot_alert_type", IOT_ALERT_TYPE = "iot_alert_type",
IOT_ALERT_LEVEL = "iot_alert_level",
} }

@ -24,7 +24,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="告警等级" prop="alertLevel"> <el-form-item label="告警等级" prop="alertLevel">
<el-input v-model="formData.alertLevel" placeholder="请输入告警等级" /> <el-select v-model="formData.alertLevel" placeholder="请输入告警等级">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALERT_LEVEL)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="告警内容" prop="content"> <el-form-item label="告警内容" prop="content">
<Editor v-model="formData.content" height="150px" /> <Editor v-model="formData.content" height="150px" />
@ -168,4 +175,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

@ -24,7 +24,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="告警等级" prop="alertLevel"> <el-form-item label="告警等级" prop="alertLevel">
<el-input v-model="formData.alertLevel" placeholder="请输入告警等级" /> <el-select v-model="formData.alertLevel" placeholder="请输入告警等级">
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALERT_LEVEL)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="告警内容" prop="content"> <el-form-item label="告警内容" prop="content">
<Editor v-model="formData.content" height="150px" /> <Editor v-model="formData.content" height="150px" />
@ -193,4 +200,4 @@ const resetForm = () => {
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }
</script> </script>

@ -71,8 +71,8 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="编码" align="center" prop="alertCode" /> <el-table-column label="编码" align="left" prop="alertCode" width="150px"/>
<el-table-column label="名称" align="center" prop="alertName" /> <el-table-column label="名称" align="left" prop="alertName" width="150px"/>
<el-table-column label="告警类型" align="center" prop="alertType"> <el-table-column label="告警类型" align="center" prop="alertType">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.IOT_ALERT_TYPE" :value="scope.row.alertType" /> <dict-tag :type="DICT_TYPE.IOT_ALERT_TYPE" :value="scope.row.alertType" />

@ -10,8 +10,8 @@
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="属性编码" align="center" prop="attributeCode" /> <el-table-column label="属性编码" align="left" prop="attributeCode" width="150px"/>
<el-table-column label="属性名称" align="center" prop="attributeName" /> <el-table-column label="属性名称" align="left" prop="attributeName" width="150px"/>
<el-table-column label="PLC点位地址" align="center" prop="address" /> <el-table-column label="PLC点位地址" align="center" prop="address" />
<el-table-column label="地址描述" align="center" prop="description" /> <el-table-column label="地址描述" align="center" prop="description" />
<el-table-column label="地址类型" align="center" prop="attributeType"> <el-table-column label="地址类型" align="center" prop="attributeType">
@ -34,19 +34,18 @@
<el-table-column label="计算公式" align="center" prop="dataFormula" /> <el-table-column label="计算公式" align="center" prop="dataFormula" />
<el-table-column label="告警" align="center" prop="alertId" /> <el-table-column label="告警" align="center" prop="alertId" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
prop="createTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="170px" width="170px"
fixed="right"
/> />
<el-table-column label="是否启用" align="center" prop="isEnable" fixed="right">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="150px" fixed="right"> <el-table-column label="操作" align="center" width="150px" fixed="right">
<template #default="scope"> <template #default="scope">
<el-button <el-button

@ -98,9 +98,9 @@
highlight-current-row highlight-current-row
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column label="设备编号" align="center" prop="deviceCode" /> <el-table-column label="设备编号" align="left" prop="deviceCode" width="150px"/>
<el-table-column label="设备名称" align="center" prop="deviceName" /> <el-table-column label="设备名称" align="left" prop="deviceName" width="150px"/>
<el-table-column label="设备类型" align="center" prop="deviceType"> <el-table-column label="设备类型" align="left" prop="deviceType" width="150px">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.IOT_DEVICE_TYPE" :value="scope.row.deviceType" /> <dict-tag :type="DICT_TYPE.IOT_DEVICE_TYPE" :value="scope.row.deviceType" />
</template> </template>
@ -123,19 +123,18 @@
width="180px" width="180px"
/> />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="是否启用" align="center" prop="isEnable">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column <el-table-column
label="创建时间" label="创建时间"
align="center" align="center"
prop="createTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="170px" width="170px"
fixed="right"
/> />
<el-table-column label="是否启用" align="center" prop="isEnable" fixed="right">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" width="150px"> <el-table-column label="操作" align="center" fixed="right" width="150px">
<template #default="scope"> <template #default="scope">
<el-button <el-button

Loading…
Cancel
Save