diff --git a/internal/web/actions/default/clusters/cluster/createBatch.go b/internal/web/actions/default/clusters/cluster/createBatch.go index a2f578d5..c982fd9e 100644 --- a/internal/web/actions/default/clusters/cluster/createBatch.go +++ b/internal/web/actions/default/clusters/cluster/createBatch.go @@ -95,6 +95,7 @@ func (this *CreateBatchAction) RunPost(params struct { Name: "IP地址", Ip: ip, CanAccess: true, + IsUp: true, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/clusters/cluster/createNode.go b/internal/web/actions/default/clusters/cluster/createNode.go index e5f9049e..efe459d5 100644 --- a/internal/web/actions/default/clusters/cluster/createNode.go +++ b/internal/web/actions/default/clusters/cluster/createNode.go @@ -185,6 +185,7 @@ func (this *CreateNodeAction) RunPost(params struct { Name: addr.GetString("name"), Ip: addr.GetString("ip"), CanAccess: addr.GetBool("canAccess"), + IsUp: addr.GetBool("isUp"), }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go b/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go index 063b7b19..30b8d073 100644 --- a/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go +++ b/internal/web/actions/default/nodes/ipAddresses/ipaddressutils/utils.go @@ -31,6 +31,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64, Name: addr.GetString("name"), CanAccess: addr.GetBool("canAccess"), IsOn: isOn, + IsUp: addr.GetBool("isUp"), }) if err != nil { return err @@ -42,6 +43,7 @@ func UpdateNodeIPAddresses(parentAction *actionutils.ParentAction, nodeId int64, Name: addr.GetString("name"), Ip: addr.GetString("ip"), CanAccess: addr.GetBool("canAccess"), + IsUp: addr.GetBool("isUp"), }) if err != nil { return err diff --git a/internal/web/actions/default/nodes/ipAddresses/updatePopup.go b/internal/web/actions/default/nodes/ipAddresses/updatePopup.go index 648075ff..bdfcadd6 100644 --- a/internal/web/actions/default/nodes/ipAddresses/updatePopup.go +++ b/internal/web/actions/default/nodes/ipAddresses/updatePopup.go @@ -55,7 +55,6 @@ func (this *UpdatePopupAction) RunPost(params struct { if address == nil { this.Fail("找不到要修改的地址") } - isUp = address.IsUp } ip := net.ParseIP(params.IP) diff --git a/internal/web/actions/default/ns/clusters/cluster/createNode.go b/internal/web/actions/default/ns/clusters/cluster/createNode.go index c561fe9a..1a6fd24f 100644 --- a/internal/web/actions/default/ns/clusters/cluster/createNode.go +++ b/internal/web/actions/default/ns/clusters/cluster/createNode.go @@ -79,8 +79,8 @@ func (this *CreateNodeAction) RunPost(params struct { nodeId := createResp.NsNodeId // IP地址 - for _, address := range ipAddresses { - addressId := address.GetInt64("id") + for _, addrMap := range ipAddresses { + addressId := addrMap.GetInt64("id") if addressId > 0 { _, err = this.RPC().NodeIPAddressRPC().UpdateNodeIPAddressNodeId(this.AdminContext(), &pb.UpdateNodeIPAddressNodeIdRequest{ NodeIPAddressId: addressId, @@ -90,9 +90,10 @@ func (this *CreateNodeAction) RunPost(params struct { _, err = this.RPC().NodeIPAddressRPC().CreateNodeIPAddress(this.AdminContext(), &pb.CreateNodeIPAddressRequest{ NodeId: nodeId, Role: nodeconfigs.NodeRoleDNS, - Name: address.GetString("name"), - Ip: address.GetString("ip"), - CanAccess: address.GetBool("canAccess"), + Name: addrMap.GetString("name"), + Ip: addrMap.GetString("ip"), + CanAccess: addrMap.GetBool("canAccess"), + IsUp: addrMap.GetBool("isUp"), }) } if err != nil { diff --git a/web/views/@default/clusters/cluster/nodes.html b/web/views/@default/clusters/cluster/nodes.html index 9c3428b1..a036cefc 100644 --- a/web/views/@default/clusters/cluster/nodes.html +++ b/web/views/@default/clusters/cluster/nodes.html @@ -73,7 +73,7 @@
分组:{{node.group.name}}
-
+
diff --git a/web/views/@default/clusters/ip-addrs/addr/index.html b/web/views/@default/clusters/ip-addrs/addr/index.html index d108f929..3093cd8a 100644 --- a/web/views/@default/clusters/ip-addrs/addr/index.html +++ b/web/views/@default/clusters/ip-addrs/addr/index.html @@ -40,7 +40,7 @@ - 阈值 + 阈值设置
diff --git a/web/views/@default/clusters/ip-addrs/addr/update.html b/web/views/@default/clusters/ip-addrs/addr/update.html index c01ba3ac..ed7ed9ab 100644 --- a/web/views/@default/clusters/ip-addrs/addr/update.html +++ b/web/views/@default/clusters/ip-addrs/addr/update.html @@ -37,8 +37,17 @@ + + 在线状态 + + + + - 上线阈值 + 阈值设置 diff --git a/web/views/@default/clusters/ip-addrs/addr/update.js b/web/views/@default/clusters/ip-addrs/addr/update.js index 2c2bb97d..ac33a953 100644 --- a/web/views/@default/clusters/ip-addrs/addr/update.js +++ b/web/views/@default/clusters/ip-addrs/addr/update.js @@ -1,3 +1,5 @@ Tea.context(function () { - this.success = NotifySuccess("保存成功", Tea.url(".", { addrId: this.addr.id })) + this.success = NotifySuccess("保存成功", Tea.url(".", {addrId: this.addr.id})) + + this.addr.isUp = this.addr.isUp ? 1 : 0 }) \ No newline at end of file diff --git a/web/views/@default/ns/clusters/cluster/node/index.html b/web/views/@default/ns/clusters/cluster/node/index.html index 8dee5855..d74c67f9 100644 --- a/web/views/@default/ns/clusters/cluster/node/index.html +++ b/web/views/@default/ns/clusters/cluster/node/index.html @@ -19,7 +19,9 @@
{{address.ip}} - ({{address.name}},不可访问 + ({{address.name}},不可访问   + [off] + [down] (不可访问)