From dcb1f3df891433b71bfbee3ac0dc4ec79f2a734d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 04:15:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/data-manage/data-detail/list.js |  851 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 548 insertions(+), 303 deletions(-)

diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index b2c47c9..d1a8e7b 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -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: '绾害寮傚父鏁�'
+            },
           ]
         }
       ],
@@ -641,19 +656,16 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: 'IP寮傚父鏁�'
             },
             {
-              label: '鏈仈缃�'
+              label: 'MAC鍦板潃寮傚父鏁�'
             },
             {
-              label: '瑙嗛鐩戞帶'
+              label: '缁忓害寮傚父鏁�'
             },
             {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
+              label: '绾害寮傚父鏁�'
             },
           ]
         }
@@ -973,21 +985,17 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: 'IP寮傚父鏁�'
             },
             {
-              label: '鏈仈缃�'
+              label: 'MAC鍦板潃寮傚父鏁�'
             },
             {
-              label: '瑙嗛鐩戞帶'
+              label: '缁忓害寮傚父鏁�'
             },
             {
-              label: '杞﹁締璇嗗埆'
+              label: '绾害寮傚父鏁�'
             },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
           ]
         }
       ],
@@ -1933,20 +1941,23 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: '璁惧鎬绘暟'
             },
-            {
-              label: '鏈仈缃�'
-            },
-            {
-              label: '瑙嗛鐩戞帶'
-            },
-            {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
+            // {
+            //   label: '宸茶仈缃�'
+            // },
+            // {
+            //   label: '鏈仈缃�'
+            // },
+            // {
+            //   label: '瑙嗛鐩戞帶'
+            // },
+            // {
+            //   label: '杞﹁締璇嗗埆'
+            // },
+            // {
+            //   label: '浜鸿劯璇嗗埆'
+            // },
           ]
         }
       ],
@@ -2123,21 +2134,17 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: '鐐逛綅鍚嶇О鏍囨敞姝ｇ‘鏁�'
             },
             {
-              label: '鏈仈缃�'
+              label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
             },
             {
-              label: '瑙嗛鐩戞帶'
+              label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
             },
             {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
+              label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+            }
           ]
         }
       ],
@@ -2225,21 +2232,11 @@
           icon: 'el-icon-wind-power',
           dataList: [
             {
-              label: '宸茶仈缃�'
+              label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
             },
             {
-              label: '鏈仈缃�'
-            },
-            {
-              label: '瑙嗛鐩戞帶'
-            },
-            {
-              label: '杞﹁締璇嗗埆'
-            },
-            {
-              label: '浜哄憳璇嗗埆'
-            },
-
+              label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
+            }
           ]
         }
       ],
@@ -2393,6 +2390,9 @@
         {
           icon: 'el-icon-wind-power',
           dataList: [
+            {
+              label: '璁惧鎬绘暟'
+            },
             // {
             //   label: '宸茶仈缃�'
             // },
@@ -2690,16 +2690,7 @@
           icon: 'el-icon-truck',
           dataList: [
             {
-              label: '姝ｅ父'
-            },
-            {
-              label: '鏃犳暟鎹�'
-            },
-            {
-              label: '鏁版嵁绐侀檷'
-            },
-            {
-              label: '鏁版嵁閲忓皯'
+              label: '璁惧鎬绘暟'
             },
           ]
         }
@@ -2710,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 }
       ],
     },
     {
@@ -3920,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
         }
       ],
@@ -4092,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