修复一些bug (#367 )

* bug修复： 1. serverstatus主题agent详情不显示内存信息 2. windows系统icon错误小优化 1. echarts绘制世界地图所需的world.js坐标信息从本地加载切换为从cdn加载 2. font-logos切换为0.17.0版本，使得图标间距更合适 * 优化agent离线保留信息逻辑，从判断“实时在线”调整为判断“曾经在线”。 * 优化agent离线保留信息逻辑，从判断“实时在线”调整为判断“曾经在线”。
update contributors[no ci]
2024-06-15 09:43:30 +08:00 · 2024-06-14 10:03:18 +00:00
8 changed files with 16 additions and 31 deletions
@@ -49,9 +49,9 @@ You can change the dashboard language in the settings page (`/setting`) after th
 <a href="https://github.com/nap0o" title="nap0o"><img src="https://avatars.githubusercontent.com/u/144927971?v=4" width="50;" alt="nap0o"/></a>
 <a href="https://github.com/lemoeo" title="Lemoe"><img src="https://avatars.githubusercontent.com/u/18618627?v=4" width="50;" alt="Lemoe"/></a>
 <a href="https://github.com/cantoblanco" title="Kris"><img src="https://avatars.githubusercontent.com/u/116849421?v=4" width="50;" alt="Kris"/></a>
-<a href="https://github.com/CosmosZ-code" title="CosmosZ-code"><img src="https://avatars.githubusercontent.com/u/81398224?v=4" width="50;" alt="CosmosZ-code"/></a>
-<a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
 <a href="https://github.com/spiritLHLS" title="spiritlhl"><img src="https://avatars.githubusercontent.com/u/103393591?v=4" width="50;" alt="spiritlhl"/></a>
+<a href="https://github.com/liuyanxi975" title="刘颜溪"><img src="https://avatars.githubusercontent.com/u/24417037?v=4" width="50;" alt="刘颜溪"/></a>
+<a href="https://github.com/CosmosZ-code" title="CosmosZ-code"><img src="https://avatars.githubusercontent.com/u/81398224?v=4" width="50;" alt="CosmosZ-code"/></a>
 <a href="https://github.com/lvgj-stack" title="Ko no dio"><img src="https://avatars.githubusercontent.com/u/38449861?v=4" width="50;" alt="Ko no dio"/></a>
 <a href="https://github.com/hhhkkk520" title="Kris"><img src="https://avatars.githubusercontent.com/u/52115472?v=4" width="50;" alt="Kris"/></a>
 <a href="https://github.com/1ridic" title="1ridic"><img src="https://avatars.githubusercontent.com/u/88495501?v=4" width="50;" alt="1ridic"/></a>
@@ -9,7 +9,7 @@
    <title>{{.Title}}</title>
    <link rel="shortcut icon" type="image/png" href="/static/logo.svg" />
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/semantic.min.css">
-    <link rel="stylesheet" href="https://unpkg.com/font-logos@1.2.0/assets/font-logos.css">
+    <link rel="stylesheet" href="https://unpkg.com/font-logos@0.17.0/assets/font-logos.css">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/font/bootstrap-icons.min.css">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/css/flag-icons.min.css">
    <link rel="stylesheet" type="text/css" href="/static/semantic-ui-alerts.min.css">
@@ -16,8 +16,8 @@
                            <div class="content" v-if="server.Host" style="margin-top: 10px; padding-bottom: 5px">
                                <div class="header">
                                    <i style="width: 22px;border-radius: 4px;" :class="'fi fi-' + server.Host.CountryCode"></i>                                    
-                                    <i v-if='getFontLogoClass(server.Host.Platform) == "" && server.live' class="fl-tux"></i>
-                                    <i v-else-if='isWindowsPlatform(server.Host.Platform)' class="windows icon"></i>
+                                    <i v-if='isWindowsPlatform(server.Host.Platform)' class="windows icon"></i>
+                                    <i v-else-if='getFontLogoClass(server.Host.Platform) == "" && server.State.Uptime > 0' class="fl-tux"></i>
                                    <i v-else :class="'fl-' + getFontLogoClass(server.Host.Platform)"></i>
                                    @#server.Name + (server.live?'':'[{{tr "Offline"}}]')#@
                                    <i @click="togglePopup($event, server.ID)" aria-expanded="false" class="nezha-secondary-font info circle icon"></i>
@@ -13,14 +13,14 @@
    <link rel="stylesheet" href="/static/theme-server-status/css/dark.css?v20240407">
    <link rel="stylesheet" href="/static/theme-server-status/css/light.css?v20240407">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/font/bootstrap-icons.min.css">
-    <link rel="stylesheet" href="https://unpkg.com/font-logos@1.2.0/assets/font-logos.css">
+    <link rel="stylesheet" href="https://unpkg.com/font-logos@0.17.0/assets/font-logos.css">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/css/flag-icons.min.css">
    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/semantic.min.css">
    <script src="https://unpkg.com/[email protected]/dist/jquery.min.js"></script>
    <script src="https://unpkg.com/[email protected]/dist/js/bootstrap.min.js"></script>
    <script src="https://unpkg.com/[email protected]/dist/vue.min.js"></script>
    <script src="https://unpkg.com/[email protected]/dist/echarts.min.js"></script>
-    <script src="/static/theme-server-status/js/world.js?v20240613"></script>
+    <script src="https://unpkg.com/[email protected]/map/js/world.js"></script>
    <script src="/static/theme-server-status/js/mixin.js?v20240302"></script>
    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
    <!--[if lt IE 9]>
@@ -27,8 +27,8 @@
            </td>
            <td class="node-cell name center">@#node.name#@</td>
            <td class="node-cell os center">
-                <i v-if='getFontLogoClass(node.host.Platform) == "" && node.online' class="fl-tux"></i>
-                <i v-else-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-else-if='getFontLogoClass(node.host.Platform) == "" && node.stateuptime > 0' class="fl-tux"></i>
                <i v-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
                <span class="node-cell-os-text">@#getPlatformName(node.os)#@</span>
            </td>
@@ -30,8 +30,8 @@
            </td>
            <td class="node-cell name center">@#node.name#@</td>
            <td class="node-cell os center">
-                <i v-if='getFontLogoClass(node.host.Platform) == "" && node.online' class="fl-tux"></i>
-                <i v-else-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-if='isWindowsPlatform(node.host.Platform)' class="windows icon"></i>
+                <i v-else-if='getFontLogoClass(node.host.Platform) == "" && node.stateuptime > 0' class="fl-tux"></i>
                <i v-else :class="'fl-' + getFontLogoClass(node.host.Platform)"></i>
                <span class="node-cell-os-text">@#getPlatformName(node.os)#@</span>
            </td>
@@ -76,6 +76,10 @@
                            <span class="node-cell-expand-label">CPU:</span>
                            @#node.host.CPU.join(",")#@ (@#node.cpu.percent#@%)
                        </span>
+                        <span class="node-cell-expand">
+                            <span class="node-cell-expand-label">{{tr "MemUsed"}}:</span>
+                            @#formatByteSize(node.state.MemUsed)#@ / @#formatByteSize(node.host.MemTotal)#@ (@#toFixed2(node.state.MemUsed / node.host.MemTotal * 100)#@%)
+                        </span>
                        <span class="node-cell-expand">
                            <span class="node-cell-expand-label">{{tr "DiskUsed"}}:</span>
                            @#formatByteSize(node.state.DiskUsed)#@ / @#formatByteSize(node.host.DiskTotal)#@ (@#node.hdd.percent#@%)
@@ -374,6 +374,7 @@
                        name: server.Name,
                        os: platform,
                        location: server.Host.CountryCode,
+                        stateuptime: server.State.Uptime,
                        uptime: this.secondToDate(server.State.Uptime),
                        load: this.toFixed2(server.State.Load1),
                        network: this.getNetworkSpeed(server.State.NetInSpeed, server.State.NetOutSpeed),