|
@@ -29,6 +29,7 @@ import type {
|
|
|
AlarmForm,
|
|
|
AlarmHistory,
|
|
|
AlarmPageParams,
|
|
|
+ DictValue,
|
|
|
EventTrigger,
|
|
|
ExecutionAction,
|
|
|
TriggerConditionItem,
|
|
@@ -47,6 +48,7 @@ const formRef = ref<FormInstance>();
|
|
|
const triggerConditionRefs = ref<InstanceType<typeof AlarmConditions>[]>([]);
|
|
|
const judgmentConditionRefs = ref<InstanceType<typeof AlarmConditions>[]>([]);
|
|
|
const executionActionRefs = ref<InstanceType<typeof AlarmConditions>[]>([]);
|
|
|
+const alarmConditionList = ref<DictValue[]>([]);
|
|
|
const alarmPageParams = ref<AlarmPageParams>({
|
|
|
pageIndex: 1,
|
|
|
pageSize: 10,
|
|
@@ -161,12 +163,12 @@ const historyColumns = [
|
|
|
return timeA - timeB;
|
|
|
},
|
|
|
},
|
|
|
- {
|
|
|
- title: t('algorithmManage.settlementDate'),
|
|
|
- dataIndex: 'recoveryTime',
|
|
|
- key: 'recoveryTime',
|
|
|
- ellipsis: true,
|
|
|
- },
|
|
|
+ // {
|
|
|
+ // title: t('algorithmManage.settlementDate'),
|
|
|
+ // dataIndex: 'recoveryTime',
|
|
|
+ // key: 'recoveryTime',
|
|
|
+ // ellipsis: true,
|
|
|
+ // },
|
|
|
];
|
|
|
const alarmColumns = [
|
|
|
{
|
|
@@ -578,9 +580,11 @@ const okConfirm = async () => {
|
|
|
console.log('存在验证未通过的表单');
|
|
|
}
|
|
|
};
|
|
|
+
|
|
|
onMounted(() => {
|
|
|
handleRequest(async () => {
|
|
|
await getAlarmCondition();
|
|
|
+ alarmConditionList.value = alarmCondition.value.filter((item, index) => index !== 2);
|
|
|
await getExecutionAction();
|
|
|
await getAlarmRepeatTime();
|
|
|
await getAlarmAlgOperator();
|
|
@@ -704,8 +708,7 @@ onMounted(() => {
|
|
|
@deleteClick="deleteJudgmentClick"
|
|
|
:index="index"
|
|
|
:form="item"
|
|
|
- :alarm-condition="alarmCondition"
|
|
|
- :execution-action="executionAction"
|
|
|
+ :alarm-condition="alarmConditionList"
|
|
|
:alarm-repeat-time="alarmRepeatTime"
|
|
|
:alarm-alg-operator="alarmAlgOperator"
|
|
|
:alarm-device-state="alarmDeviceState"
|