diff --git a/src/components/env.js b/src/components/env.js index 9569812074c4bb0aa5605c6f62c4e553c9881dd5..2179489c5c57aab0aabf615f3f0d4a5a98516e0b 100644 --- a/src/components/env.js +++ b/src/components/env.js @@ -5,6 +5,8 @@ export const TIMEING_RULES = { 3: '自定义时间' } export const MAX_DAY = 7; +export const WIELESS_SMALL = '-∞' +export const WIELESS_BIG = '+∞' export const ONLY_INPUT_NUM = (value) => { return value.replace(/[^\d]/g, '') } diff --git a/src/page/main/forewarning/rule-set/detail/index.vue b/src/page/main/forewarning/rule-set/detail/index.vue index 65052a3f73cfd3946a43b106909c094b7dd00f56..9e3f327eaebaac3c4c0269c7c31842be58869a6a 100644 --- a/src/page/main/forewarning/rule-set/detail/index.vue +++ b/src/page/main/forewarning/rule-set/detail/index.vue @@ -58,7 +58,7 @@ import gapTitle from "@/components/gap-title.vue"; import bgBreadcrumb from "@/components/bg-breadcrumb.vue"; import Info from "@/components/warn-detail/info.vue"; import { METHODS } from "@/components/manual-distribution/env.js"; -import { GetRuleTypeOptions, Empty } from "@/components/env.js"; +import { GetRuleTypeOptions, Empty, WIELESS_SMALL, WIELESS_BIG } from "@/components/env.js"; const route = useRoute(); const { id } = route.query; const STATUS_OBJ = ["禁用", "启用"]; @@ -227,10 +227,26 @@ const getInfoData = () => { ]; } ruleRows.value = data.alert_condition.map((e) => { + let min = e.thresholds_min; + if (min === undefined) { + if (ruleTypeOptions.value[data.alert_rule_type].down !== "") { + min = ruleTypeOptions.value[data.alert_rule_type].down; + } else { + min = WIELESS_SMALL; + } + } + let max = e.thresholds_max; + if (max === undefined) { + if (ruleTypeOptions.value[data.alert_rule_type].up !== "") { + max = ruleTypeOptions.value[data.alert_rule_type].up; + } else { + max = WIELESS_SMALL; + } + } return { - warning_threshold: `${e.thresholds_min}${ruleTypeOptions.value[data.alert_rule_type]?.unit || ""} - ${ - e.thresholds_max - }${ruleTypeOptions.value[data.alert_rule_type]?.unit || ""}`, + warning_threshold: `${min}${ruleTypeOptions.value[data.alert_rule_type]?.unit || ""} - ${max}${ + ruleTypeOptions.value[data.alert_rule_type]?.unit || "" + }`, risk_level: riskLevelOptions[e.risk_level], }; }); diff --git a/src/page/main/forewarning/rule-set/modules/custom.vue b/src/page/main/forewarning/rule-set/modules/custom.vue index 08f8d13922d7837e19a9785a6fbf0c5734cf08d3..15973bfd543ad4ce1663e8c95138df72b15ae625 100644 --- a/src/page/main/forewarning/rule-set/modules/custom.vue +++ b/src/page/main/forewarning/rule-set/modules/custom.vue @@ -76,7 +76,7 @@ :width="header.width">