From 222a623191c8dbd934a45c5da32c6c6883c8587f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 00:18:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/list.js | 919 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 609 insertions(+), 310 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..813dd29 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,21 @@
{
icon: 'el-icon-wind-power',
dataList: [
+ {
+ label: 'IP寮傚父鏁�'
+ },
+ {
+ label: 'MAC鍦板潃寮傚父鏁�'
+ },
+ {
+ label: '缁忓害寮傚父鏁�'
+ },
+ {
+ label: '绾害寮傚父鏁�'
+ },
+ {
+ label: '鍚堟牸鐜�'
+ },
]
}
],
@@ -641,19 +659,19 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: 'IP寮傚父鏁�'
},
{
- label: '鏈仈缃�'
+ label: 'MAC鍦板潃寮傚父鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: '缁忓害寮傚父鏁�'
},
{
- label: '杞﹁締璇嗗埆'
+ label: '绾害寮傚父鏁�'
},
{
- label: '浜哄憳璇嗗埆'
+ label: '娉ㄥ唽鐜�'
},
]
}
@@ -973,21 +991,20 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: 'IP寮傚父鏁�'
},
{
- label: '鏈仈缃�'
+ label: 'MAC鍦板潃寮傚父鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: '缁忓害寮傚父鏁�'
},
{
- label: '杞﹁締璇嗗埆'
+ label: '绾害寮傚父鏁�'
},
{
- label: '浜哄憳璇嗗埆'
+ label: '鑰冩牳姣�'
},
-
]
}
],
@@ -1147,6 +1164,9 @@
{
label: '璁惧鎬绘暟'
},
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -1295,6 +1315,9 @@
{
label: '璁惧鎬绘暟'
},
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -1384,6 +1407,9 @@
{
label: '寮傚父'
},
+ {
+ label: '鍙敤鐜�'
+ },
]
}
]
@@ -1460,6 +1486,9 @@
},
{
label: '寮傚父'
+ },
+ {
+ label: '鍙敤鐜�'
},
]
}
@@ -1933,19 +1962,10 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: '璁惧鎬绘暟'
},
{
- label: '鏈仈缃�'
- },
- {
- label: '瑙嗛鐩戞帶'
- },
- {
- label: '杞﹁締璇嗗埆'
- },
- {
- label: '浜哄憳璇嗗埆'
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -2036,6 +2056,9 @@
{
label: '寮傚父'
},
+ {
+ label: '鍙敤鐜�'
+ },
]
}
]
@@ -2123,21 +2146,20 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: '鐐逛綅鍚嶇О鏍囨敞姝ｇ‘鏁�'
},
{
- label: '鏈仈缃�'
+ label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
},
{
- label: '杞﹁締璇嗗埆'
+ label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
},
{
- label: '浜哄憳璇嗗埆'
+ label: '鏍囨敞姝ｇ‘鐜�'
},
-
]
}
],
@@ -2225,21 +2247,14 @@
icon: 'el-icon-wind-power',
dataList: [
{
- label: '宸茶仈缃�'
+ label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
},
{
- label: '鏈仈缃�'
+ label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
},
{
- label: '瑙嗛鐩戞帶'
+ label: '鏍℃椂姝ｇ‘鐜�'
},
- {
- label: '杞﹁締璇嗗埆'
- },
- {
- label: '浜哄憳璇嗗埆'
- },
-
]
}
],
@@ -2393,21 +2408,12 @@
{
icon: 'el-icon-wind-power',
dataList: [
- // {
- // label: '宸茶仈缃�'
- // },
- // {
- // label: '鏈仈缃�'
- // },
- // {
- // label: '瑙嗛鐩戞帶'
- // },
- // {
- // label: '杞﹁締璇嗗埆'
- // },
- // {
- // label: '浜哄憳璇嗗埆'
- // },
+ {
+ label: '璁惧鎬绘暟'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -2616,6 +2622,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '绋冲畾鎬�'
+ },
]
}
]
@@ -2690,16 +2699,10 @@
icon: 'el-icon-truck',
dataList: [
{
- label: '姝ｅ父'
+ label: '璁惧鎬绘暟'
},
{
- label: '鏃犳暟鎹�'
- },
- {
- label: '鏁版嵁绐侀檷'
- },
- {
- label: '鏁版嵁閲忓皯'
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -2710,201 +2713,331 @@
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: '绾害寮傚父鏁�'
+ },
+ {
+ 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 }
],
},
{
@@ -2970,6 +3103,9 @@
},
{
label: '绮惧害杩囦綆'
+ },
+ {
+ label: '鍑嗙‘鐜�'
},
]
}
@@ -3074,7 +3210,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '瀹屾暣鎬�'
+ }
]
}
],
@@ -3164,7 +3302,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍑嗙‘鎬�'
+ }
]
}
],
@@ -3425,6 +3565,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍑嗙‘鎬�'
+ },
]
}
],
@@ -3535,7 +3678,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙婃椂鎬�'
+ }
]
}
]
@@ -3621,7 +3766,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙敤鎬�'
+ }
]
}
]
@@ -3743,7 +3890,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙敤鎬�'
+ }
]
}
],
@@ -3833,6 +3982,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '绋冲畾鎬�'
+ },
]
}
]
@@ -3911,6 +4063,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
]
@@ -3920,171 +4075,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 +4360,46 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: 'IP寮傚父鏁�'
+ },
+ {
+ label: 'MAC鍦板潃寮傚父鏁�'
+ },
+ {
+ 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 }
],
},
{
@@ -4185,6 +4470,9 @@
{
label: '绮惧害杩囦綆'
},
+ {
+ label: '鍑嗙‘鐜�'
+ },
]
}
]
@@ -4245,6 +4533,9 @@
},
{
label: '绮惧害杩囦綆'
+ },
+ {
+ label: '鍚堟牸鎬�'
},
]
}
@@ -4472,6 +4763,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍑嗙‘鎬�'
+ },
]
}
],
@@ -4692,6 +4986,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍙婃椂鎬�'
+ },
]
}
],
@@ -4819,7 +5116,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙敤鎬�'
+ }
]
}
],
--
Gitblit v1.8.0