From 55cefdb62cf80fe133e0cba32edb23fcd749032a Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Tue, 9 Nov 2021 17:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=B8=A6=E5=AE=BD=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=B5=81=E9=87=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../servers/serverutils/server_helper.go | 8 ++-- .../components/plans/plan-price-config-box.js | 38 +++++++++---------- .../js/components/plans/plan-price-view.js | 4 +- ...fig-box.js => traffic-limit-config-box.js} | 20 +++++----- ...th-limit-view.js => traffic-limit-view.js} | 12 +++--- .../{bandwidth => traffic}/index.html | 2 +- .../settings/{bandwidth => traffic}/index.js | 0 7 files changed, 42 insertions(+), 42 deletions(-) rename web/public/js/components/server/{bandwidth-limit-config-box.js => traffic-limit-config-box.js} (74%) rename web/public/js/components/server/{bandwidth-limit-view.js => traffic-limit-view.js} (58%) rename web/views/@default/servers/server/settings/{bandwidth => traffic}/index.html (72%) rename web/views/@default/servers/server/settings/{bandwidth => traffic}/index.js (100%) diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index 4555955a..5c4288e8 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -351,10 +351,10 @@ func (this *ServerHelper) createSettingsMenu(secondMenuItem string, serverIdStri if teaconst.IsPlus { menuItems = append(menuItems, maps.Map{ - "name": "带宽限制", - "url": "/servers/server/settings/bandwidth?serverId=" + serverIdString, - "isActive": secondMenuItem == "bandwidth", - "isOn": serverConfig.BandwidthLimit != nil && serverConfig.BandwidthLimit.IsOn, + "name": "流量限制", + "url": "/servers/server/settings/traffic?serverId=" + serverIdString, + "isActive": secondMenuItem == "traffic", + "isOn": serverConfig.TrafficLimit != nil && serverConfig.TrafficLimit.IsOn, }) } } else if serverConfig.IsTCPFamily() { diff --git a/web/public/js/components/plans/plan-price-config-box.js b/web/public/js/components/plans/plan-price-config-box.js index b84f15e6..8b5a87bc 100644 --- a/web/public/js/components/plans/plan-price-config-box.js +++ b/web/public/js/components/plans/plan-price-config-box.js @@ -1,6 +1,6 @@ // 套餐价格配置 Vue.component("plan-price-config-box", { - props: ["v-price-type", "v-monthly-price", "v-seasonally-price", "v-yearly-price", "v-bandwidth-price"], + props: ["v-price-type", "v-monthly-price", "v-seasonally-price", "v-yearly-price", "v-traffic-price"], data: function () { let priceType = this.vPriceType if (priceType == null) { @@ -43,18 +43,18 @@ Vue.component("plan-price-config-box", { } } - let bandwidthPrice = this.vBandwidthPrice - let bandwidthPriceBaseNumber = 0 - if (bandwidthPrice != null) { - bandwidthPriceBaseNumber = bandwidthPrice.base + let trafficPrice = this.vTrafficPrice + let trafficPriceBaseNumber = 0 + if (trafficPrice != null) { + trafficPriceBaseNumber = trafficPrice.base } else { - bandwidthPrice = { + trafficPrice = { base: 0 } } - let bandwidthPriceBase = "" - if (bandwidthPriceBaseNumber > 0) { - bandwidthPriceBase = bandwidthPriceBaseNumber.toString() + let trafficPriceBase = "" + if (trafficPriceBaseNumber > 0) { + trafficPriceBase = trafficPriceBaseNumber.toString() } return { @@ -67,8 +67,8 @@ Vue.component("plan-price-config-box", { seasonallyPriceNumber: seasonallyPriceNumber, yearlyPriceNumber: yearlyPriceNumber, - bandwidthPriceBase: bandwidthPriceBase, - bandwidthPrice: bandwidthPrice + trafficPriceBase: trafficPriceBase, + trafficPrice: trafficPrice } }, watch: { @@ -93,12 +93,12 @@ Vue.component("plan-price-config-box", { } this.yearlyPriceNumber = price }, - bandwidthPriceBase: function (v) { + trafficPriceBase: function (v) { let price = parseFloat(v) if (isNaN(price)) { price = 0 } - this.bandwidthPrice.base = price + this.trafficPrice.base = price } }, template: `
@@ -106,11 +106,11 @@ Vue.component("plan-price-config-box", { - +
 按时间周期     -  按带宽用量 +  按流量
@@ -147,15 +147,15 @@ Vue.component("plan-price-config-box", {
- -
+ +
- + diff --git a/web/public/js/components/plans/plan-price-view.js b/web/public/js/components/plans/plan-price-view.js index 43174314..58a8913b 100644 --- a/web/public/js/components/plans/plan-price-view.js +++ b/web/public/js/components/plans/plan-price-view.js @@ -11,8 +11,8 @@ Vue.component("plan-price-view", { 季度：￥{{plan.seasonallyPrice}}元
年度：￥{{plan.yearlyPrice}}元 - - 基础价格：￥{{plan.bandwidthPrice.base}}元/GB + + 基础价格：￥{{plan.trafficPrice.base}}元/GB ` }) \ No newline at end of file diff --git a/web/public/js/components/server/bandwidth-limit-config-box.js b/web/public/js/components/server/traffic-limit-config-box.js similarity index 74% rename from web/public/js/components/server/bandwidth-limit-config-box.js rename to web/public/js/components/server/traffic-limit-config-box.js index b500b2ca..2a32e3be 100644 --- a/web/public/js/components/server/bandwidth-limit-config-box.js +++ b/web/public/js/components/server/traffic-limit-config-box.js @@ -1,7 +1,7 @@ -Vue.component("bandwidth-limit-config-box", { - props: ["v-bandwidth-limit"], +Vue.component("traffic-limit-config-box", { + props: ["v-traffic-limit"], data: function () { - let config = this.vBandwidthLimit + let config = this.vTrafficLimit if (config == null) { config = { isOn: false, @@ -47,36 +47,36 @@ Vue.component("bandwidth-limit-config-box", { this.config.noticePageBody = ` -Bandwidth Limit Exceeded Warning +Traffic Limit Exceeded Warning -The site bandwidth has exceeded the limit. Please contact with the site administrator. +The site traffic has exceeded the limit. Please contact with the site administrator. ` } }, template: `
- +
基础带宽费用基础流量费用
- + 元/GB
- + - + @@ -92,7 +92,7 @@ The site bandwidth has exceeded the limit. Please contact with the site administ diff --git a/web/public/js/components/server/bandwidth-limit-view.js b/web/public/js/components/server/traffic-limit-view.js similarity index 58% rename from web/public/js/components/server/bandwidth-limit-view.js rename to web/public/js/components/server/traffic-limit-view.js index 8ebd7f0d..458b8015 100644 --- a/web/public/js/components/server/bandwidth-limit-view.js +++ b/web/public/js/components/server/traffic-limit-view.js @@ -1,15 +1,15 @@ -// 显示带宽限制说明 -Vue.component("bandwidth-limit-view", { - props: ["v-bandwidth-limit"], +// 显示流量限制说明 +Vue.component("traffic-limit-view", { + props: ["v-traffic-limit"], data: function () { return { - config: this.vBandwidthLimit + config: this.vTrafficLimit } }, template: `
- 日带宽限制：{{config.dailySize.count}}{{config.dailySize.unit.toUpperCase()}}
 - 月带宽限制：{{config.monthlySize.count}}{{config.monthlySize.unit.toUpperCase()}}
 + 日流量限制：{{config.dailySize.count}}{{config.dailySize.unit.toUpperCase()}}
 + 月流量限制：{{config.monthlySize.count}}{{config.monthlySize.unit.toUpperCase()}}
没有限制。
` diff --git a/web/views/@default/servers/server/settings/bandwidth/index.html b/web/views/@default/servers/server/settings/traffic/index.html similarity index 72% rename from web/views/@default/servers/server/settings/bandwidth/index.html rename to web/views/@default/servers/server/settings/traffic/index.html index 3f44772e..6c3be056 100644 --- a/web/views/@default/servers/server/settings/bandwidth/index.html +++ b/web/views/@default/servers/server/settings/traffic/index.html @@ -6,7 +6,7 @@ - + diff --git a/web/views/@default/servers/server/settings/bandwidth/index.js b/web/views/@default/servers/server/settings/traffic/index.js similarity index 100% rename from web/views/@default/servers/server/settings/bandwidth/index.js rename to web/views/@default/servers/server/settings/traffic/index.js
是否启用 -

注意：由于带宽统计是每5分钟统计一次，所以超出带宽限制后，对用户的提醒也会有所延迟。

+

注意：由于流量统计是每5分钟统计一次，所以超出流量限制后，对用户的提醒也会有所延迟。
日带宽限制日流量限制
月带宽限制月流量限制 网页提示内容 -

[使用模板]。当达到带宽限制时网页显示的HTML内容，不填写则显示默认的提示内容。

+

[使用模板]。当达到流量限制时网页显示的HTML内容，不填写则显示默认的提示内容。