diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue index 0ee568d..d93f273 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/configureEnergyAlarms.vue @@ -11,6 +11,9 @@ }" @click="clickSwitch({ enableRules: record.enableRules, record: record })" /> + + {{ getConditionalJudgment(record) }} + {{ getcomparisonType(record) }} @@ -69,6 +72,12 @@ } } }; + const getConditionalJudgment = (data: any) => { + const formattedValue = data.conditionalJudgment.replace(/(\d+)\.00/g, '$1'); + // 返回处理后的值 + console.log(formattedValue, 'value'); + return formattedValue; + }; const clickSwitch = (data: any) => { NsModal.confirm({ title: '启用状态', @@ -315,6 +324,7 @@ getcomparisonType, orgId, tableConfig, + getConditionalJudgment, editConfigureEnergyAlarms, setconfigureDeviceAlarmsData, }; diff --git a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue index 8bd1a49..3e36706 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/alarmSettings/energyAlarm/editConfigureEnergyAlarm.vue @@ -111,6 +111,7 @@ :min="-9999999999.99" :max="9999999999.99" :precision="2" + :formatter="(value) => `${value}`.replace(/\.00$/, '')" v-model:value="infoObject.alarmList[index - 1].num" />