From ce3b404a5983f03a56ad9cd65a4ae2352db2ba77 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 06 十一月 2020 14:15:56 +0800
Subject: [PATCH] 集群树节点状态切换查询参数treeNodes错误修复
---
src/pages/settings/components/BasicSetting.vue | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index 3c05bf4..8db1f78 100644
--- a/src/pages/settings/components/BasicSetting.vue
+++ b/src/pages/settings/components/BasicSetting.vue
@@ -79,20 +79,24 @@
<el-menu-item-group class="item-group desc-info">
<el-row :gutter="gutter">
<el-col :span="12" class="flex-box">
- <div class="xiangqin-label">ID</div>
+ <div class="xiangqin-label">璁惧ID</div>
<div class="xiangqing-info">{{sysinfo.server_id}}</div>
</el-col>
- <el-col :span="12" class="flex-box">
+ <!-- <el-col :span="12" class="flex-box">
<div class="xiangqin-label">璁惧缂栧彿</div>
<div class="xiangqing-info">{{sysinfo.deviceNum}}</div>
- </el-col>
+ </el-col>-->
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">璁惧鍨嬪彿</div>
- <div class="xiangqing-info">{{sysinfo.deviceType}}</div>
+ <div class="xiangqing-info">{{sysinfo.deviceModel}}</div>
</el-col>
<el-col :span="12" class="flex-box">
- <div class="xiangqin-label">璁惧搴忓垪鍙�</div>
- <div class="xiangqing-info">{{sysinfo.deviceSerialNum}}</div>
+ <div class="xiangqin-label">璁惧绫诲瀷</div>
+ <div class="xiangqing-info">{{sysinfo.deviceDesc}}</div>
+ </el-col>
+ <el-col :span="12" class="flex-box">
+ <div class="xiangqin-label">閫氶亾涓暟</div>
+ <div class="xiangqing-info">{{sysinfo.channelCount}}</div>
</el-col>
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">涓绘帶鐗堟湰</div>
@@ -101,14 +105,6 @@
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">web鐗堟湰</div>
<div class="xiangqing-info">{{sysinfo.webVersion}}</div>
- </el-col>
- <el-col :span="12" class="flex-box">
- <div class="xiangqin-label">閫氶亾涓暟</div>
- <div class="xiangqing-info">{{sysinfo.channelCount}}</div>
- </el-col>
- <el-col :span="12" class="flex-box">
- <div class="xiangqin-label">纭洏涓暟</div>
- <div class="xiangqing-info">{{sysinfo.diskCount}}</div>
</el-col>
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">纭洏淇℃伅</div>
@@ -342,6 +338,7 @@
import ClusterManagement from "./ClusterManagement";
import AuthorityManagement from "./AuthorityManagement";
import RadioSet from "./RadioSet";
+import config from '../../../../package.json'
export default {
name: "BasicSettings",
@@ -534,7 +531,7 @@
let devInfo = this.sysinfo.deviceInfo;
this.sysinfo.cpuInfo = devInfo.cpu[0].modelName;
- this.sysinfo.disks = devInfo.disk;
+ this.sysinfo.disks = "( " + devInfo.disk + ") ";
this.sysinfo.mem = (devInfo.mem.total / 1024 / 1024 / 1024).toFixed(2) + "GB";
// this.sysinfo.arch = devInfo.host.kernelArch;
this.sysinfo.uptime = this.secondsFormat(devInfo.host.uptime);
@@ -545,6 +542,8 @@
}
this.webPort = this.sysinfo.server_port;
+
+ this.sysinfo.webVersion = 'V' + config.version;
}
this.loading = false;
@@ -685,7 +684,6 @@
});
},
checkTimeZone(val) {
- debugger;
},
submitClock() {
--
Gitblit v1.8.0