diff --git a/web/public/js/components/node/node-ip-address-thresholds-box.js b/web/public/js/components/node/node-ip-address-thresholds-box.js index d7cad0b2..99e8d418 100644 --- a/web/public/js/components/node/node-ip-address-thresholds-box.js +++ b/web/public/js/components/node/node-ip-address-thresholds-box.js @@ -127,6 +127,21 @@ Vue.component("node-ip-address-thresholds-box", { this.itemReportGroups = [] }, confirmItem: function () { + // 特殊阈值快速添加 + if (["nodeHealthCheckFailed"].$contains(this.itemCode)) { + // 添加 + this.addingThreshold.items.push({ + item: this.itemCode, + operator: this.itemOperator, + value: 0, + duration: 0, + durationUnit: "minute", + options: {} + }) + this.cancelItem() + return + } + if (this.itemDuration.length == 0) { let that = this teaweb.warn("请输入统计周期", function () { @@ -335,11 +350,20 @@ Vue.component("node-ip-address-thresholds-box", {
- [{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] {{itemName(item.item)}} - - [{{group.name}}   ] - - [{{itemOperatorName(item.operator)}}]  {{item.value}}{{itemUnitName(item.item)}}  AND   + + + [{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] + + {{itemName(item.item)}} + + + + [{{group.name}}   ] + + [{{itemOperatorName(item.operator)}}]  {{item.value}}{{itemUnitName(item.item)}} + +  AND   + -> {{actionName(action.action)}} 到{{action.options.ips.join(", ")}} @@ -365,10 +389,17 @@ Vue.component("node-ip-address-thresholds-box", {
- [{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] {{itemName(item.item)}} - - [{{group.name}}   ] - [{{itemOperatorName(item.operator)}}] {{item.value}}{{itemUnitName(item.item)}}   + + [{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] + + {{itemName(item.item)}} + + + + [{{group.name}}   ] + [{{itemOperatorName(item.operator)}}] {{item.value}}{{itemUnitName(item.item)}} + +  
@@ -385,7 +416,7 @@ Vue.component("node-ip-address-thresholds-box", {

{{item.description}}

- + 统计周期
@@ -394,7 +425,7 @@ Vue.component("node-ip-address-thresholds-box", {
- + 操作符 - + 对比值
diff --git a/web/public/js/components/node/node-ip-address-thresholds-view.js b/web/public/js/components/node/node-ip-address-thresholds-view.js index 7fb93641..5844a1af 100644 --- a/web/public/js/components/node/node-ip-address-thresholds-view.js +++ b/web/public/js/components/node/node-ip-address-thresholds-view.js @@ -98,17 +98,29 @@ Vue.component("node-ip-address-thresholds-view", { template: `
-
- [{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] {{itemName(item.item)}} - - [{{group.name}}   ] - - [{{itemOperatorName(item.operator)}}] {{item.value}}{{itemUnitName(item.item)}}  AND   - -> - {{actionName(action.action)}} - 到{{action.options.ips.join(", ")}} - ({{action.options.url}}) -  AND   +
+ + + + [{{item.duration}}{{itemDurationUnitName(item.durationUnit)}}] + + {{itemName(item.item)}} + + + + [{{group.name}}   ] + + [{{itemOperatorName(item.operator)}}] {{item.value}}{{itemUnitName(item.item)}}   + + + AND   + -> + {{actionName(action.action)}} + 到{{action.options.ips.join(", ")}} + ({{action.options.url}}) +   + AND   +
` diff --git a/web/views/@default/clusters/ip-addrs/addr/index.js b/web/views/@default/clusters/ip-addrs/addr/index.js index f334fef4..c84990af 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.js +++ b/web/views/@default/clusters/ip-addrs/addr/index.js @@ -5,7 +5,7 @@ Tea.context(function () { this.updateUp = function (addrId, isUp) { let status = isUp ? "在线" : "离线" - teaweb.confirm("确定要手动将节点设置为" + status + "吗?", function () { + teaweb.confirm("确定要手动将此IP设置为" + status + "吗?", function () { this.$post(".up") .params({ addrId: addrId,