From 5d39f1e5e86755512efafc4ef52ec9725d681535 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 18:04:06 +0800
Subject: [PATCH] 数据中心搜索优化

---
 src/views/system/data-manage/data-detail/list.js | 2239 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1,349 insertions(+), 890 deletions(-)

diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index 695b363..d1a8e7b 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -15,7 +15,7 @@
           prop: 'platformIp',
         },
         {
-          label: '浠婃棩绂荤嚎鏃堕暱(绉�)',
+          label: '褰撴棩绂荤嚎鏃堕暱(绉�)',
           align: 'center',
           prop: 'todayOutlineSed'
         },
@@ -29,6 +29,9 @@
         {
           icon: 'el-icon-wind-power',
           dataList: [
+            {
+              label: "骞冲彴鏁�"
+            }
           ]
         }
       ]
@@ -323,6 +326,18 @@
         {
           icon: 'el-icon-wind-power',
           dataList: [
+            {
+              label: 'IP寮傚父鏁�'
+            },
+            {
+              label: 'MAC鍦板潃寮傚父鏁�'
+            },
+            {
+              label: '缁忓害寮傚父鏁�'
+            },
+            {
+              label: '绾害寮傚父鏁�'
+            },
           ]
         }
       ],
@@ -355,171 +370,284 @@
       index: 'monitor_registration',
       columns: [
         {
-          "label": "璁惧缂栫爜",
+          "label": "琛屾斂缂栫爜",
           "align": "center",
-          "prop": "sbbm",
-          "width": 220
+          "prop": "civilCode.value",
+          "width": 100
         },
         {
-          "label": "璁惧鍚嶇О",
+          "label": "灞曠ず鍊�",
           "align": "center",
-          "prop": "sbmc",
-          "width": 250
+          "prop": "civilCode.showValue",
+          "width": 100
         },
         {
-          "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
+          "label": "鏄惁閿欒",
           "align": "center",
-          "prop": "sxjcjqy",
+          "prop": "civilCode.error"
+        },
+        {
+          "label": "閿欒淇℃伅",
+          "align": "center",
+          "prop": "civilCode.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "闆嗘垚璁惧灞曠ず鍊�",
+          "align": "center",
+          "prop": "integrated_device.showValue",
           "width": 120
         },
         {
-          "label": "鐩戞帶鐐逛綅绫诲瀷",
+          "label": "闆嗘垚璁惧鏄惁閿欒",
           "align": "center",
-          "prop": "jkdwlx",
+          "prop": "integrated_device.error",
+          "width": 130
+        },
+        {
+          "label": "闆嗘垚璁惧閿欒淇℃伅",
+          "align": "center",
+          "prop": "integrated_device.errorMessage",
           "width": 150
         },
         {
-          "label": "IPV4鍦板潃",
+          "label": "IP鍦板潃灞曠ず鍊�",
           "align": "center",
-          "prop": "ip",
+          "prop": "ip.showValue",
           "width": 150
         },
         {
-          "label": "缁忓害",
+          "label": "IP鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "jd",
-          "width": 100
-        },
-        {
-          "label": "绾害",
-          "align": "center",
-          "prop": "wd",
-          "width": 100
-        },
-        {
-          "label": "鎽勫儚鏈哄姛鑳界被鍨�",
-          "align": "center",
-          "prop": "sxjgnlx",
+          "prop": "ip.value",
           "width": 150
         },
         {
-          "label": "MAC鍦板潃",
+          "label": "IP鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "macdz",
-          "width": 150
-        },
-        {
-          "label": "璁惧鐘舵��",
-          "align": "center",
-          "prop": "sbzt",
-          "width": 100
-        },
-        {
-          "label": "璁惧鍘傚晢",
-          "align": "center",
-          "prop": "sbcs",
-          "width": 150
-        },
-        {
-          "label": "琛屾斂鍖哄煙",
-          "align": "center",
-          "prop": "xzqy",
-          "width": 150
-        },
-        {
-          "label": "璁惧鍨嬪彿",
-          "align": "center",
-          "prop": "sbxh",
+          "prop": "ip.error",
           "width": 120
         },
         {
-          "label": "鐐逛綅淇楃О",
+          "label": "IP鍦板潃閿欒淇℃伅",
           "align": "center",
-          "prop": "dwcs",
-          "width": 250
+          "prop": "ip.errorMessage",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈虹被鍨�",
+          "label": "鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjlx",
+          "prop": "jkdwlx.showValue",
           "width": 100
         },
         {
-          "label": "琛ュ厜灞炴��",
+          "label": "鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊�",
           "align": "center",
-          "prop": "bgsx",
+          "prop": "jkdwlx.value",
           "width": 100
         },
         {
-          "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
+          "label": "鐩戞帶鐐逛綅绫诲瀷鏄惁鏈夎",
           "align": "center",
-          "prop": "sxjbmgs",
-          "width": 170
+          "prop": "jkdwlx.error",
+          "width": 150
         },
         {
-          "label": "瀹夎鍦板潃",
+          "label": "鐩戞帶鐐逛綅绫诲瀷閿欒淇℃伅",
           "align": "center",
-          "prop": "azdz",
-          "width": 170
+          "prop": "jkdwlx.errorMessage",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈轰綅缃被鍨�",
+          "label": "绾害灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjwzlx",
-          "width": 170
+          "prop": "latitude.showValue",
+          "width": 100
         },
         {
-          "label": "鐩戣鏂逛綅",
+          "label": "绾害瀹為檯鍊�",
           "align": "center",
-          "prop": "jsfw",
+          "prop": "latitude.value",
+          "width": 100
+        },
+        {
+          "label": "绾害鏄惁鏈夎",
+          "align": "center",
+          "prop": "latitude.error",
           "width": 120
         },
         {
-          "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
+          "label": "绾害閿欒淇℃伅",
           "align": "center",
-          "prop": "sxjcjyszp",
+          "prop": "latitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "缁忓害灞曠ず鍊�",
+          "align": "center",
+          "prop": "longitude.showValue",
+          "width": 100
+        },
+        {
+          "label": "缁忓害瀹為檯鍊�",
+          "align": "center",
+          "prop": "longitude.value",
+          "width": 100
+        },
+        {
+          "label": "缁忓害鏄惁鏈夎",
+          "align": "center",
+          "prop": "longitude.error",
+          "width": 100
+        },
+        {
+          "label": "缁忓害閿欒淇℃伅",
+          "align": "center",
+          "prop": "longitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "mac鍦板潃灞曠ず鍊�",
+          "align": "center",
+          "prop": "macdz.showValue",
           "width": 190
         },
         {
-          "label": "鑱旂綉灞炴��",
+          "label": "mac鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "lwsx",
-          "width": 120
-        },
-        {
-          "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
-          "align": "center",
-          "prop": "ssxqgafg",
-          "width": 170
-        },
-        {
-          "label": "瀹夎鏃堕棿",
-          "align": "center",
-          "prop": "azsj",
-          "width": 170
-        },
-        {
-          "label": "绠$悊鍗曚綅",
-          "align": "center",
-          "prop": "gldw",
-          "width": 170
-        },
-        {
-          "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡",
-          "align": "center",
-          "prop": "gldwlxfs",
+          "prop": "macdz.value",
           "width": 190
         },
         {
-          "label": "褰曞儚淇濆瓨澶╂暟",
+          "label": "mac鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "lxbcts",
+          "prop": "macdz.error",
+          "width": 130
+        },
+        {
+          "label": "mac鍦板潃閿欒淇℃伅",
+          "align": "center",
+          "prop": "macdz.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧鍚嶅睍绀哄��",
+          "align": "center",
+          "prop": "name.showValue",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶅疄闄呭��",
+          "align": "center",
+          "prop": "name.value",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶆槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "name.error",
+          "width": 120
+        },
+        {
+          "label": "璁惧鍚嶉敊璇俊鎭�",
+          "align": "center",
+          "prop": "name.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧鐘舵�佸睍绀哄��",
+          "align": "center",
+          "prop": "sbzt.showValue",
+          "width": 100
+        },
+        {
+          "label": "璁惧鐘舵�佸疄闄呭��",
+          "align": "center",
+          "prop": "sbzt.value",
+          "width": 120
+        },
+        {
+          "label": "璁惧鐘舵�佹槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sbzt.error",
+          "width": 130
+        },
+        {
+          "label": "璁惧鐘舵�侀敊璇俊鎭�",
+          "align": "center",
+          "prop": "sbzt.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜灞曠ず鍊�",
+          "align": "center",
+          "prop": "serialNumber.showValue",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜瀹為檯鍊�",
+          "align": "center",
+          "prop": "serialNumber.value",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜鏄惁鏈夎",
+          "align": "center",
+          "prop": "serialNumber.error",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜閿欒淇℃伅",
+          "align": "center",
+          "prop": "serialNumber.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄��",
+          "align": "center",
+          "prop": "sxjcjqy.showValue",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭��",
+          "align": "center",
+          "prop": "sxjcjqy.value",
+          "width": 100
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熸槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjcjqy.error",
           "width": 170
         },
         {
-          "label": "鎵�灞為儴闂�/琛屼笟",
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熼敊璇俊鎭�",
           "align": "center",
-          "prop": "ssbmhy",
+          "prop": "sxjcjqy.errorMessage",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄��",
+          "align": "center",
+          "prop": "sxjgnlx.showValue",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭��",
+          "align": "center",
+          "prop": "sxjgnlx.value",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬫槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjgnlx.error",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬮敊璇俊鎭�",
+          "align": "center",
+          "prop": "sxjgnlx.errorMessage",
           "width": 170
         }
       ],
@@ -528,42 +656,42 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: 'IP寮傚父鏁�'
             },
             {
-              label: '鏈仈缃�'
+              label: 'MAC鍦板潃寮傚父鏁�'
             },
             {
-              label: '瑙嗛鐩戞帶'
+              label: '缁忓害寮傚父鏁�'
             },
             {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
+              label: '绾害寮傚父鏁�'
             },
           ]
         }
       ],
       showList: [
-        { key: 0, label: `璁惧鍘傚晢`, visible: false },
-        { key: 1, label: `琛屾斂鍖哄煙`, visible: false },
-        { key: 2, label: `璁惧鍨嬪彿`, visible: false },
-        { key: 3, label: `鐐逛綅淇楃О`, visible: false },
-        { key: 4, label: `鎽勫儚鏈虹被鍨媊, visible: false },
-        { key: 5, label: `琛ュ厜灞炴�, visible: false },
-        { key: 6, label: `鎽勫儚鏈虹紪鐮佹牸寮廯, visible: false },
-        { key: 7, label: `瀹夎鍦板潃`, visible: false },
-        { key: 8, label: `鎽勫儚鏈轰綅缃被鍨媊, visible: false },
-        { key: 9, label: `鐩戣鏂逛綅`, visible: false },
-        { key: 10, label: `鎽勫儚鏈哄満鏅璁剧収鐗嘦RL`, visible: false },
-        { key: 11, label: `鑱旂綉灞炴�, visible: false },
-        { key: 12, label: `鎵�灞炶緰鍖哄叕瀹夋満鍏砢, visible: false },
-        { key: 13, label: `瀹夎鏃堕棿`, visible: false },
-        { key: 14, label: `绠$悊鍗曚綅`, visible: false },
-        { key: 15, label: `褰曞儚淇濆瓨澶╂暟`, visible: false },
-        { key: 16, label: `鎵�灞為儴闂�/琛屼笟`, visible: false },
-        { key: 16, label: `绠$悊鍗曚綅鑱旂郴鏂瑰紡`, visible: false },
+        { key: 0, label: `闆嗘垚璁惧灞曠ず鍊糮, visible: false },
+        { key: 1, label: `IP鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 2, label: `IP鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 3, label: `鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊糮, visible: false },
+        { key: 4, label: `鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊糮, visible: false },
+        { key: 5, label: `绾害灞曠ず鍊糮, visible: false },
+        { key: 6, label: `绾害瀹為檯鍊糮, visible: false },
+        { key: 7, label: `缁忓害灞曠ず鍊糮, visible: false },
+        { key: 8, label: `缁忓害瀹為檯鍊糮, visible: false },
+        { key: 9, label: `mac鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 10, label: `mac鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 11, label: `璁惧鍚嶅睍绀哄�糮, visible: false },
+        { key: 12, label: `璁惧鍚嶅疄闄呭�糮, visible: false },
+        { key: 13, label: `璁惧鐘舵�佸睍绀哄�糮, visible: false },
+        { key: 14, label: `璁惧鐘舵�佸疄闄呭�糮, visible: false },
+        { key: 15, label: `璁惧缂栫爜灞曠ず鍊糮, visible: false },
+        { key: 16, label: `璁惧缂栫爜瀹為檯鍊糮, visible: false },
+        { key: 17, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄�糮, visible: false },
+        { key: 18, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭�糮, visible: false },
+        { key: 19, label: `鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄�糮, visible: false },
+        { key: 20, label: `鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭�糮, visible: false }
       ],
     },
     {
@@ -571,172 +699,285 @@
       index: 'archives_rate',
       columns: [
         {
-          "label": "璁惧缂栫爜",
+          "label": "琛屾斂缂栫爜",
           "align": "center",
-          "prop": "sbbm",
-          "width": 220
-        },
-        {
-          "label": "璁惧鍚嶇О",
-          "align": "center",
-          "prop": "sbmc",
-          "width": 250
-        },
-        {
-          "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
-          "align": "center",
-          "prop": "sxjcjqy",
-          "width": 150
-        },
-        {
-          "label": "鐩戞帶鐐逛綅绫诲瀷",
-          "align": "center",
-          "prop": "jkdwlx",
-          "width": 170
-        },
-        {
-          "label": "IPV4鍦板潃",
-          "align": "center",
-          "prop": "ip",
-          "width": 150
-        },
-        {
-          "label": "缁忓害",
-          "align": "center",
-          "prop": "jd",
-          "width": 130
-        },
-        {
-          "label": "绾害",
-          "align": "center",
-          "prop": "wd",
-          "width": 130
-        },
-        {
-          "label": "鎽勫儚鏈哄姛鑳界被鍨�",
-          "align": "center",
-          "prop": "sxjgnlx",
-          "width": 170
-        },
-        {
-          "label": "MAC鍦板潃",
-          "align": "center",
-          "prop": "macdz",
-          "width": 150
-        },
-        {
-          "label": "璁惧鐘舵��",
-          "align": "center",
-          "prop": "sbzt",
-          "width": 120
-        },
-        {
-          "label": "璁惧鍘傚晢",
-          "align": "center",
-          "prop": "sbcs",
-          "width": 120
-        },
-        {
-          "label": "琛屾斂鍖哄煙",
-          "align": "center",
-          "prop": "xzqy",
-          "width": 150
-        },
-        {
-          "label": "璁惧鍨嬪彿",
-          "align": "center",
-          "prop": "sbxh",
-          "width": 150
-        },
-        {
-          "label": "鐐逛綅淇楃О",
-          "align": "center",
-          "prop": "dwcs",
-          "width": 200
-        },
-        {
-          "label": "鎽勫儚鏈虹被鍨�",
-          "align": "center",
-          "prop": "sxjlx",
-          "width": 150
-        },
-        {
-          "label": "琛ュ厜灞炴��",
-          "align": "center",
-          "prop": "bgsx",
+          "prop": "civilCode.value",
           "width": 100
         },
         {
-          "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
+          "label": "灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjbmgs",
-          "width": 200
-        },
-        {
-          "label": "瀹夎鍦板潃",
-          "align": "center",
-          "prop": "azdz",
-          "width": 170
-        },
-        {
-          "label": "鎽勫儚鏈轰綅缃被鍨�",
-          "align": "center",
-          "prop": "sxjwzlx",
-          "width": 170
-        },
-        {
-          "label": "鐩戣鏂逛綅",
-          "align": "center",
-          "prop": "jsfw",
-          "width": 150
-        },
-        {
-          "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
-          "align": "center",
-          "prop": "sxjcjyszp",
-          "width": 200
-        },
-        {
-          "label": "鑱旂綉灞炴��",
-          "align": "center",
-          "prop": "lwsx",
+          "prop": "civilCode.showValue",
           "width": 100
         },
         {
-          "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
+          "label": "鏄惁閿欒",
           "align": "center",
-          "prop": "ssxqgafg",
+          "prop": "civilCode.error"
+        },
+        {
+          "label": "閿欒淇℃伅",
+          "align": "center",
+          "prop": "civilCode.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "闆嗘垚璁惧灞曠ず鍊�",
+          "align": "center",
+          "prop": "integrated_device.showValue",
+          "width": 120
+        },
+        {
+          "label": "闆嗘垚璁惧鏄惁閿欒",
+          "align": "center",
+          "prop": "integrated_device.error",
+          "width": 130
+        },
+        {
+          "label": "闆嗘垚璁惧閿欒淇℃伅",
+          "align": "center",
+          "prop": "integrated_device.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "IP鍦板潃灞曠ず鍊�",
+          "align": "center",
+          "prop": "ip.showValue",
+          "width": 150
+        },
+        {
+          "label": "IP鍦板潃瀹為檯鍊�",
+          "align": "center",
+          "prop": "ip.value",
+          "width": 150
+        },
+        {
+          "label": "IP鍦板潃鏄惁鏈夎",
+          "align": "center",
+          "prop": "ip.error",
+          "width": 120
+        },
+        {
+          "label": "IP鍦板潃閿欒淇℃伅",
+          "align": "center",
+          "prop": "ip.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊�",
+          "align": "center",
+          "prop": "jkdwlx.showValue",
+          "width": 100
+        },
+        {
+          "label": "鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊�",
+          "align": "center",
+          "prop": "jkdwlx.value",
+          "width": 100
+        },
+        {
+          "label": "鐩戞帶鐐逛綅绫诲瀷鏄惁鏈夎",
+          "align": "center",
+          "prop": "jkdwlx.error",
+          "width": 150
+        },
+        {
+          "label": "鐩戞帶鐐逛綅绫诲瀷閿欒淇℃伅",
+          "align": "center",
+          "prop": "jkdwlx.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "绾害灞曠ず鍊�",
+          "align": "center",
+          "prop": "latitude.showValue",
+          "width": 100
+        },
+        {
+          "label": "绾害瀹為檯鍊�",
+          "align": "center",
+          "prop": "latitude.value",
+          "width": 100
+        },
+        {
+          "label": "绾害鏄惁鏈夎",
+          "align": "center",
+          "prop": "latitude.error",
+          "width": 120
+        },
+        {
+          "label": "绾害閿欒淇℃伅",
+          "align": "center",
+          "prop": "latitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "缁忓害灞曠ず鍊�",
+          "align": "center",
+          "prop": "longitude.showValue",
+          "width": 100
+        },
+        {
+          "label": "缁忓害瀹為檯鍊�",
+          "align": "center",
+          "prop": "longitude.value",
+          "width": 100
+        },
+        {
+          "label": "缁忓害鏄惁鏈夎",
+          "align": "center",
+          "prop": "longitude.error",
+          "width": 100
+        },
+        {
+          "label": "缁忓害閿欒淇℃伅",
+          "align": "center",
+          "prop": "longitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "mac鍦板潃灞曠ず鍊�",
+          "align": "center",
+          "prop": "macdz.showValue",
           "width": 190
         },
         {
-          "label": "瀹夎鏃堕棿",
+          "label": "mac鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "azsj",
-          "width": 170
+          "prop": "macdz.value",
+          "width": 190
         },
         {
-          "label": "绠$悊鍗曚綅",
+          "label": "mac鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "gldw",
-          "width": 180
+          "prop": "macdz.error",
+          "width": 130
         },
         {
-          "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡",
+          "label": "mac鍦板潃閿欒淇℃伅",
           "align": "center",
-          "prop": "gldwlxfs",
-          "width": 170
+          "prop": "macdz.errorMessage",
+          "width": 150
         },
         {
-          "label": "褰曞儚淇濆瓨澶╂暟",
+          "label": "璁惧鍚嶅睍绀哄��",
           "align": "center",
-          "prop": "lxbcts",
+          "prop": "name.showValue",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶅疄闄呭��",
+          "align": "center",
+          "prop": "name.value",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶆槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "name.error",
           "width": 120
         },
         {
-          "label": "鎵�灞為儴闂�/琛屼笟",
+          "label": "璁惧鍚嶉敊璇俊鎭�",
           "align": "center",
-          "prop": "ssbmhy",
+          "prop": "name.errorMessage",
           "width": 150
+        },
+        {
+          "label": "璁惧鐘舵�佸睍绀哄��",
+          "align": "center",
+          "prop": "sbzt.showValue",
+          "width": 100
+        },
+        {
+          "label": "璁惧鐘舵�佸疄闄呭��",
+          "align": "center",
+          "prop": "sbzt.value",
+          "width": 120
+        },
+        {
+          "label": "璁惧鐘舵�佹槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sbzt.error",
+          "width": 130
+        },
+        {
+          "label": "璁惧鐘舵�侀敊璇俊鎭�",
+          "align": "center",
+          "prop": "sbzt.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜灞曠ず鍊�",
+          "align": "center",
+          "prop": "serialNumber.showValue",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜瀹為檯鍊�",
+          "align": "center",
+          "prop": "serialNumber.value",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜鏄惁鏈夎",
+          "align": "center",
+          "prop": "serialNumber.error",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜閿欒淇℃伅",
+          "align": "center",
+          "prop": "serialNumber.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄��",
+          "align": "center",
+          "prop": "sxjcjqy.showValue",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭��",
+          "align": "center",
+          "prop": "sxjcjqy.value",
+          "width": 100
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熸槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjcjqy.error",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熼敊璇俊鎭�",
+          "align": "center",
+          "prop": "sxjcjqy.errorMessage",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄��",
+          "align": "center",
+          "prop": "sxjgnlx.showValue",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭��",
+          "align": "center",
+          "prop": "sxjgnlx.value",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬫槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjgnlx.error",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬮敊璇俊鎭�",
+          "align": "center",
+          "prop": "sxjgnlx.errorMessage",
+          "width": 170
         }
       ],
       card: [
@@ -744,43 +985,42 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: 'IP寮傚父鏁�'
             },
             {
-              label: '鏈仈缃�'
+              label: 'MAC鍦板潃寮傚父鏁�'
             },
             {
-              label: '瑙嗛鐩戞帶'
+              label: '缁忓害寮傚父鏁�'
             },
             {
-              label: '杞﹁締璇嗗埆'
+              label: '绾害寮傚父鏁�'
             },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
           ]
         }
       ],
       showList: [
-        { key: 0, label: `璁惧鍘傚晢`, visible: false },
-        { key: 1, label: `琛屾斂鍖哄煙`, visible: false },
-        { key: 2, label: `璁惧鍨嬪彿`, visible: false },
-        { key: 3, label: `鐐逛綅淇楃О`, visible: false },
-        { key: 3, label: `鎽勫儚鏈虹被鍨媊, visible: false },
-        { key: 3, label: `琛ュ厜灞炴�, visible: false },
-        { key: 3, label: `鎽勫儚鏈虹紪鐮佹牸寮廯, visible: false },
-        { key: 3, label: `瀹夎鍦板潃`, visible: false },
-        { key: 3, label: `鎽勫儚鏈轰綅缃被鍨媊, visible: false },
-        { key: 3, label: `鐩戣鏂逛綅`, visible: false },
-        { key: 3, label: `鎽勫儚鏈哄満鏅璁剧収鐗嘦RL`, visible: false },
-        { key: 3, label: `鑱旂綉灞炴�, visible: false },
-        { key: 3, label: `鎵�灞炶緰鍖哄叕瀹夋満鍏砢, visible: false },
-        { key: 3, label: `瀹夎鏃堕棿`, visible: false },
-        { key: 3, label: `绠$悊鍗曚綅`, visible: false },
-        { key: 3, label: `绠$悊鍗曚綅鑱旂郴鏂瑰紡`, visible: false },
-        { key: 3, label: `褰曞儚淇濆瓨澶╂暟`, visible: false },
-        { key: 3, label: `鎵�灞為儴闂�/琛屼笟`, visible: false },
+        { key: 0, label: `闆嗘垚璁惧灞曠ず鍊糮, visible: false },
+        { key: 1, label: `IP鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 2, label: `IP鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 3, label: `鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊糮, visible: false },
+        { key: 4, label: `鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊糮, visible: false },
+        { key: 5, label: `绾害灞曠ず鍊糮, visible: false },
+        { key: 6, label: `绾害瀹為檯鍊糮, visible: false },
+        { key: 7, label: `缁忓害灞曠ず鍊糮, visible: false },
+        { key: 8, label: `缁忓害瀹為檯鍊糮, visible: false },
+        { key: 9, label: `mac鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 10, label: `mac鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 11, label: `璁惧鍚嶅睍绀哄�糮, visible: false },
+        { key: 12, label: `璁惧鍚嶅疄闄呭�糮, visible: false },
+        { key: 13, label: `璁惧鐘舵�佸睍绀哄�糮, visible: false },
+        { key: 14, label: `璁惧鐘舵�佸疄闄呭�糮, visible: false },
+        { key: 15, label: `璁惧缂栫爜灞曠ず鍊糮, visible: false },
+        { key: 16, label: `璁惧缂栫爜瀹為檯鍊糮, visible: false },
+        { key: 17, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄�糮, visible: false },
+        { key: 18, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭�糮, visible: false },
+        { key: 19, label: `鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄�糮, visible: false },
+        { key: 20, label: `鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭�糮, visible: false }
       ],
     },
     {
@@ -854,13 +1094,14 @@
         {
           "label": "绱绂荤嚎鏁呴殰娆℃暟",
           "align": "center",
-          "prop": "olErrTotal"
+          "prop": "olErrTotal",
+          width: 180,
         },
         {
           "label": "绱绂荤嚎鏁呴殰鐜�",
           "align": "center",
           "prop": "olErrTotalRate",
-          "width": 80
+          "width": 180,
         },
         {
           "label": "宸℃娆℃暟",
@@ -1001,13 +1242,14 @@
         {
           "label": "绱绂荤嚎鏁呴殰娆℃暟",
           "align": "center",
-          "prop": "olErrTotal"
+          "prop": "olErrTotal",
+          width: 180,
         },
         {
           "label": "绱绂荤嚎鏁呴殰鐜�",
           "align": "center",
           "prop": "olErrTotalRate",
-          "width": 80
+          "width": 180
         },
         {
           "label": "宸℃娆℃暟",
@@ -1094,17 +1336,20 @@
         {
           label: "鍒涘缓鏃堕棿",
           align: "center",
-          prop: "createTime"
+          prop: "createTime",
+          width: 150,
         },
         {
           label: "鎽勫儚鏈篒D",
           align: "center",
-          prop: "deviceId"
+          prop: "deviceId",
+          width: 190,
         },
         {
           label: "鎽勫儚鏈哄悕绉�",
           align: "center",
-          prop: "deviceName"
+          prop: "deviceName",
+          width: 230,
         },
         {
           label: "缂哄け鏃堕暱",
@@ -1114,7 +1359,8 @@
         {
           label: "鍥芥爣骞冲彴ID",
           align: "center",
-          prop: "platId"
+          prop: "platId",
+          width: 190,
         },
         {
           label: "褰曞儚鏃堕暱",
@@ -1129,7 +1375,8 @@
         {
           label: "缁熻鏃堕棿",
           align: "center",
-          prop: "statTime"
+          prop: "statTime",
+          width: 150,
         },
       ],
       card: [
@@ -1156,62 +1403,57 @@
         {
           label: "琛屾斂鍖哄煙",
           align: "center",
-          prop: "arealayername",
-          width: 150
+          prop: "arealayername"
         },
         {
           label: "琛屾斂鍖哄煙ID",
           align: "center",
-          prop: "arealayerno",
-          width: 150
+          prop: "arealayerno"
         },
         {
           label: "鍒涘缓鏃堕棿",
           align: "center",
           prop: "createTime",
-          width: 150
+          width: 150,
         },
         {
           label: "鎽勫儚鏈篒D",
           align: "center",
           prop: "deviceId",
-          width: 150
+          width: 190,
         },
         {
           label: "鎽勫儚鏈哄悕绉�",
           align: "center",
           prop: "deviceName",
-          width: 190
+          width: 230,
         },
         {
           label: "缂哄け鏃堕暱",
           align: "center",
-          prop: "missDuration",
-          width: 100
+          prop: "missDuration"
         },
         {
           label: "鍥芥爣骞冲彴ID",
           align: "center",
           prop: "platId",
-          width: 150
+          width: 190,
         },
         {
           label: "褰曞儚鏃堕暱",
           align: "center",
-          prop: "recordDuration",
-          width: 100
+          prop: "recordDuration"
         },
         {
           label: "褰曞儚瀹屾暣鐘舵��",
           align: "center",
-          prop: "recordStatusText",
-          width: 120
+          prop: "recordStatusText"
         },
         {
           label: "缁熻鏃堕棿",
           align: "center",
           prop: "statTime",
-          width: 150
+          width: 150,
         },
       ],
       card: [
@@ -1574,172 +1816,124 @@
       index: 'key_site_online',
       columns: [
         {
-          "label": "璁惧缂栫爜",
+          "label": "琛屾斂鍖哄垝缂栫爜",
           "align": "center",
-          "prop": "sbbm",
-          width: 190
+          "prop": "arealayerPath",
+          "width": 250
+        },
+        {
+          "label": "瑙g爜鐘舵�佺爜",
+          "align": "center",
+          "prop": "decodingCode"
+        },
+        {
+          "label": "璁惧id",
+          "align": "center",
+          "prop": "deviceId",
+          "width": 250
         },
         {
           "label": "璁惧鍚嶇О",
           "align": "center",
-          "prop": "sbmc",
-          width: 200
+          "prop": "deviceName",
+          "width": 250
         },
         {
-          "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
+          "label": "icmp寤惰繜",
           "align": "center",
-          "prop": "sxjcjqy",
-          width: 150
+          "prop": "icmpDelay"
         },
         {
-          "label": "鐩戞帶鐐逛綅绫诲瀷",
+          "label": "icmp鐘舵��",
           "align": "center",
-          "prop": "jkdwlx",
-          width: 120
+          "prop": "icmpStatusText"
         },
         {
-          "label": "IPV4鍦板潃",
+          "label": "鏈�杩慽cmp鏃堕棿",
           "align": "center",
-          "prop": "ip",
-          width: 120
+          "prop": "icmpTime",
+          "format": "yyyy-MM-dd HH:mm:ss",
+          "width": 200
         },
         {
-          "label": "缁忓害",
+          "label": "鍏抽敭甯ф椂寤�",
           "align": "center",
-          "prop": "jd",
-          width: 150
+          "prop": "ifmDelay"
         },
         {
-          "label": "绾害",
+          "label": "ip鍦板潃",
           "align": "center",
-          "prop": "wd",
-          width: 150
+          "prop": "ipAddr",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈哄姛鑳界被鍨�",
+          "label": "鏈�杩戞寔缁绾挎晠闅滄鏁�",
           "align": "center",
-          "prop": "sxjgnlx",
-          width: 150
+          "prop": "olErrEverduring",
+          "width": 200
         },
         {
-          "label": "MAC鍦板潃",
+          "label": "鏈�杩戞寔缁绾挎晠闅滄椂闂�",
           "align": "center",
-          "prop": "macdz",
-          width: 150
+          "prop": "olErrEverduringFirstTime",
+          "format": "yyyy-MM-dd HH:mm:ss",
+          "width": 200
         },
         {
-          "label": "璁惧鐘舵��",
+          "label": "绱绂荤嚎鏁呴殰娆℃暟",
           "align": "center",
-          "prop": "sbzt",
-          width: 150
+          "prop": "olErrTotal",
+          width: 180,
         },
         {
-          "label": "璁惧鍘傚晢",
+          "label": "绱绂荤嚎鏁呴殰鐜�",
           "align": "center",
-          "prop": "sbcs",
-          width: 150
+          "prop": "olErrTotalRate",
+          "width": 180
         },
         {
-          "label": "琛屾斂鍖哄煙",
+          "label": "宸℃娆℃暟",
           "align": "center",
-          "prop": "xzqy",
-          width: 150
+          "prop": "olTotal"
         },
         {
-          "label": "璁惧鍨嬪彿",
+          "label": "sip鐘舵�佺爜",
           "align": "center",
-          "prop": "sbxh",
-          width: 150
+          "prop": "sipCode"
         },
         {
-          "label": "鐐逛綅淇楃О",
+          "label": "淇′护鏃跺欢",
           "align": "center",
-          "prop": "dwcs",
-          width: 150
+          "prop": "sipDelay"
         },
         {
-          "label": "鎽勫儚鏈虹被鍨�",
+          "label": "鍦ㄧ嚎鐘舵��",
           "align": "center",
-          "prop": "sxjlx",
-          width: 150
+          "prop": "statusText"
         },
         {
-          "label": "琛ュ厜灞炴��",
+          "label": "鐪佸巺鏍囩",
           "align": "center",
-          "prop": "bgsx",
-          width: 150
+          "prop": "tagStr",
+          "width": 200
         },
         {
-          "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
+          "label": "鐪佸巺鏍囩鍒楄〃",
           "align": "center",
-          "prop": "sxjbmgs",
-          width: 150
+          "prop": "tags",
+          "width": 200
         },
         {
-          "label": "瀹夎鍦板潃",
+          "label": "瑙嗛娴佹椂寤�",
           "align": "center",
-          "prop": "azdz",
-          width: 150
+          "prop": "videoDelay"
         },
         {
-          "label": "鎽勫儚鏈轰綅缃被鍨�",
+          "label": "瑙嗛璐ㄩ噺妫�娴嬫椂闂�",
           "align": "center",
-          "prop": "sxjwzlx",
-          width: 180
-        },
-        {
-          "label": "鐩戣鏂逛綅",
-          "align": "center",
-          "prop": "jsfw",
-          width: 150
-        },
-        {
-          "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
-          "align": "center",
-          "prop": "sxjcjyszp",
-          width: 200
-        },
-        {
-          "label": "鑱旂綉灞炴��",
-          "align": "center",
-          "prop": "lwsx",
-          width: 150
-        },
-        {
-          "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
-          "align": "center",
-          "prop": "ssxqgafg",
-          width: 170
-        },
-        {
-          "label": "瀹夎鏃堕棿",
-          "align": "center",
-          "prop": "azsj",
-          width: 120
-        },
-        {
-          "label": "绠$悊鍗曚綅",
-          "align": "center",
-          "prop": "gldw",
-          width: 120
-        },
-        {
-          "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡",
-          "align": "center",
-          "prop": "gldwlxfs",
-          width: 160
-        },
-        {
-          "label": "褰曞儚淇濆瓨澶╂暟",
-          "align": "center",
-          "prop": "lxbcts",
-          width: 150
-        },
-        {
-          "label": "鎵�灞為儴闂�/琛屼笟",
-          "align": "center",
-          "prop": "ssbmhy",
-          width: 150
+          "prop": "vqdTime",
+          "format": "yyyy-MM-dd HH:mm:ss",
+          "width": 200
         }
       ],
       card: [
@@ -1747,43 +1941,37 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: '璁惧鎬绘暟'
             },
-            {
-              label: '鏈仈缃�'
-            },
-            {
-              label: '瑙嗛鐩戞帶'
-            },
-            {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
+            // {
+            //   label: '宸茶仈缃�'
+            // },
+            // {
+            //   label: '鏈仈缃�'
+            // },
+            // {
+            //   label: '瑙嗛鐩戞帶'
+            // },
+            // {
+            //   label: '杞﹁締璇嗗埆'
+            // },
+            // {
+            //   label: '浜鸿劯璇嗗埆'
+            // },
           ]
         }
       ],
       showList: [
-        { key: 0, label: `璁惧鍘傚晢`, visible: false },
-        { key: 1, label: `琛屾斂鍖哄煙`, visible: false },
-        { key: 2, label: `璁惧鍨嬪彿`, visible: false },
-        { key: 3, label: `鐐逛綅淇楃О`, visible: false },
-        { key: 3, label: `鎽勫儚鏈虹被鍨媊, visible: false },
-        { key: 3, label: `琛ュ厜灞炴�, visible: false },
-        { key: 3, label: `鎽勫儚鏈虹紪鐮佹牸寮廯, visible: false },
-        { key: 3, label: `瀹夎鍦板潃`, visible: false },
-        { key: 3, label: `鎽勫儚鏈轰綅缃被鍨媊, visible: false },
-        { key: 3, label: `鐩戣鏂逛綅`, visible: false },
-        { key: 3, label: `鎽勫儚鏈哄満鏅璁剧収鐗嘦RL`, visible: false },
-        { key: 3, label: `鑱旂綉灞炴�, visible: false },
-        { key: 3, label: `鎵�灞炶緰鍖哄叕瀹夋満鍏砢, visible: false },
-        { key: 3, label: `瀹夎鏃堕棿`, visible: false },
-        { key: 3, label: `绠$悊鍗曚綅`, visible: false },
-        { key: 3, label: `绠$悊鍗曚綅鑱旂郴鏂瑰紡`, visible: false },
-        { key: 3, label: `褰曞儚淇濆瓨澶╂暟`, visible: false },
-        { key: 3, label: `鎵�灞為儴闂�/琛屼笟`, visible: false },
+        { key: 0, label: `瑙g爜鐘舵�佺爜`, visible: false },
+        { key: 1, label: `sip鐘舵�佺爜`, visible: false },
+        { key: 2, label: `淇′护鏃跺欢`, visible: false },
+        { key: 3, label: `icmp寤惰繜`, visible: false },
+        { key: 3, label: `鍏抽敭甯ф椂寤禶, visible: false },
+        { key: 3, label: `鏈�杩戞寔缁绾挎晠闅滄椂闂碻, visible: false },
+        { key: 3, label: `瑙嗛娴佹椂寤禶, visible: false },
+        { key: 3, label: `宸℃娆℃暟`, visible: false },
+        { key: 3, label: `鐪佸巺鏍囩`, visible: false },
+        { key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
       ],
     },
     {
@@ -1803,17 +1991,20 @@
         {
           label: "鍒涘缓鏃堕棿",
           align: "center",
-          prop: "createTime"
+          prop: "createTime",
+          width: 150,
         },
         {
           label: "鎽勫儚鏈篒D",
           align: "center",
-          prop: "deviceId"
+          prop: "deviceId",
+          width: 190,
         },
         {
           label: "鎽勫儚鏈哄悕绉�",
           align: "center",
-          prop: "deviceName"
+          prop: "deviceName",
+          width: 230,
         },
         {
           label: "缂哄け鏃堕暱",
@@ -1823,7 +2014,8 @@
         {
           label: "鍥芥爣骞冲彴ID",
           align: "center",
-          prop: "platId"
+          prop: "platId",
+          width: 190,
         },
         {
           label: "褰曞儚鏃堕暱",
@@ -1838,7 +2030,8 @@
         {
           label: "缁熻鏃堕棿",
           align: "center",
-          prop: "statTime"
+          prop: "statTime",
+          width: 150,
         },
       ],
       card: [
@@ -1941,21 +2134,17 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: '鐐逛綅鍚嶇О鏍囨敞姝g‘鏁�'
             },
             {
-              label: '鏈仈缃�'
+              label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
             },
             {
-              label: '瑙嗛鐩戞帶'
+              label: 'osd鏃堕棿鏍囨敞姝g‘鏁�'
             },
             {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
+              label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+            }
           ]
         }
       ],
@@ -1967,164 +2156,87 @@
         {
           "label": "璁惧缂栫爜",
           "align": "center",
-          "prop": "sbbm"
+          "prop": "deviceNo",
+          width: 190
         },
         {
           "label": "璁惧鍚嶇О",
           "align": "center",
-          "prop": "sbmc"
+          "prop": "osdName",
+          width: 200
         },
         {
-          "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
+          "label": "osd鐪�",
           "align": "center",
-          "prop": "sxjcjqy"
+          "prop": "osdProvince",
+          width: 150
         },
         {
-          "label": "鐩戞帶鐐逛綅绫诲瀷",
+          "label": "osd甯�",
           "align": "center",
-          "prop": "jkdwlx"
+          "prop": "osdCity",
+          width: 150
         },
         {
-          "label": "IPV4鍦板潃",
+          "label": "osd鍖�",
           "align": "center",
-          "prop": "ip"
+          "prop": "osdPart",
+          width: 150
         },
         {
-          "label": "缁忓害",
+          "label": "osd宸︿笅瑙�",
           "align": "center",
-          "prop": "jd"
+          "prop": "osdLB",
+          width: 150
         },
         {
-          "label": "绾害",
+          "label": "osd鏃堕棿鏄惁姝g‘",
           "align": "center",
-          "prop": "wd"
+          "prop": "osdTimeCorrect",
+          width: 150
         },
         {
-          "label": "鎽勫儚鏈哄姛鑳界被鍨�",
+          "label": "osd閫氶亾鍚嶆槸鍚︽纭�",
           "align": "center",
-          "prop": "sxjgnlx"
+          "prop": "osdNameCorrect",
+          width: 150
         },
         {
-          "label": "MAC鍦板潃",
+          "label": "osd鐪佹槸鍚︽纭�",
           "align": "center",
-          "prop": "macdz"
+          "prop": "osdProvinceCorrect",
+          width: 150
         },
         {
-          "label": "璁惧鐘舵��",
+          "label": "osd甯傛槸鍚︽纭�",
           "align": "center",
-          "prop": "sbzt"
+          "prop": "osdCityCorrect",
+          width: 150
         },
         {
-          "label": "璁惧鍘傚晢",
+          "label": "osd鍖烘槸鍚︽纭�",
           "align": "center",
-          "prop": "sbcs"
+          "prop": "osdPartCorrect",
+          width: 150
         },
         {
-          "label": "琛屾斂鍖哄煙",
+          "label": "osd宸︿笅瑙掓槸鍚︽纭�",
           "align": "center",
-          "prop": "xzqy"
+          "prop": "osdLbCorrect",
+          width: 150
         },
-        {
-          "label": "璁惧鍨嬪彿",
-          "align": "center",
-          "prop": "sbxh"
-        },
-        {
-          "label": "鐐逛綅淇楃О",
-          "align": "center",
-          "prop": "dwcs"
-        },
-        {
-          "label": "鎽勫儚鏈虹被鍨�",
-          "align": "center",
-          "prop": "sxjlx"
-        },
-        {
-          "label": "琛ュ厜灞炴��",
-          "align": "center",
-          "prop": "bgsx"
-        },
-        {
-          "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
-          "align": "center",
-          "prop": "sxjbmgs"
-        },
-        {
-          "label": "瀹夎鍦板潃",
-          "align": "center",
-          "prop": "azdz"
-        },
-        {
-          "label": "鎽勫儚鏈轰綅缃被鍨�",
-          "align": "center",
-          "prop": "sxjwzlx"
-        },
-        {
-          "label": "鐩戣鏂逛綅",
-          "align": "center",
-          "prop": "jsfw"
-        },
-        {
-          "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
-          "align": "center",
-          "prop": "sxjcjyszp"
-        },
-        {
-          "label": "鑱旂綉灞炴��",
-          "align": "center",
-          "prop": "lwsx"
-        },
-        {
-          "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
-          "align": "center",
-          "prop": "ssxqgafg"
-        },
-        {
-          "label": "瀹夎鏃堕棿",
-          "align": "center",
-          "prop": "azsj"
-        },
-        {
-          "label": "绠$悊鍗曚綅",
-          "align": "center",
-          "prop": "gldw"
-        },
-        {
-          "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡",
-          "align": "center",
-          "prop": "gldwlxfs"
-        },
-        {
-          "label": "褰曞儚淇濆瓨澶╂暟",
-          "align": "center",
-          "prop": "lxbcts"
-        },
-        {
-          "label": "鎵�灞為儴闂�/琛屼笟",
-          "align": "center",
-          "prop": "ssbmhy"
-        }
+
       ],
       card: [
         {
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: 'osd鏃堕棿鏍囨敞姝g‘鏁�'
             },
             {
-              label: '鏈仈缃�'
-            },
-            {
-              label: '瑙嗛鐩戞帶'
-            },
-            {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
+              label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+            }
           ]
         }
       ],
@@ -2154,73 +2266,163 @@
       index: 'key_command_image_online',
       columns: [
         {
-          label: '鍐呯爜',
-          align: 'center',
-          prop: 'indexCode',
+          "label": "琛屾斂鍖哄垝缂栫爜",
+          "align": "center",
+          "prop": "arealayerPath",
+          "width": 250
         },
         {
-          label: '璁惧鎴栧崱鍙e浗鏍囩紪鐮�',
-          align: 'center',
-          prop: 'externalIndexCode',
+          "label": "瑙g爜鐘舵�佺爜",
+          "align": "center",
+          "prop": "decodingCode"
         },
         {
-          label: '璁惧鎴栧崱鍙e悕绉�',
-          align: 'center',
-          prop: 'deviceName',
+          "label": "璁惧id",
+          "align": "center",
+          "prop": "deviceId",
+          "width": 250
         },
         {
-          label: '缁勭粐缂栧彿',
-          align: 'center',
-          prop: 'orgCode',
+          "label": "璁惧鍚嶇О",
+          "align": "center",
+          "prop": "deviceName",
+          "width": 250
         },
         {
-          label: '鎶撴媿鏁版嵁閲�',
-          align: 'center',
-          prop: 'dataCount',
+          "label": "icmp寤惰繜",
+          "align": "center",
+          "prop": "icmpDelay"
         },
         {
-          label: '闈炰粖鏃ユ姄鎷嶉噺',
-          align: 'center',
-          prop: 'noTodayCount',
+          "label": "icmp鐘舵��",
+          "align": "center",
+          "prop": "icmpStatusText"
         },
         {
-          label: '鍛ㄥ钩鍧囨姄鎷嶉噺',
-          align: 'center',
-          prop: 'weekCompareCount',
+          "label": "鏈�杩慽cmp鏃堕棿",
+          "align": "center",
+          "prop": "icmpTime",
+          "format": "yyyy-MM-dd HH:mm:ss",
+          "width": 200
         },
         {
-          label: '鎸佺画鏃犳暟鎹ぉ鏁�',
-          align: 'center',
-          prop: 'continueNoDataDays',
+          "label": "鍏抽敭甯ф椂寤�",
+          "align": "center",
+          "prop": "ifmDelay"
         },
         {
-          label: '鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�',
-          align: 'center',
-          prop: 'resultTypeText',
+          "label": "ip鍦板潃",
+          "align": "center",
+          "prop": "ipAddr",
+          "width": 150
         },
+        {
+          "label": "鏈�杩戞寔缁绾挎晠闅滄鏁�",
+          "align": "center",
+          "prop": "olErrEverduring",
+          "width": 200
+        },
+        {
+          "label": "鏈�杩戞寔缁绾挎晠闅滄椂闂�",
+          "align": "center",
+          "prop": "olErrEverduringFirstTime",
+          "format": "yyyy-MM-dd HH:mm:ss",
+          "width": 200
+        },
+        {
+          "label": "绱绂荤嚎鏁呴殰娆℃暟",
+          "align": "center",
+          "prop": "olErrTotal",
+          width: 180,
+        },
+        {
+          "label": "绱绂荤嚎鏁呴殰鐜�",
+          "align": "center",
+          "prop": "olErrTotalRate",
+          "width": 180
+        },
+        {
+          "label": "宸℃娆℃暟",
+          "align": "center",
+          "prop": "olTotal"
+        },
+        {
+          "label": "sip鐘舵�佺爜",
+          "align": "center",
+          "prop": "sipCode"
+        },
+        {
+          "label": "淇′护鏃跺欢",
+          "align": "center",
+          "prop": "sipDelay"
+        },
+        {
+          "label": "鍦ㄧ嚎鐘舵��",
+          "align": "center",
+          "prop": "statusText"
+        },
+        {
+          "label": "鐪佸巺鏍囩",
+          "align": "center",
+          "prop": "tagStr",
+          "width": 200
+        },
+        {
+          "label": "鐪佸巺鏍囩鍒楄〃",
+          "align": "center",
+          "prop": "tags",
+          "width": 200
+        },
+        {
+          "label": "瑙嗛娴佹椂寤�",
+          "align": "center",
+          "prop": "videoDelay"
+        },
+        {
+          "label": "瑙嗛璐ㄩ噺妫�娴嬫椂闂�",
+          "align": "center",
+          "prop": "vqdTime",
+          "format": "yyyy-MM-dd HH:mm:ss",
+          "width": 200
+        }
       ],
       card: [
         {
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: '璁惧鎬绘暟'
             },
-            {
-              label: '鏈仈缃�'
-            },
-            {
-              label: '瑙嗛鐩戞帶'
-            },
-            {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
+            // {
+            //   label: '宸茶仈缃�'
+            // },
+            // {
+            //   label: '鏈仈缃�'
+            // },
+            // {
+            //   label: '瑙嗛鐩戞帶'
+            // },
+            // {
+            //   label: '杞﹁締璇嗗埆'
+            // },
+            // {
+            //   label: '浜哄憳璇嗗埆'
+            // },
           ]
         }
-      ]
+      ],
+      showList: [
+        { key: 0, label: `瑙g爜鐘舵�佺爜`, visible: false },
+        { key: 1, label: `sip鐘舵�佺爜`, visible: false },
+        { key: 2, label: `淇′护鏃跺欢`, visible: false },
+        { key: 3, label: `icmp寤惰繜`, visible: false },
+        { key: 3, label: `鍏抽敭甯ф椂寤禶, visible: false },
+        { key: 3, label: `鏈�杩戞寔缁绾挎晠闅滄椂闂碻, visible: false },
+        { key: 3, label: `瑙嗛娴佹椂寤禶, visible: false },
+        { key: 3, label: `宸℃娆℃暟`, visible: false },
+        { key: 3, label: `鐪佸巺鏍囩`, visible: false },
+        { key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
+      ],
     },
     {
       title: "瑙嗛鍥惧儚璐ㄩ噺妫�娴嬫姤鍛�",
@@ -2364,27 +2566,32 @@
         {
           "label": "缁勭粐缂栧彿",
           "align": "center",
-          "prop": "orgCode"
+          "prop": "orgCode",
+          width: 100,
         },
         {
           "label": "鎶撴媿鏁版嵁閲�",
           "align": "center",
-          "prop": "dataCount"
+          "prop": "dataCount",
+          width: 100,
         },
         {
           "label": "闈炰粖鏃ユ姄鎷嶉噺",
           "align": "center",
-          "prop": "noTodayCount"
+          "prop": "noTodayCount",
+          width: 100,
         },
         {
           "label": "鍛ㄥ钩鍧囨姄鎷嶉噺",
           "align": "center",
-          "prop": "weekCompareCount"
+          "prop": "weekCompareCount",
+          width: 120,
         },
         {
           "label": "鎸佺画鏃犳暟鎹ぉ鏁�",
           "align": "center",
-          "prop": "continueNoDataDays"
+          "prop": "continueNoDataDays",
+          width: 120,
         },
         {
           "label": "鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�",
@@ -2450,12 +2657,14 @@
         {
           "label": "鎶撴媿鏁版嵁閲�",
           "align": "center",
-          "prop": "dataCount"
+          "prop": "dataCount",
+          width: 100
         },
         {
           "label": "闈炰粖鏃ユ姄鎷嶉噺",
           "align": "center",
-          "prop": "noTodayCount"
+          "prop": "noTodayCount",
+          width: 110
         },
         {
           "label": "鍛ㄥ钩鍧囨姄鎷嶉噺",
@@ -2481,16 +2690,7 @@
           icon: 'el-icon-truck',
           dataList: [
             {
-              label: '姝e父'
-            },
-            {
-              label: '鏃犳暟鎹�'
-            },
-            {
-              label: '鏁版嵁绐侀檷'
-            },
-            {
-              label: '鏁版嵁閲忓皯'
+              label: '璁惧鎬绘暟'
             },
           ]
         }
@@ -2501,201 +2701,328 @@
       index: 'device_directory_consistent',
       columns: [
         {
-          "label": "璁惧缂栫爜",
+          "label": "琛屾斂缂栫爜",
           "align": "center",
-          "prop": "sbbm",
-          "width": 220
+          "prop": "civilCode.value",
+          "width": 100
         },
         {
-          "label": "璁惧鍚嶇О",
+          "label": "灞曠ず鍊�",
           "align": "center",
-          "prop": "sbmc",
-          "width": 250
+          "prop": "civilCode.showValue",
+          "width": 100
         },
         {
-          "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
+          "label": "鏄惁閿欒",
           "align": "center",
-          "prop": "sxjcjqy",
+          "prop": "civilCode.error"
+        },
+        {
+          "label": "閿欒淇℃伅",
+          "align": "center",
+          "prop": "civilCode.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "闆嗘垚璁惧灞曠ず鍊�",
+          "align": "center",
+          "prop": "integrated_device.showValue",
           "width": 120
         },
         {
-          "label": "鐩戞帶鐐逛綅绫诲瀷",
+          "label": "闆嗘垚璁惧鏄惁閿欒",
           "align": "center",
-          "prop": "jkdwlx",
+          "prop": "integrated_device.error",
+          "width": 130
+        },
+        {
+          "label": "闆嗘垚璁惧閿欒淇℃伅",
+          "align": "center",
+          "prop": "integrated_device.errorMessage",
           "width": 150
         },
         {
-          "label": "IPV4鍦板潃",
+          "label": "IP鍦板潃灞曠ず鍊�",
           "align": "center",
-          "prop": "ip",
+          "prop": "ip.showValue",
           "width": 150
         },
         {
-          "label": "缁忓害",
+          "label": "IP鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "jd",
-          "width": 100
-        },
-        {
-          "label": "绾害",
-          "align": "center",
-          "prop": "wd",
-          "width": 100
-        },
-        {
-          "label": "鎽勫儚鏈哄姛鑳界被鍨�",
-          "align": "center",
-          "prop": "sxjgnlx",
+          "prop": "ip.value",
           "width": 150
         },
         {
-          "label": "MAC鍦板潃",
+          "label": "IP鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "macdz",
-          "width": 150
-        },
-        {
-          "label": "璁惧鐘舵��",
-          "align": "center",
-          "prop": "sbzt",
-          "width": 100
-        },
-        {
-          "label": "璁惧鍘傚晢",
-          "align": "center",
-          "prop": "sbcs",
-          "width": 150
-        },
-        {
-          "label": "琛屾斂鍖哄煙",
-          "align": "center",
-          "prop": "xzqy",
-          "width": 150
-        },
-        {
-          "label": "璁惧鍨嬪彿",
-          "align": "center",
-          "prop": "sbxh",
+          "prop": "ip.error",
           "width": 120
         },
         {
-          "label": "鐐逛綅淇楃О",
+          "label": "IP鍦板潃閿欒淇℃伅",
           "align": "center",
-          "prop": "dwcs",
-          "width": 250
+          "prop": "ip.errorMessage",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈虹被鍨�",
+          "label": "鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjlx",
+          "prop": "jkdwlx.showValue",
           "width": 100
         },
         {
-          "label": "琛ュ厜灞炴��",
+          "label": "鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊�",
           "align": "center",
-          "prop": "bgsx",
+          "prop": "jkdwlx.value",
           "width": 100
         },
         {
-          "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
+          "label": "鐩戞帶鐐逛綅绫诲瀷鏄惁鏈夎",
           "align": "center",
-          "prop": "sxjbmgs",
-          "width": 170
+          "prop": "jkdwlx.error",
+          "width": 150
         },
         {
-          "label": "瀹夎鍦板潃",
+          "label": "鐩戞帶鐐逛綅绫诲瀷閿欒淇℃伅",
           "align": "center",
-          "prop": "azdz",
-          "width": 170
+          "prop": "jkdwlx.errorMessage",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈轰綅缃被鍨�",
+          "label": "绾害灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjwzlx",
-          "width": 170
+          "prop": "latitude.showValue",
+          "width": 100
         },
         {
-          "label": "鐩戣鏂逛綅",
+          "label": "绾害瀹為檯鍊�",
           "align": "center",
-          "prop": "jsfw",
+          "prop": "latitude.value",
+          "width": 100
+        },
+        {
+          "label": "绾害鏄惁鏈夎",
+          "align": "center",
+          "prop": "latitude.error",
           "width": 120
         },
         {
-          "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
+          "label": "绾害閿欒淇℃伅",
           "align": "center",
-          "prop": "sxjcjyszp",
+          "prop": "latitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "缁忓害灞曠ず鍊�",
+          "align": "center",
+          "prop": "longitude.showValue",
+          "width": 100
+        },
+        {
+          "label": "缁忓害瀹為檯鍊�",
+          "align": "center",
+          "prop": "longitude.value",
+          "width": 100
+        },
+        {
+          "label": "缁忓害鏄惁鏈夎",
+          "align": "center",
+          "prop": "longitude.error",
+          "width": 100
+        },
+        {
+          "label": "缁忓害閿欒淇℃伅",
+          "align": "center",
+          "prop": "longitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "mac鍦板潃灞曠ず鍊�",
+          "align": "center",
+          "prop": "macdz.showValue",
           "width": 190
         },
         {
-          "label": "鑱旂綉灞炴��",
+          "label": "mac鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "lwsx",
-          "width": 120
-        },
-        {
-          "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
-          "align": "center",
-          "prop": "ssxqgafg",
-          "width": 170
-        },
-        {
-          "label": "瀹夎鏃堕棿",
-          "align": "center",
-          "prop": "azsj",
-          "width": 170
-        },
-        {
-          "label": "绠$悊鍗曚綅",
-          "align": "center",
-          "prop": "gldw",
-          "width": 170
-        },
-        {
-          "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡",
-          "align": "center",
-          "prop": "gldwlxfs",
+          "prop": "macdz.value",
           "width": 190
         },
         {
-          "label": "褰曞儚淇濆瓨澶╂暟",
+          "label": "mac鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "lxbcts",
+          "prop": "macdz.error",
+          "width": 130
+        },
+        {
+          "label": "mac鍦板潃閿欒淇℃伅",
+          "align": "center",
+          "prop": "macdz.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧鍚嶅睍绀哄��",
+          "align": "center",
+          "prop": "name.showValue",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶅疄闄呭��",
+          "align": "center",
+          "prop": "name.value",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶆槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "name.error",
+          "width": 120
+        },
+        {
+          "label": "璁惧鍚嶉敊璇俊鎭�",
+          "align": "center",
+          "prop": "name.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧鐘舵�佸睍绀哄��",
+          "align": "center",
+          "prop": "sbzt.showValue",
+          "width": 100
+        },
+        {
+          "label": "璁惧鐘舵�佸疄闄呭��",
+          "align": "center",
+          "prop": "sbzt.value",
+          "width": 120
+        },
+        {
+          "label": "璁惧鐘舵�佹槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sbzt.error",
+          "width": 130
+        },
+        {
+          "label": "璁惧鐘舵�侀敊璇俊鎭�",
+          "align": "center",
+          "prop": "sbzt.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜灞曠ず鍊�",
+          "align": "center",
+          "prop": "serialNumber.showValue",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜瀹為檯鍊�",
+          "align": "center",
+          "prop": "serialNumber.value",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜鏄惁鏈夎",
+          "align": "center",
+          "prop": "serialNumber.error",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜閿欒淇℃伅",
+          "align": "center",
+          "prop": "serialNumber.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄��",
+          "align": "center",
+          "prop": "sxjcjqy.showValue",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭��",
+          "align": "center",
+          "prop": "sxjcjqy.value",
+          "width": 100
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熸槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjcjqy.error",
           "width": 170
         },
         {
-          "label": "鎵�灞為儴闂�/琛屼笟",
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熼敊璇俊鎭�",
           "align": "center",
-          "prop": "ssbmhy",
+          "prop": "sxjcjqy.errorMessage",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄��",
+          "align": "center",
+          "prop": "sxjgnlx.showValue",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭��",
+          "align": "center",
+          "prop": "sxjgnlx.value",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬫槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjgnlx.error",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬮敊璇俊鎭�",
+          "align": "center",
+          "prop": "sxjgnlx.errorMessage",
           "width": 170
         }
       ],
       card: [
         {
-          icon: 'el-icon-truck',
+          icon: 'el-icon-wind-power',
           dataList: [
-
+            {
+              label: 'IP寮傚父鏁�'
+            },
+            {
+              label: 'MAC鍦板潃寮傚父鏁�'
+            },
+            {
+              label: '缁忓害寮傚父鏁�'
+            },
+            {
+              label: '绾害寮傚父鏁�'
+            },
           ]
         }
       ],
       showList: [
-        { key: 0, label: `璁惧鍘傚晢`, visible: false },
-        { key: 1, label: `琛屾斂鍖哄煙`, visible: false },
-        { key: 2, label: `璁惧鍨嬪彿`, visible: false },
-        { key: 3, label: `鐐逛綅淇楃О`, visible: false },
-        { key: 4, label: `鎽勫儚鏈虹被鍨媊, visible: false },
-        { key: 5, label: `琛ュ厜灞炴�, visible: false },
-        { key: 6, label: `鎽勫儚鏈虹紪鐮佹牸寮廯, visible: false },
-        { key: 7, label: `瀹夎鍦板潃`, visible: false },
-        { key: 8, label: `鎽勫儚鏈轰綅缃被鍨媊, visible: false },
-        { key: 9, label: `鐩戣鏂逛綅`, visible: false },
-        { key: 10, label: `鎽勫儚鏈哄満鏅璁剧収鐗嘦RL`, visible: false },
-        { key: 11, label: `鑱旂綉灞炴�, visible: false },
-        { key: 12, label: `鎵�灞炶緰鍖哄叕瀹夋満鍏砢, visible: false },
-        { key: 13, label: `瀹夎鏃堕棿`, visible: false },
-        { key: 14, label: `绠$悊鍗曚綅`, visible: false },
-        { key: 15, label: `褰曞儚淇濆瓨澶╂暟`, visible: false },
-        { key: 16, label: `鎵�灞為儴闂�/琛屼笟`, visible: false },
-        { key: 16, label: `绠$悊鍗曚綅鑱旂郴鏂瑰紡`, visible: false },
+        { key: 0, label: `闆嗘垚璁惧灞曠ず鍊糮, visible: false },
+        { key: 1, label: `IP鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 2, label: `IP鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 3, label: `鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊糮, visible: false },
+        { key: 4, label: `鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊糮, visible: false },
+        { key: 5, label: `绾害灞曠ず鍊糮, visible: false },
+        { key: 6, label: `绾害瀹為檯鍊糮, visible: false },
+        { key: 7, label: `缁忓害灞曠ず鍊糮, visible: false },
+        { key: 8, label: `缁忓害瀹為檯鍊糮, visible: false },
+        { key: 9, label: `mac鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 10, label: `mac鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 11, label: `璁惧鍚嶅睍绀哄�糮, visible: false },
+        { key: 12, label: `璁惧鍚嶅疄闄呭�糮, visible: false },
+        { key: 13, label: `璁惧鐘舵�佸睍绀哄�糮, visible: false },
+        { key: 14, label: `璁惧鐘舵�佸疄闄呭�糮, visible: false },
+        { key: 15, label: `璁惧缂栫爜灞曠ず鍊糮, visible: false },
+        { key: 16, label: `璁惧缂栫爜瀹為檯鍊糮, visible: false },
+        { key: 17, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄�糮, visible: false },
+        { key: 18, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭�糮, visible: false },
+        { key: 19, label: `鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄�糮, visible: false },
+        { key: 20, label: `鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭�糮, visible: false }
       ],
     },
     {
@@ -3648,37 +3975,42 @@
           label: '璁惧鎴栧崱鍙e悕绉�',
           align: 'center',
           prop: 'deviceName',
-          width: 220,
         },
         {
           label: '缁勭粐缂栧彿',
           align: 'center',
           prop: 'orgCode',
+          width: 100,
         },
         {
           label: '鎶撴媿鏁版嵁閲�',
           align: 'center',
           prop: 'dataCount',
+          width: 120,
         },
         {
           label: '闈炰粖鏃ユ姄鎷嶉噺',
           align: 'center',
           prop: 'noTodayCount',
+          width: 120,
         },
         {
           label: '鍛ㄥ钩鍧囨姄鎷嶉噺',
           align: 'center',
           prop: 'weekCompareCount',
+          width: 120,
         },
         {
           label: '鎸佺画鏃犳暟鎹ぉ鏁�',
           align: 'center',
           prop: 'continueNoDataDays',
+          width: 120,
         },
         {
           label: '鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�',
           align: 'center',
           prop: 'resultTypeText',
+          width: 150,
         },
       ],
       card: [
@@ -3706,171 +4038,284 @@
       index: 'device_directory_consistent',
       columns: [
         {
-          "label": "璁惧缂栫爜",
+          "label": "琛屾斂缂栫爜",
           "align": "center",
-          "prop": "sbbm",
-          "width": 220
+          "prop": "civilCode.value",
+          "width": 100
         },
         {
-          "label": "璁惧鍚嶇О",
+          "label": "灞曠ず鍊�",
           "align": "center",
-          "prop": "sbmc",
-          "width": 250
+          "prop": "civilCode.showValue",
+          "width": 100
         },
         {
-          "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
+          "label": "鏄惁閿欒",
           "align": "center",
-          "prop": "sxjcjqy",
+          "prop": "civilCode.error"
+        },
+        {
+          "label": "閿欒淇℃伅",
+          "align": "center",
+          "prop": "civilCode.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "闆嗘垚璁惧灞曠ず鍊�",
+          "align": "center",
+          "prop": "integrated_device.showValue",
           "width": 120
         },
         {
-          "label": "鐩戞帶鐐逛綅绫诲瀷",
+          "label": "闆嗘垚璁惧鏄惁閿欒",
           "align": "center",
-          "prop": "jkdwlx",
+          "prop": "integrated_device.error",
+          "width": 130
+        },
+        {
+          "label": "闆嗘垚璁惧閿欒淇℃伅",
+          "align": "center",
+          "prop": "integrated_device.errorMessage",
           "width": 150
         },
         {
-          "label": "IPV4鍦板潃",
+          "label": "IP鍦板潃灞曠ず鍊�",
           "align": "center",
-          "prop": "ip",
+          "prop": "ip.showValue",
           "width": 150
         },
         {
-          "label": "缁忓害",
+          "label": "IP鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "jd",
-          "width": 100
-        },
-        {
-          "label": "绾害",
-          "align": "center",
-          "prop": "wd",
-          "width": 100
-        },
-        {
-          "label": "鎽勫儚鏈哄姛鑳界被鍨�",
-          "align": "center",
-          "prop": "sxjgnlx",
+          "prop": "ip.value",
           "width": 150
         },
         {
-          "label": "MAC鍦板潃",
+          "label": "IP鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "macdz",
-          "width": 150
-        },
-        {
-          "label": "璁惧鐘舵��",
-          "align": "center",
-          "prop": "sbzt",
-          "width": 100
-        },
-        {
-          "label": "璁惧鍘傚晢",
-          "align": "center",
-          "prop": "sbcs",
-          "width": 150
-        },
-        {
-          "label": "琛屾斂鍖哄煙",
-          "align": "center",
-          "prop": "xzqy",
-          "width": 150
-        },
-        {
-          "label": "璁惧鍨嬪彿",
-          "align": "center",
-          "prop": "sbxh",
+          "prop": "ip.error",
           "width": 120
         },
         {
-          "label": "鐐逛綅淇楃О",
+          "label": "IP鍦板潃閿欒淇℃伅",
           "align": "center",
-          "prop": "dwcs",
-          "width": 250
+          "prop": "ip.errorMessage",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈虹被鍨�",
+          "label": "鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjlx",
+          "prop": "jkdwlx.showValue",
           "width": 100
         },
         {
-          "label": "琛ュ厜灞炴��",
+          "label": "鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊�",
           "align": "center",
-          "prop": "bgsx",
+          "prop": "jkdwlx.value",
           "width": 100
         },
         {
-          "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
+          "label": "鐩戞帶鐐逛綅绫诲瀷鏄惁鏈夎",
           "align": "center",
-          "prop": "sxjbmgs",
-          "width": 170
+          "prop": "jkdwlx.error",
+          "width": 150
         },
         {
-          "label": "瀹夎鍦板潃",
+          "label": "鐩戞帶鐐逛綅绫诲瀷閿欒淇℃伅",
           "align": "center",
-          "prop": "azdz",
-          "width": 170
+          "prop": "jkdwlx.errorMessage",
+          "width": 150
         },
         {
-          "label": "鎽勫儚鏈轰綅缃被鍨�",
+          "label": "绾害灞曠ず鍊�",
           "align": "center",
-          "prop": "sxjwzlx",
-          "width": 170
+          "prop": "latitude.showValue",
+          "width": 100
         },
         {
-          "label": "鐩戣鏂逛綅",
+          "label": "绾害瀹為檯鍊�",
           "align": "center",
-          "prop": "jsfw",
+          "prop": "latitude.value",
+          "width": 100
+        },
+        {
+          "label": "绾害鏄惁鏈夎",
+          "align": "center",
+          "prop": "latitude.error",
           "width": 120
         },
         {
-          "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
+          "label": "绾害閿欒淇℃伅",
           "align": "center",
-          "prop": "sxjcjyszp",
+          "prop": "latitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "缁忓害灞曠ず鍊�",
+          "align": "center",
+          "prop": "longitude.showValue",
+          "width": 100
+        },
+        {
+          "label": "缁忓害瀹為檯鍊�",
+          "align": "center",
+          "prop": "longitude.value",
+          "width": 100
+        },
+        {
+          "label": "缁忓害鏄惁鏈夎",
+          "align": "center",
+          "prop": "longitude.error",
+          "width": 100
+        },
+        {
+          "label": "缁忓害閿欒淇℃伅",
+          "align": "center",
+          "prop": "longitude.errorMessage",
+          "width": 100
+        },
+        {
+          "label": "mac鍦板潃灞曠ず鍊�",
+          "align": "center",
+          "prop": "macdz.showValue",
           "width": 190
         },
         {
-          "label": "鑱旂綉灞炴��",
+          "label": "mac鍦板潃瀹為檯鍊�",
           "align": "center",
-          "prop": "lwsx",
-          "width": 120
-        },
-        {
-          "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
-          "align": "center",
-          "prop": "ssxqgafg",
-          "width": 170
-        },
-        {
-          "label": "瀹夎鏃堕棿",
-          "align": "center",
-          "prop": "azsj",
-          "width": 170
-        },
-        {
-          "label": "绠$悊鍗曚綅",
-          "align": "center",
-          "prop": "gldw",
-          "width": 170
-        },
-        {
-          "label": "绠$悊鍗曚綅鑱旂郴鏂瑰紡",
-          "align": "center",
-          "prop": "gldwlxfs",
+          "prop": "macdz.value",
           "width": 190
         },
         {
-          "label": "褰曞儚淇濆瓨澶╂暟",
+          "label": "mac鍦板潃鏄惁鏈夎",
           "align": "center",
-          "prop": "lxbcts",
+          "prop": "macdz.error",
+          "width": 130
+        },
+        {
+          "label": "mac鍦板潃閿欒淇℃伅",
+          "align": "center",
+          "prop": "macdz.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧鍚嶅睍绀哄��",
+          "align": "center",
+          "prop": "name.showValue",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶅疄闄呭��",
+          "align": "center",
+          "prop": "name.value",
+          "width": 250
+        },
+        {
+          "label": "璁惧鍚嶆槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "name.error",
+          "width": 120
+        },
+        {
+          "label": "璁惧鍚嶉敊璇俊鎭�",
+          "align": "center",
+          "prop": "name.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧鐘舵�佸睍绀哄��",
+          "align": "center",
+          "prop": "sbzt.showValue",
+          "width": 100
+        },
+        {
+          "label": "璁惧鐘舵�佸疄闄呭��",
+          "align": "center",
+          "prop": "sbzt.value",
+          "width": 120
+        },
+        {
+          "label": "璁惧鐘舵�佹槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sbzt.error",
+          "width": 130
+        },
+        {
+          "label": "璁惧鐘舵�侀敊璇俊鎭�",
+          "align": "center",
+          "prop": "sbzt.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜灞曠ず鍊�",
+          "align": "center",
+          "prop": "serialNumber.showValue",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜瀹為檯鍊�",
+          "align": "center",
+          "prop": "serialNumber.value",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜鏄惁鏈夎",
+          "align": "center",
+          "prop": "serialNumber.error",
+          "width": 150
+        },
+        {
+          "label": "璁惧缂栫爜閿欒淇℃伅",
+          "align": "center",
+          "prop": "serialNumber.errorMessage",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄��",
+          "align": "center",
+          "prop": "sxjcjqy.showValue",
+          "width": 150
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭��",
+          "align": "center",
+          "prop": "sxjcjqy.value",
+          "width": 100
+        },
+        {
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熸槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjcjqy.error",
           "width": 170
         },
         {
-          "label": "鎵�灞為儴闂�/琛屼笟",
+          "label": "鎽勫儚鏈洪噰闆嗗尯鍩熼敊璇俊鎭�",
           "align": "center",
-          "prop": "ssbmhy",
+          "prop": "sxjcjqy.errorMessage",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄��",
+          "align": "center",
+          "prop": "sxjgnlx.showValue",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭��",
+          "align": "center",
+          "prop": "sxjgnlx.value",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬫槸鍚︽湁璇�",
+          "align": "center",
+          "prop": "sxjgnlx.error",
+          "width": 170
+        },
+        {
+          "label": "鎽勫儚鏈哄姛鑳界被鍨嬮敊璇俊鎭�",
+          "align": "center",
+          "prop": "sxjgnlx.errorMessage",
           "width": 170
         }
       ],
@@ -3878,29 +4323,43 @@
         {
           icon: 'el-icon-truck',
           dataList: [
-
+            {
+              label: 'IP寮傚父鏁�'
+            },
+            {
+              label: 'MAC鍦板潃寮傚父鏁�'
+            },
+            {
+              label: '缁忓害寮傚父鏁�'
+            },
+            {
+              label: '绾害寮傚父鏁�'
+            },
           ]
         }
       ],
       showList: [
-        { key: 0, label: `璁惧鍘傚晢`, visible: false },
-        { key: 1, label: `琛屾斂鍖哄煙`, visible: false },
-        { key: 2, label: `璁惧鍨嬪彿`, visible: false },
-        { key: 3, label: `鐐逛綅淇楃О`, visible: false },
-        { key: 4, label: `鎽勫儚鏈虹被鍨媊, visible: false },
-        { key: 5, label: `琛ュ厜灞炴�, visible: false },
-        { key: 6, label: `鎽勫儚鏈虹紪鐮佹牸寮廯, visible: false },
-        { key: 7, label: `瀹夎鍦板潃`, visible: false },
-        { key: 8, label: `鎽勫儚鏈轰綅缃被鍨媊, visible: false },
-        { key: 9, label: `鐩戣鏂逛綅`, visible: false },
-        { key: 10, label: `鎽勫儚鏈哄満鏅璁剧収鐗嘦RL`, visible: false },
-        { key: 11, label: `鑱旂綉灞炴�, visible: false },
-        { key: 12, label: `鎵�灞炶緰鍖哄叕瀹夋満鍏砢, visible: false },
-        { key: 13, label: `瀹夎鏃堕棿`, visible: false },
-        { key: 14, label: `绠$悊鍗曚綅`, visible: false },
-        { key: 15, label: `褰曞儚淇濆瓨澶╂暟`, visible: false },
-        { key: 16, label: `鎵�灞為儴闂�/琛屼笟`, visible: false },
-        { key: 16, label: `绠$悊鍗曚綅鑱旂郴鏂瑰紡`, visible: false },
+        { key: 0, label: `闆嗘垚璁惧灞曠ず鍊糮, visible: false },
+        { key: 1, label: `IP鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 2, label: `IP鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 3, label: `鐩戞帶鐐逛綅绫诲瀷灞曠ず鍊糮, visible: false },
+        { key: 4, label: `鐩戞帶鐐逛綅绫诲瀷瀹為檯鍊糮, visible: false },
+        { key: 5, label: `绾害灞曠ず鍊糮, visible: false },
+        { key: 6, label: `绾害瀹為檯鍊糮, visible: false },
+        { key: 7, label: `缁忓害灞曠ず鍊糮, visible: false },
+        { key: 8, label: `缁忓害瀹為檯鍊糮, visible: false },
+        { key: 9, label: `mac鍦板潃灞曠ず鍊糮, visible: false },
+        { key: 10, label: `mac鍦板潃瀹為檯鍊糮, visible: false },
+        { key: 11, label: `璁惧鍚嶅睍绀哄�糮, visible: false },
+        { key: 12, label: `璁惧鍚嶅疄闄呭�糮, visible: false },
+        { key: 13, label: `璁惧鐘舵�佸睍绀哄�糮, visible: false },
+        { key: 14, label: `璁惧鐘舵�佸疄闄呭�糮, visible: false },
+        { key: 15, label: `璁惧缂栫爜灞曠ず鍊糮, visible: false },
+        { key: 16, label: `璁惧缂栫爜瀹為檯鍊糮, visible: false },
+        { key: 17, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷睍绀哄�糮, visible: false },
+        { key: 18, label: `鎽勫儚鏈洪噰闆嗗尯鍩熷疄闄呭�糮, visible: false },
+        { key: 19, label: `鎽勫儚鏈哄姛鑳界被鍨嬪睍绀哄�糮, visible: false },
+        { key: 20, label: `鎽勫儚鏈哄姛鑳界被鍨嬪疄闄呭�糮, visible: false }
       ],
     },
     {

--
Gitblit v1.8.0