From 0f9f70d05e3739d657f8047675f2b12def44525e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 11:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/list.js | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index a17a139..5491021 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -10,20 +10,25 @@
prop: 'platformName',
},
{
+ label: '骞冲彴IP/鍩熷悕',
+ align: 'center',
+ prop: 'platformIp',
+ },
+ {
label: '褰撳墠鏄惁鍦ㄧ嚎',
align: 'center',
prop: 'currentOnline'
},
{
- label: '浠婃棩绂荤嚎鏃堕暱(绉� )',
+ label: '浠婃棩绂荤嚎鏃堕暱(绉�)',
align: 'center',
prop: 'todayOutlineSed'
},
{
- label: '浠婃棩ping娆℃暟',
+ label: '鏃ユ湡',
align: 'center',
- prop: 'pingTimes'
- }
+ prop: 'create_date'
+ },
],
card: [
{
@@ -2025,14 +2030,19 @@
prop: 'orgCode',
},
{
- label: '鎶撴媿鏁版嵁閲�',
+ label: '缁勭粐鍚嶇О',
align: 'center',
- prop: 'dataCount',
+ prop: 'orgName',
},
{
- label: '鏁版嵁鎶芥閲�',
+ label: '澶у浘鍙敤鎬ф暟鎹娊妫�閲�',
align: 'center',
prop: 'sampleCount',
+ },
+ {
+ label: '澶у浘鍙敤鐜�',
+ align: 'center',
+ prop: 'bigUsefulPercent',
},
{
label: '灏忓浘璁块棶寮傚父閲�',
@@ -2045,25 +2055,20 @@
prop: 'bigPicExpCount',
},
{
- label: '瀛樺湪鍥剧墖璁块棶寮傚父鐨勬暟鎹噺',
+ label: '澶у浘鍙敤鐜�',
align: 'center',
- prop: 'expCount',
+ prop: 'bigUsefulPercent',
},
{
- label: '浜鸿劯澶у皬鍥句笉涓�鑷存暟閲�',
+ label: '澶у浘璁块棶寮傚父鏁版嵁閲�',
align: 'center',
- prop: 'imgDiffCount',
+ prop: 'bigPicExpCount',
},
{
- label: 'Osd鏍囨敞寮傚父閲�',
+ label: 'osd鏍囨敞寮傚父鏁版嵁閲�',
align: 'center',
prop: 'osdExpCount',
- },
- {
- label: '澶у浘涓嶅彲鐢ㄩ噺',
- align: 'center',
- prop: 'bigDisableCount',
- },
+ }
],
card: [
{
@@ -2460,14 +2465,24 @@
prop: 'orgName',
},
{
- label: '褰撴棩鎺ユ敹鍒扮殑褰撴棩鎶撴媿閲�',
+ label: 'IP鍦板潃',
+ align: 'center',
+ prop: 'networkAddr',
+ },
+ {
+ label: '褰撴棩鎺ユ敹鍒扮殑褰撴棩鎶撴媿鏁版嵁閲�',
align: 'center',
prop: 'dataCount',
},
{
- label: '褰撴棩鎺ユ敹鍒扮殑闈炲綋鏃ユ姄鎷嶉噺',
+ label: '褰撴棩鎺ユ敹鍒扮殑鐧藉ぉ鎶撴媿鏁版嵁閲�',
align: 'center',
prop: 'daySnapCount',
+ },
+ {
+ label: '褰撴棩鎺ユ敹鍒扮殑闈炲綋鏃ユ姄鎷嶆暟鎹噺',
+ align: 'center',
+ prop: 'noTodayCount',
},
{
label: '鎸佺画鏃犳暟鎹ぉ鏁�',
@@ -2480,12 +2495,7 @@
prop: 'snapResult',
},
{
- label: '鏃堕挓鍑嗙‘鐜�',
- align: 'center',
- prop: 'clockPercent',
- },
- {
- label: '褰撴棩鎺ユ敹鐨勫綋鏃ユ姄鎷嶆暟鎹椂閽熷噯纭暟鎹噺',
+ label: '褰撴棩鎺ユ敹鐨勫綋鏃ユ姄鎷嶆暟鎹椂閽熷噯纭噺',
align: 'center',
prop: 'todayClockCount',
},
@@ -2495,19 +2505,14 @@
prop: 'todayClockResult',
},
{
- label: '褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭暟鎹噺',
+ label: '褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹腑鏃堕挓鍑嗙‘鏁版嵁閲�',
align: 'center',
prop: 'allClockCount',
},
{
- label: '褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭�у垽瀹氱粨鏋�',
+ label: '褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹腑鏃堕挓鍑嗙‘鎬у垽瀹氱粨鏋�',
align: 'center',
prop: 'allClockResult',
- },
- {
- label: '褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹椂閽熷噯纭暟鎹噺',
- align: 'center',
- prop: 'allClockCount',
},
],
card: [
@@ -2556,14 +2561,24 @@
prop: 'orgName',
},
{
- label: '褰撴棩鎺ユ敹鍒扮殑褰撴棩鎶撴媿閲�',
+ label: 'IP鍦板潃',
+ align: 'center',
+ prop: 'networkAddr',
+ },
+ {
+ label: '褰撴棩鎺ユ敹鍒扮殑褰撴棩鎶撴媿鏁版嵁閲�',
align: 'center',
prop: 'dataCount',
},
{
- label: '褰撴棩鎺ユ敹鍒扮殑闈炲綋鏃ユ姄鎷嶉噺',
+ label: '褰撴棩鎺ユ敹鍒扮殑鐧藉ぉ鎶撴媿鏁版嵁閲�',
align: 'center',
prop: 'daySnapCount',
+ },
+ {
+ label: '褰撴棩鎺ユ敹鍒扮殑闈炲綋鏃ユ姄鎷嶆暟鎹噺',
+ align: 'center',
+ prop: 'noTodayCount',
},
{
label: '鎸佺画鏃犳暟鎹ぉ鏁�',
@@ -2575,6 +2590,8 @@
align: 'center',
prop: 'snapResult',
},
+
+
{
label: '鍙婃椂鐜�',
align: 'center',
@@ -2629,7 +2646,7 @@
label: '褰撴棩鎺ユ敹鐨勫叏閮ㄦ姄鎷嶆暟鎹腑鍙婃椂鎬у垽瀹氱粨鏋�',
align: 'center',
prop: 'allTimelyResult',
- },
+ }
],
card: [
{
--
Gitblit v1.8.0