修改 - 排版

This commit is contained in:
suwings 2018-04-26 13:58:00 +08:00
parent d9fb0d9b91
commit 6394df8705
5 changed files with 13 additions and 12 deletions

View File

@ -17,9 +17,10 @@ const tversion = "Beta_8.3.0.0"; //后端
// })
// });
let info = [os.type(), os.arch(), os.hostname(), os.release()].join(" ");
module.exports = {
system: os.type() + " " + os.arch(),
system: info,
root: process.cwd(),
oneversion: oversion,
twoversion: tversion

View File

@ -81,6 +81,13 @@ input {
overflow-y: auto;
}
/* 右侧容器 */
#ConsoleMain {
max-width: 1360px;
margin: auto;
}
/*布局结束*/
/*标题*/

View File

@ -42,7 +42,7 @@
<div class="row">
<div class="col-md-6">
<div class="Panel ">
<div class="PanelTitle">系统信息监控 ( {{ system }} )</div>
<div class="PanelTitle">系统信息监控</div>
<div class="PanelBody">
<div class="">
<div class="row">
@ -141,9 +141,6 @@
<div class="PanelTitle">版本</div>
<div class="PanelBody">
<div id="VersionShow">
<p>程序版本:
<span class="color-gray">8.3</span>
</p>
<p>前端发行版:
<span class="color-gray">
<span class="color-gray" v-text="oneversion"></span>

View File

@ -29,8 +29,6 @@
</div>
</div>
</div>
<div class="col-sm-6">
<div class="Panel PanelGreen">
<div class="PanelTitle">支持 Mcserver 管理器后续版本</div>
<div class="PanelBody">
@ -49,8 +47,7 @@
<p>我们欢迎您转载本软件,使用次数越高,便越有可能更早的更新后续版本.</p>
</div>
</div>
</div>
<div class="col-sm-6">
<div class="Panel PanelRed">
<div class="PanelTitle">源代码开放协议</div>
<div class="PanelBody">
@ -60,7 +57,6 @@
<p>欢迎参观,欢迎 pull request , issues或 star</p>
<small>开源协议: GNU Affero General Public License v3.0</small>
<br>
</div>
</div>
</div>

View File

@ -72,7 +72,6 @@ setInterval(function () {
//缓存值
cacheSystemInfo = {
system: os.type() + " " + os.arch(),
rss: (usage.rss / MB_SIZE).toFixed(1),
heapTotal: (usage.heapTotal / MB_SIZE).toFixed(1),
heapUsed: (usage.heapUsed / MB_SIZE).toFixed(1),
@ -93,7 +92,8 @@ setInterval(function () {
notPermssionCounter: counter.get('notPermssionCounter'), //API的无权访问
root: mversion.root,
oneversion: mversion.oneversion,
twoversion: mversion.twoversion
twoversion: mversion.twoversion,
system: mversion.system
}
let useMemBai = ((os.freemem() / 1024) / (os.totalmem() / 1024) * 100).toFixed(0);