Browse Source

Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

lxh 6 days ago
parent
commit
e93bb1db15

+ 3 - 3
src/views/vent/dataCenter/infoCenter/index.vue

@@ -24,14 +24,14 @@
               <div class="data-item">
                 <div class="item-icon icon3"></div>
                 <div>
-                  <div class="label">数据存储量</div>
+                  <div class="label">数据存储量(GB)</div>
                   <div class="value status-normal">{{ deviceData.databaseDiskUsage }}</div>
                 </div>
               </div>
               <div class="data-item">
                 <div class="item-icon icon4"></div>
                 <div>
-                  <div class="label">消息总数量(条)</div>
+                  <div class="label">消息总数量(条)</div>
                   <div class="value status-normal">{{ deviceData.collectTotalNum }}</div>
                 </div>
               </div>
@@ -39,7 +39,7 @@
                 <div class="item-icon icon5"></div>
                 <div>
                   <div class="label">共享接口数量</div>
-                  <div class="value status-normal">0</div>
+                  <div class="value status-normal">2</div>
                 </div>
               </div>
             </div>

+ 10 - 3
src/views/vent/dataCenter/infoCenter/infoCenter.data.ts

@@ -58,18 +58,18 @@ export const sysDataColumn: BasicColumn[] = [
     },
   },
   {
-    title: '设备id',
+    title: '分站id',
     dataIndex: 'sub_id',
     align: 'center',
     ifShow: false,
   },
   {
-    title: '设备名称',
+    title: '分站名称',
     dataIndex: 'strName',
     align: 'center',
   },
   {
-    title: '数量',
+    title: '数据采集量',
     dataIndex: 'total_num',
     align: 'center',
   },
@@ -102,6 +102,12 @@ export const accessStatusColumn: BasicColumn[] = [
     title: '运行状态',
     dataIndex: 'netStatus',
     align: 'center',
+    // 添加状态转换逻辑
+    customRender: ({ record }) => {
+      // 将状态值转为数字进行判断
+      const status = Number(record.netStatus);
+      return status === 1 ? '正常' : '断开';
+    },
   },
   {
     title: '数据更新时间',
@@ -126,6 +132,7 @@ export const dailyNumOption: ModuleDataChart = {
   series: [{ readFrom: 'collectDataByDayList', xprop: 'day', yprop: 'total_count', label: '' }],
 };
 
+// 模拟设备数据
 export const deviceData = {
   monitorParamsCount: 1727,
   deviceCount: 4,