diff --git a/internal/web/actions/default/servers/serverutils/server_helper.go b/internal/web/actions/default/servers/serverutils/server_helper.go index c0697c15..d3ec19e6 100644 --- a/internal/web/actions/default/servers/serverutils/server_helper.go +++ b/internal/web/actions/default/servers/serverutils/server_helper.go @@ -109,10 +109,6 @@ func (this *ServerHelper) createLeftMenu(action *actions.ActionObject) { } tabbar.Add("设置", "", "/servers/server/settings?serverId="+serverIdString, "setting", selectedTabbar == "setting") tabbar.Add("删除", "", "/servers/server/delete?serverId="+serverIdString, "trash", selectedTabbar == "delete") - { - m := tabbar.Add("当前服务:"+server.Name, "", "/servers/server?serverId="+serverIdString, "", false) - m["right"] = true - } actionutils.SetTabbar(action, tabbar) diff --git a/web/views/@default/servers/server/delete/index.css b/web/views/@default/servers/server/delete/index.css index 7bc3bc3f..177a1f93 100644 --- a/web/views/@default/servers/server/delete/index.css +++ b/web/views/@default/servers/server/delete/index.css @@ -1,5 +1,7 @@ -.right-box { - text-align: center; +.delete-box { margin-top: 1em; } +.delete-box button { + width: 20em!important; +} /*# sourceMappingURL=index.css.map */ \ No newline at end of file diff --git a/web/views/@default/servers/server/delete/index.css.map b/web/views/@default/servers/server/delete/index.css.map index ba464eaa..c29dfd98 100644 --- a/web/views/@default/servers/server/delete/index.css.map +++ b/web/views/@default/servers/server/delete/index.css.map @@ -1 +1 @@ -{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,kBAAA;EACA,eAAA","file":"index.css"} \ No newline at end of file +{"version":3,"sources":["index.less"],"names":[],"mappings":"AAAA;EACC,eAAA;;AADD,WAGC;EACC,qBAAA","file":"index.css"} \ No newline at end of file diff --git a/web/views/@default/servers/server/delete/index.html b/web/views/@default/servers/server/delete/index.html index 0f0b5958..0a2f2b60 100644 --- a/web/views/@default/servers/server/delete/index.html +++ b/web/views/@default/servers/server/delete/index.html @@ -1,8 +1,15 @@ {$layout} -{$template "/left_menu"} -
-
- -
+ + 服务列表 + | + "{{server.name}}"删除 + | + + + +
+
\ No newline at end of file diff --git a/web/views/@default/servers/server/delete/index.js b/web/views/@default/servers/server/delete/index.js index e7c60fba..0499db39 100644 --- a/web/views/@default/servers/server/delete/index.js +++ b/web/views/@default/servers/server/delete/index.js @@ -1,6 +1,6 @@ Tea.context(function () { this.deleteServer = function (serverId) { - teaweb.confirm("确定要删除当前服务吗?", function () { + teaweb.confirm("html:确定要删除当前服务吗?
请慎重操作,删除后无法恢复!", function () { this.$post("$") .params({ "serverId": serverId diff --git a/web/views/@default/servers/server/delete/index.less b/web/views/@default/servers/server/delete/index.less index 92633061..8ae6d3bd 100644 --- a/web/views/@default/servers/server/delete/index.less +++ b/web/views/@default/servers/server/delete/index.less @@ -1,4 +1,7 @@ -.right-box { - text-align: center; +.delete-box { margin-top: 1em; -} \ No newline at end of file + + button { + width: 20em!important; + } +} diff --git a/web/views/@default/servers/server/log/history.html b/web/views/@default/servers/server/log/history.html index c04c962b..56986e98 100644 --- a/web/views/@default/servers/server/log/history.html +++ b/web/views/@default/servers/server/log/history.html @@ -1,9 +1,19 @@ -{$layout} {$template "/datepicker"} -{$template "/left_menu"} +{$layout} -
+ + 服务列表 + | + "{{server.name}}"日志 + | + + + +{$template "/left_menu_with_menu"} +
所有日志 错误日志 diff --git a/web/views/@default/servers/server/log/index.html b/web/views/@default/servers/server/log/index.html index a3927c3a..94f28fa6 100644 --- a/web/views/@default/servers/server/log/index.html +++ b/web/views/@default/servers/server/log/index.html @@ -1,7 +1,17 @@ {$layout} -{$template "/left_menu"} -
+ + 服务列表 + | + "{{server.name}}"日志 + | + + + +{$template "/left_menu_with_menu"} +
diff --git a/web/views/@default/servers/server/log/today.html b/web/views/@default/servers/server/log/today.html index 8f412e46..53435250 100644 --- a/web/views/@default/servers/server/log/today.html +++ b/web/views/@default/servers/server/log/today.html @@ -1,7 +1,17 @@ {$layout} -{$template "/left_menu"} -
+ + 服务列表 + | + "{{server.name}}"日志 + | + + + +{$template "/left_menu_with_menu"} +
所有日志 错误日志 diff --git a/web/views/@default/servers/server/stat/@stat_menu.html b/web/views/@default/servers/server/stat/@stat_menu.html new file mode 100644 index 00000000..a591c7f6 --- /dev/null +++ b/web/views/@default/servers/server/stat/@stat_menu.html @@ -0,0 +1,9 @@ + + 服务列表 + | + "{{server.name}}"统计 + | + + \ No newline at end of file diff --git a/web/views/@default/servers/server/stat/clients.html b/web/views/@default/servers/server/stat/clients.html index 47ec8913..7f4042e9 100644 --- a/web/views/@default/servers/server/stat/clients.html +++ b/web/views/@default/servers/server/stat/clients.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -
+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +
{$ if eq .statIsOn false}

要想查看统计数据,需要先开启统计功能,[点击这里]修改配置。 diff --git a/web/views/@default/servers/server/stat/dailyRequests.html b/web/views/@default/servers/server/stat/dailyRequests.html index b45d7b7f..24872746 100644 --- a/web/views/@default/servers/server/stat/dailyRequests.html +++ b/web/views/@default/servers/server/stat/dailyRequests.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -

+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +
{$template "requests_menu"}
diff --git a/web/views/@default/servers/server/stat/hourlyRequests.html b/web/views/@default/servers/server/stat/hourlyRequests.html index ca475362..48c1fd49 100644 --- a/web/views/@default/servers/server/stat/hourlyRequests.html +++ b/web/views/@default/servers/server/stat/hourlyRequests.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -
+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +
{$template "requests_menu"}
diff --git a/web/views/@default/servers/server/stat/index.html b/web/views/@default/servers/server/stat/index.html index b7734356..8b75944b 100644 --- a/web/views/@default/servers/server/stat/index.html +++ b/web/views/@default/servers/server/stat/index.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -
+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +
{$template "requests_menu"}
diff --git a/web/views/@default/servers/server/stat/providers.html b/web/views/@default/servers/server/stat/providers.html index c5125e89..9af72dcd 100644 --- a/web/views/@default/servers/server/stat/providers.html +++ b/web/views/@default/servers/server/stat/providers.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -
+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +
{$ if eq .statIsOn false}

要想查看统计数据,需要先开启统计功能,[点击这里]修改配置。 diff --git a/web/views/@default/servers/server/stat/regions.html b/web/views/@default/servers/server/stat/regions.html index 0a91a17e..3b391d69 100644 --- a/web/views/@default/servers/server/stat/regions.html +++ b/web/views/@default/servers/server/stat/regions.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -

+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +
{$ if eq .statIsOn false}

要想查看统计数据,需要先开启统计功能,[点击这里]修改配置。 diff --git a/web/views/@default/servers/server/stat/waf.html b/web/views/@default/servers/server/stat/waf.html index 7c8fedd1..07b1f28f 100644 --- a/web/views/@default/servers/server/stat/waf.html +++ b/web/views/@default/servers/server/stat/waf.html @@ -1,8 +1,9 @@ {$layout} {$template "/echarts"} -{$template "/left_menu"} -

+{$template "stat_menu"} +{$template "/left_menu_with_menu"} +

今日拦截