From f79c0703617d25dbb6328dd58e4f693d3d2809c4 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 16 十月 2020 15:34:39 +0800
Subject: [PATCH] 修改本机信息展示

---
 src/pages/settings/components/BasicSetting.vue |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index 3c05bf4..1c7bcae 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>
                 </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.deviceModel}}</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 = config.version;
         }
 
         this.loading = false;

--
Gitblit v1.8.0