From f8331485341314c3d0613079d4981887a111568c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 24 十月 2024 17:20:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/data-manage/data-detail/list.js | 1175 +++++++++++++++++++++++++--------------------------------
1 files changed, 518 insertions(+), 657 deletions(-)
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index d1a8e7b..30f7f92 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -338,6 +338,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '浠婃棩鍚堟牸鐜�'
+ },
]
}
],
@@ -667,6 +670,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '浠婃棩娉ㄥ唽鐜�'
+ },
]
}
],
@@ -695,7 +701,7 @@
],
},
{
- title: '鑰冩牳妗ｆ姣�',
+ title: '妗ｆ鑰冩牳姣�',
index: 'archives_rate',
columns: [
{
@@ -996,6 +1002,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '浠婃棩鑰冩牳姣�'
+ },
]
}
],
@@ -1028,125 +1037,53 @@
index: 'ministry_site_online',
columns: [
{
- "label": "琛屾斂鍖哄垝缂栫爜",
- "align": "center",
- "prop": "arealayerPath",
- "width": 250
+ label: '鍥芥爣鐮�',
+ align: 'center',
+ prop: 'no',
+ width: 300,
},
{
- "label": "瑙ｇ爜鐘舵�佺爜",
- "align": "center",
- "prop": "decodingCode"
+ label: '璁惧鍚�',
+ align: 'center',
+ prop: 'name',
+ width: 380,
},
{
- "label": "璁惧id",
- "align": "center",
- "prop": "deviceId",
- "width": 250
+ label: 'ip',
+ align: 'center',
+ prop: 'ip',
+ width: 200,
},
{
- "label": "璁惧鍚嶇О",
- "align": "center",
- "prop": "deviceName",
- "width": 250
+ label: '璁惧鐘舵��',
+ align: 'center',
+ prop: 'onlineStr',
+ width: 200,
},
{
- "label": "icmp寤惰繜",
- "align": "center",
- "prop": "icmpDelay"
+ label: '鏈�杩慞ing鐩戞祴鐘舵��',
+ align: 'center',
+ prop: 'pingOnlineStr',
+ width: 200,
},
{
- "label": "icmp鐘舵��",
- "align": "center",
- "prop": "icmpStatusText"
+ label: '褰撴棩鐩戞祴娆℃暟',
+ align: 'center',
+ prop: 'checkCount',
+ width: 200,
},
{
- "label": "鏈�杩慽cmp鏃堕棿",
- "align": "center",
- "prop": "icmpTime",
- "format": "yyyy-MM-dd HH:mm:ss",
- "width": 200
+ label: '褰撴棩绂荤嚎娆℃暟',
+ align: 'center',
+ prop: 'offLineCount',
+ width: 200,
},
{
- "label": "鍏抽敭甯ф椂寤�",
- "align": "center",
- "prop": "ifmDelay"
+ label: '鐩戞祴鏃堕棿',
+ align: 'center',
+ prop: 'mongoCreateTime',
+ width: 200,
},
- {
- "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: [
{
@@ -1154,6 +1091,18 @@
dataList: [
{
label: '璁惧鎬绘暟'
+ },
+ {
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -1170,131 +1119,65 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: "鐐逛綅鍦ㄧ嚎鐜�",
index: 'site_online',
columns: [
{
- "label": "琛屾斂鍖哄垝缂栫爜",
- "align": "center",
- "prop": "arealayerPath",
- "width": 250
+ label: '鍥芥爣鐮�',
+ align: 'center',
+ prop: 'no',
+ width: 300,
},
{
- "label": "瑙ｇ爜鐘舵�佺爜",
- "align": "center",
- "prop": "decodingCode"
+ label: '璁惧鍚�',
+ align: 'center',
+ prop: 'name',
+ width: 380,
},
{
- "label": "璁惧id",
- "align": "center",
- "prop": "deviceId",
- "width": 250
+ label: 'ip',
+ align: 'center',
+ prop: 'ip',
+ width: 200,
},
{
- "label": "璁惧鍚嶇О",
- "align": "center",
- "prop": "deviceName",
- "width": 250
+ label: '璁惧鐘舵��',
+ align: 'center',
+ prop: 'onlineStr',
+ width: 200,
},
{
- "label": "icmp寤惰繜",
- "align": "center",
- "prop": "icmpDelay"
+ label: '鏈�杩慞ing鐩戞祴鐘舵��',
+ align: 'center',
+ prop: 'pingOnlineStr',
+ width: 200,
},
{
- "label": "icmp鐘舵��",
- "align": "center",
- "prop": "icmpStatusText"
+ label: '褰撴棩鐩戞祴娆℃暟',
+ align: 'center',
+ prop: 'checkCount',
+ width: 200,
},
{
- "label": "鏈�杩慽cmp鏃堕棿",
- "align": "center",
- "prop": "icmpTime",
- "format": "yyyy-MM-dd HH:mm:ss",
- "width": 200
+ label: '褰撴棩绂荤嚎娆℃暟',
+ align: 'center',
+ prop: 'offLineCount',
+ width: 200,
},
{
- "label": "鍏抽敭甯ф椂寤�",
- "align": "center",
- "prop": "ifmDelay"
+ label: '鐩戞祴鏃堕棿',
+ align: 'center',
+ prop: 'mongoCreateTime',
+ width: 200,
},
- {
- "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: [
{
@@ -1302,6 +1185,18 @@
dataList: [
{
label: '璁惧鎬绘暟'
+ },
+ {
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -1318,6 +1213,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: "褰曞儚鍙敤鐜�",
@@ -1384,6 +1285,9 @@
icon: 'el-icon-wind-power',
dataList: [
{
+ label: '鎬绘暟'
+ },
+ {
label: '瀹屾暣'
},
{
@@ -1392,9 +1296,18 @@
{
label: '寮傚父'
},
+ {
+ label: '褰曞儚鍙敤鐜�'
+ },
]
}
- ]
+ ],
+ options: [
+ { label: '瀹屾暣',value: 1 },
+ { label: '闂存瓏',value: 0 },
+ { label: '寮傚父',value: -1 },
+ ],
+ optionsName: '褰曞儚鐘舵��',
},
{
title: "閮ㄧ骇宸℃褰曞儚鍙敤鐜�",
@@ -1461,6 +1374,9 @@
icon: 'el-icon-wind-power',
dataList: [
{
+ label: '鎬绘暟'
+ },
+ {
label: '瀹屾暣'
},
{
@@ -1469,9 +1385,18 @@
{
label: '寮傚父'
},
+ {
+ label: '褰曞儚鍙敤鐜�'
+ },
]
}
- ]
+ ],
+ options: [
+ { label: '瀹屾暣',value: 1 },
+ { label: '闂存瓏',value: 0 },
+ { label: '寮傚父',value: -1 },
+ ],
+ optionsName: '褰曞儚鐘舵��',
},
{
title: "鏍囨敞姝ｇ‘鐜�",
@@ -1816,125 +1741,53 @@
index: 'key_site_online',
columns: [
{
- "label": "琛屾斂鍖哄垝缂栫爜",
- "align": "center",
- "prop": "arealayerPath",
- "width": 250
+ label: '鍥芥爣鐮�',
+ align: 'center',
+ prop: 'no',
+ width: 300,
},
{
- "label": "瑙ｇ爜鐘舵�佺爜",
- "align": "center",
- "prop": "decodingCode"
+ label: '璁惧鍚�',
+ align: 'center',
+ prop: 'name',
+ width: 380,
},
{
- "label": "璁惧id",
- "align": "center",
- "prop": "deviceId",
- "width": 250
+ label: 'ip',
+ align: 'center',
+ prop: 'ip',
+ width: 200,
},
{
- "label": "璁惧鍚嶇О",
- "align": "center",
- "prop": "deviceName",
- "width": 250
+ label: '璁惧鐘舵��',
+ align: 'center',
+ prop: 'onlineStr',
+ width: 200,
},
{
- "label": "icmp寤惰繜",
- "align": "center",
- "prop": "icmpDelay"
+ label: '鏈�杩慞ing鐩戞祴鐘舵��',
+ align: 'center',
+ prop: 'pingOnlineStr',
+ width: 200,
},
{
- "label": "icmp鐘舵��",
- "align": "center",
- "prop": "icmpStatusText"
+ label: '褰撴棩鐩戞祴娆℃暟',
+ align: 'center',
+ prop: 'checkCount',
+ width: 200,
},
{
- "label": "鏈�杩慽cmp鏃堕棿",
- "align": "center",
- "prop": "icmpTime",
- "format": "yyyy-MM-dd HH:mm:ss",
- "width": 200
+ label: '褰撴棩绂荤嚎娆℃暟',
+ align: 'center',
+ prop: 'offLineCount',
+ width: 200,
},
{
- "label": "鍏抽敭甯ф椂寤�",
- "align": "center",
- "prop": "ifmDelay"
+ label: '鐩戞祴鏃堕棿',
+ align: 'center',
+ prop: 'mongoCreateTime',
+ width: 200,
},
- {
- "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: [
{
@@ -1943,21 +1796,18 @@
{
label: '璁惧鎬绘暟'
},
- // {
- // label: '宸茶仈缃�'
- // },
- // {
- // label: '鏈仈缃�'
- // },
- // {
- // label: '瑙嗛鐩戞帶'
- // },
- // {
- // label: '杞﹁締璇嗗埆'
- // },
- // {
- // label: '浜鸿劯璇嗗埆'
- // },
+ {
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -1973,6 +1823,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: '閲嶇偣鐐逛綅褰曞儚鍙敤鐜�',
@@ -2039,6 +1895,9 @@
icon: 'el-icon-wind-power',
dataList: [
{
+ label: '鎬绘暟'
+ },
+ {
label: '瀹屾暣'
},
{
@@ -2047,9 +1906,18 @@
{
label: '寮傚父'
},
+ {
+ label: '褰曞儚鍙敤鐜�'
+ },
]
}
- ]
+ ],
+ options: [
+ { label: '瀹屾暣',value: 1 },
+ { label: '闂存瓏',value: 0 },
+ { label: '寮傚父',value: -1 },
+ ],
+ optionsName: '褰曞儚鐘舵��',
},
{
title: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�',
@@ -2094,60 +1962,62 @@
{
"label": "osd鏃堕棿鏄惁姝ｇ‘",
"align": "center",
- "prop": "osdTimeCorrect",
+ "prop": "osdTimeCorrectText",
width: 150
},
{
"label": "osd閫氶亾鍚嶆槸鍚︽纭�",
"align": "center",
- "prop": "osdNameCorrect",
+ "prop": "osdNameCorrectText",
width: 150
},
{
"label": "osd鐪佹槸鍚︽纭�",
"align": "center",
- "prop": "osdProvinceCorrect",
+ "prop": "osdProvinceCorrectText",
width: 150
},
{
"label": "osd甯傛槸鍚︽纭�",
"align": "center",
- "prop": "osdCityCorrect",
+ "prop": "osdCityCorrectText",
width: 150
},
{
"label": "osd鍖烘槸鍚︽纭�",
"align": "center",
- "prop": "osdPartCorrect",
+ "prop": "osdPartCorrectText",
width: 150
},
- {
- "label": "osd宸︿笅瑙掓槸鍚︽纭�",
- "align": "center",
- "prop": "osdLbCorrect",
- width: 150
- },
-
],
card: [
{
icon: 'el-icon-wind-power',
dataList: [
{
- label: '鐐逛綅鍚嶇О鏍囨敞姝ｇ‘鏁�'
+ label: '鎬绘暟'
},
{
- label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�'
+ label: 'OSD姝ｇ‘鏁�'
},
{
- label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
+ label: 'OSD閿欒鏁�'
},
{
- label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
- }
+ label: 'OSD鏈煡鏁�'
+ },
+ {
+ label: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�'
+ },
]
}
],
+ options: [
+ { label: '姝ｇ‘',value: 1 },
+ { label: '閿欒',value: -1 },
+ { label: '鏈煡',value: 0 },
+ ],
+ optionsName: 'OSD鐘舵��',
},
{
title: '閲嶇偣鐐逛綅鏍℃椂姝ｇ‘鐜�',
@@ -2192,54 +2062,62 @@
{
"label": "osd鏃堕棿鏄惁姝ｇ‘",
"align": "center",
- "prop": "osdTimeCorrect",
+ "prop": "osdTimeCorrectText",
width: 150
},
{
"label": "osd閫氶亾鍚嶆槸鍚︽纭�",
"align": "center",
- "prop": "osdNameCorrect",
+ "prop": "osdNameCorrectText",
width: 150
},
{
"label": "osd鐪佹槸鍚︽纭�",
"align": "center",
- "prop": "osdProvinceCorrect",
+ "prop": "osdProvinceCorrectText",
width: 150
},
{
"label": "osd甯傛槸鍚︽纭�",
"align": "center",
- "prop": "osdCityCorrect",
+ "prop": "osdCityCorrectText",
width: 150
},
{
"label": "osd鍖烘槸鍚︽纭�",
"align": "center",
- "prop": "osdPartCorrect",
+ "prop": "osdPartCorrectText",
width: 150
},
- {
- "label": "osd宸︿笅瑙掓槸鍚︽纭�",
- "align": "center",
- "prop": "osdLbCorrect",
- width: 150
- },
-
],
card: [
{
icon: 'el-icon-wind-power',
dataList: [
{
- label: 'osd鏃堕棿鏍囨敞姝ｇ‘鏁�'
+ label: '鎬绘暟'
},
{
- label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
- }
+ label: 'OSD姝ｇ‘鏁�'
+ },
+ {
+ label: 'OSD閿欒鏁�'
+ },
+ {
+ label: 'OSD鏈煡鏁�'
+ },
+ {
+ label: '閲嶇偣鐐逛綅鏍囨敞姝ｇ‘鐜�'
+ },
]
}
],
+ options: [
+ { label: '姝ｇ‘',value: 1 },
+ { label: '閿欒',value: -1 },
+ { label: '鏈煡',value: 0 },
+ ],
+ optionsName: 'OSD鏃堕棿',
showList: [
{ key: 0, label: `璁惧鍘傚晢`, visible: false },
{ key: 1, label: `琛屾斂鍖哄煙`, visible: false },
@@ -2266,125 +2144,53 @@
index: 'key_command_image_online',
columns: [
{
- "label": "琛屾斂鍖哄垝缂栫爜",
- "align": "center",
- "prop": "arealayerPath",
- "width": 250
+ label: '鍥芥爣鐮�',
+ align: 'center',
+ prop: 'no',
+ width: 300,
},
{
- "label": "瑙ｇ爜鐘舵�佺爜",
- "align": "center",
- "prop": "decodingCode"
+ label: '璁惧鍚�',
+ align: 'center',
+ prop: 'name',
+ width: 380,
},
{
- "label": "璁惧id",
- "align": "center",
- "prop": "deviceId",
- "width": 250
+ label: 'ip',
+ align: 'center',
+ prop: 'ip',
+ width: 200,
},
{
- "label": "璁惧鍚嶇О",
- "align": "center",
- "prop": "deviceName",
- "width": 250
+ label: '璁惧鐘舵��',
+ align: 'center',
+ prop: 'onlineStr',
+ width: 200,
},
{
- "label": "icmp寤惰繜",
- "align": "center",
- "prop": "icmpDelay"
+ label: '鏈�杩慞ing鐩戞祴鐘舵��',
+ align: 'center',
+ prop: 'pingOnlineStr',
+ width: 200,
},
{
- "label": "icmp鐘舵��",
- "align": "center",
- "prop": "icmpStatusText"
+ label: '褰撴棩鐩戞祴娆℃暟',
+ align: 'center',
+ prop: 'checkCount',
+ width: 200,
},
{
- "label": "鏈�杩慽cmp鏃堕棿",
- "align": "center",
- "prop": "icmpTime",
- "format": "yyyy-MM-dd HH:mm:ss",
- "width": 200
+ label: '褰撴棩绂荤嚎娆℃暟',
+ align: 'center',
+ prop: 'offLineCount',
+ width: 200,
},
{
- "label": "鍏抽敭甯ф椂寤�",
- "align": "center",
- "prop": "ifmDelay"
+ label: '鐩戞祴鏃堕棿',
+ align: 'center',
+ prop: 'mongoCreateTime',
+ width: 200,
},
- {
- "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: [
{
@@ -2393,21 +2199,18 @@
{
label: '璁惧鎬绘暟'
},
- // {
- // label: '宸茶仈缃�'
- // },
- // {
- // label: '鏈仈缃�'
- // },
- // {
- // label: '瑙嗛鐩戞帶'
- // },
- // {
- // label: '杞﹁締璇嗗埆'
- // },
- // {
- // label: '浜哄憳璇嗗埆'
- // },
+ {
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -2423,6 +2226,12 @@
{ key: 3, label: `鐪佸巺鏍囩`, visible: false },
{ key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false },
],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: "瑙嗛鍥惧儚璐ㄩ噺妫�娴嬫姤鍛�",
@@ -2616,6 +2425,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '浠婃棩绋冲畾鎬�'
+ },
]
}
]
@@ -2625,65 +2437,53 @@
index: 'site_online',
columns: [
{
- "label": "鏁版嵁绫诲瀷",
- "align": "center",
- "prop": "dataType",
- width: 100
+ label: '鍥芥爣鐮�',
+ align: 'center',
+ prop: 'no',
+ width: 300,
},
{
- "label": "鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮�",
- "align": "center",
- "prop": "indexCode",
- width: 190
+ label: '璁惧鍚�',
+ align: 'center',
+ prop: 'name',
+ width: 380,
},
{
- "label": "璁惧鎴栧崱鍙ｅ浗鏍囩紪鐮�",
- "align": "center",
- "prop": "externalIndexCode",
- width: 190
+ label: 'ip',
+ align: 'center',
+ prop: 'ip',
+ width: 200,
},
{
- "label": "璁惧鎴栧崱鍙ｅ悕绉�",
- "align": "center",
- "prop": "deviceName",
- width: 200
+ label: '璁惧鐘舵��',
+ align: 'center',
+ prop: 'onlineStr',
+ width: 200,
},
{
- "label": "缁勭粐缂栧彿",
- "align": "center",
- "prop": "orgCode",
- width: 120
+ label: '鏈�杩慞ing鐩戞祴鐘舵��',
+ align: 'center',
+ prop: 'pingOnlineStr',
+ width: 200,
},
{
- "label": "鎶撴媿鏁版嵁閲�",
- "align": "center",
- "prop": "dataCount",
- width: 100
+ label: '褰撴棩鐩戞祴娆℃暟',
+ align: 'center',
+ prop: 'checkCount',
+ width: 200,
},
{
- "label": "闈炰粖鏃ユ姄鎷嶉噺",
- "align": "center",
- "prop": "noTodayCount",
- width: 110
+ label: '褰撴棩绂荤嚎娆℃暟',
+ align: 'center',
+ prop: 'offLineCount',
+ width: 200,
},
{
- "label": "鍛ㄥ钩鍧囨姄鎷嶉噺",
- "align": "center",
- "prop": "weekCompareCount",
- width: 150
+ label: '鐩戞祴鏃堕棿',
+ align: 'center',
+ prop: 'mongoCreateTime',
+ width: 200,
},
- {
- "label": "鎸佺画鏃犳暟鎹ぉ鏁�",
- "align": "center",
- "prop": "continueNoDataDays",
- width: 170
- },
- {
- "label": "鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�",
- "align": "center",
- "prop": "resultType",
- width: 170
- }
],
card: [
{
@@ -2692,9 +2492,27 @@
{
label: '璁惧鎬绘暟'
},
+ {
+ label: '璁惧姝ｅ父鏁�'
+ },
+ {
+ label: '璁惧寮傚父鏁�'
+ },
+ {
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
- ]
+ ],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼',
@@ -2998,6 +2816,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '浠婃棩涓�鑷寸巼'
+ },
]
}
],
@@ -3088,6 +2909,9 @@
},
{
label: '绮惧害杩囦綆'
+ },
+ {
+ label: '浠婃棩鍑嗙‘鐜�'
},
]
}
@@ -3192,7 +3016,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '浠婃棩瀹屾暣鎬�'
+ }
]
}
],
@@ -3282,7 +3108,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '浠婃棩鍑嗙‘鎬�'
+ }
]
}
],
@@ -3543,6 +3371,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '浠婃棩鍑嗙‘鎬�'
+ },
]
}
],
@@ -3653,7 +3484,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '浠婃棩鍙婃椂鎬�'
+ }
]
}
]
@@ -3739,7 +3572,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '浠婃棩鍙敤鎬�'
+ }
]
}
]
@@ -3861,7 +3696,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '浠婃棩鍙敤鎬�'
+ }
]
}
],
@@ -3951,6 +3788,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '浠婃棩绋冲畾鎬�'
+ },
]
}
]
@@ -3960,57 +3800,52 @@
index: 'site_online',
columns: [
{
- label: '鍐呯爜',
+ label: '鍥芥爣鐮�',
align: 'center',
- prop: 'indexCode',
- width: 190,
+ prop: 'no',
+ width: 300,
},
{
- label: '璁惧鎴栧崱鍙ｅ浗鏍囩紪鐮�',
+ label: '璁惧鍚�',
align: 'center',
- prop: 'externalIndexCode',
- width: 190,
+ prop: 'name',
+ width: 380,
},
{
- label: '璁惧鎴栧崱鍙ｅ悕绉�',
+ label: 'ip',
align: 'center',
- prop: 'deviceName',
+ prop: 'ip',
+ width: 200,
},
{
- label: '缁勭粐缂栧彿',
+ label: '璁惧鐘舵��',
align: 'center',
- prop: 'orgCode',
- width: 100,
+ prop: 'onlineStr',
+ width: 200,
},
{
- label: '鎶撴媿鏁版嵁閲�',
+ label: '鏈�杩慞ing鐩戞祴鐘舵��',
align: 'center',
- prop: 'dataCount',
- width: 120,
+ prop: 'pingOnlineStr',
+ width: 200,
},
{
- label: '闈炰粖鏃ユ姄鎷嶉噺',
+ label: '褰撴棩鐩戞祴娆℃暟',
align: 'center',
- prop: 'noTodayCount',
- width: 120,
+ prop: 'checkCount',
+ width: 200,
},
{
- label: '鍛ㄥ钩鍧囨姄鎷嶉噺',
+ label: '褰撴棩绂荤嚎娆℃暟',
align: 'center',
- prop: 'weekCompareCount',
- width: 120,
+ prop: 'offLineCount',
+ width: 200,
},
{
- label: '鎸佺画鏃犳暟鎹ぉ鏁�',
+ label: '鐩戞祴鏃堕棿',
align: 'center',
- prop: 'continueNoDataDays',
- width: 120,
- },
- {
- label: '鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋�',
- align: 'center',
- prop: 'resultTypeText',
- width: 150,
+ prop: 'mongoCreateTime',
+ width: 200,
},
],
card: [
@@ -4018,20 +3853,29 @@
icon: 'el-icon-truck',
dataList: [
{
- label: '姝ｅ父'
+ label: '璁惧鎬绘暟'
},
{
- label: '鏃犳暟鎹�'
+ label: '璁惧姝ｅ父鏁�'
},
{
- label: '鏁版嵁绐侀檷'
+ label: '璁惧寮傚父鏁�'
},
{
- label: '鏁版嵁閲忓皯'
+ label: '鏈煡鏁�'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
- ]
+ ],
+ options: [
+ { label: '绂荤嚎',value: -1 },
+ { label: '鏈煡',value: 0 },
+ { label: '鍦ㄧ嚎',value: 1 },
+ ],
+ optionsName: '鍦ㄧ嚎鎯呭喌',
},
{
title: '鐩綍涓�鑷寸巼',
@@ -4335,6 +4179,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '浠婃棩涓�鑷寸巼'
+ },
]
}
],
@@ -4430,6 +4277,9 @@
{
label: '绮惧害杩囦綆'
},
+ {
+ label: '浠婃棩鍑嗙‘鐜�'
+ },
]
}
]
@@ -4490,6 +4340,9 @@
},
{
label: '绮惧害杩囦綆'
+ },
+ {
+ label: '浠婃棩鍚堟牸鎬�'
},
]
}
@@ -4717,6 +4570,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '浠婃棩鍑嗙‘鎬�'
+ },
]
}
],
@@ -4937,6 +4793,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '浠婃棩鍙婃椂鎬�'
+ },
]
}
],
@@ -5064,7 +4923,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '浠婃棩鍙敤鎬�'
+ }
]
}
],
@@ -5095,153 +4956,153 @@
index: 'view_zc_manage',
columns: [
{
- label: "璁惧缂栫爜",
- align: "center",
- prop: "serialNumber"
+ "label": "璁惧缂栫爜",
+ "align": "center",
+ "prop": "serialNumber"
},
{
- label: "璁惧鍚嶇О",
- align: "center",
- prop: "name"
+ "label": "璁惧鍚嶇О",
+ "align": "center",
+ "prop": "name"
},
{
- label: "鐩戞帶鐐逛綅绫诲瀷",
- align: "center",
- prop: "siteType"
+ "label": "鐩戞帶鐐逛綅绫诲瀷",
+ "align": "center",
+ "prop": "siteType"
},
{
- label: "Mac鍦板潃",
- align: "center",
- prop: "macAddr"
+ "label": "Mac鍦板潃",
+ "align": "center",
+ "prop": "macAddr"
}, {
- label: "IPV4/IPV6",
- align: "center",
- prop: "ip"
+ "label": "IPV4/IPV6",
+ "align": "center",
+ "prop": "ip"
},
{
- label: "鎽勫儚鏈哄姛鑳界被鍨�",
- align: "center",
- prop: "cameraFunType"
+ "label": "鎽勫儚鏈哄姛鑳界被鍨�",
+ "align": "center",
+ "prop": "cameraFunType"
},
{
- label: "缁忓害",
- align: "center",
- prop: "longitude"
+ "label": "缁忓害",
+ "align": "center",
+ "prop": "longitude"
},
{
- label: "绾害",
- align: "center",
- prop: "latitude"
+ "label": "绾害",
+ "align": "center",
+ "prop": "latitude"
},
{
- label: "鎽勫儚鏈洪噰闆嗗尯鍩�",
- align: "center",
- prop: "cameraCaptureArea"
+ "label": "鎽勫儚鏈洪噰闆嗗尯鍩�",
+ "align": "center",
+ "prop": "cameraCaptureArea"
},
{
- label: "璁惧鐘舵��",
- align: "center",
- prop: "onState"
+ "label": "璁惧鐘舵��",
+ "align": "center",
+ "prop": "onState"
},
{
- label: "琛屾斂鍖哄煙",
- align: "center",
- prop: "civilCode"
+ "label": "琛屾斂鍖哄煙",
+ "align": "center",
+ "prop": "civilCode"
},
{
- label: "鏄惁闆嗘垚璁惧",
- align: "center",
- prop: "integratedDevice"
+ "label": "鏄惁闆嗘垚璁惧",
+ "align": "center",
+ "prop": "integratedDevice"
},
{
- label: "鎽勫儚鏈哄搧鐗�",
- align: "center",
- prop: "cameraBrand"
+ "label": "鎽勫儚鏈哄搧鐗�",
+ "align": "center",
+ "prop": "cameraBrand"
},
{
- label: "瀹夎鍦板潃",
- align: "center",
- prop: "address"
+ "label": "瀹夎鍦板潃",
+ "align": "center",
+ "prop": "address"
},
{
- label: "鑱旂綉灞炴��",
- align: "center",
- prop: "netWorking"
+ "label": "鑱旂綉灞炴��",
+ "align": "center",
+ "prop": "netWorking"
},
{
- label: "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
- align: "center",
- prop: "publicSecurity"
+ "label": "鎵�灞炶緰鍖哄叕瀹夋満鍏�",
+ "align": "center",
+ "prop": "publicSecurity"
},
{
- label: "瀹夎鏃堕棿",
- align: "center",
- prop: "installedTime"
+ "label": "瀹夎鏃堕棿",
+ "align": "center",
+ "prop": "installedTime"
},
{
- label: "绠＄悊鍗曚綅",
- align: "center",
- prop: "managementUnit"
+ "label": "绠＄悊鍗曚綅",
+ "align": "center",
+ "prop": "managementUnit"
},
{
- label: "绠＄悊鍗曚綅鑱旂郴鏂瑰紡",
- align: "center",
- prop: "muContactInfo"
+ "label": "绠＄悊鍗曚綅鑱旂郴鏂瑰紡",
+ "align": "center",
+ "prop": "muContactInfo"
},
{
- label: "褰曞儚淇濆瓨澶╂暟",
- align: "center",
- prop: "storageDays"
+ "label": "褰曞儚淇濆瓨澶╂暟",
+ "align": "center",
+ "prop": "storageDays"
},
{
- label: "鐩戣鏂逛綅",
- align: "center",
- prop: "monitorAzimuth"
+ "label": "鐩戣鏂逛綅",
+ "align": "center",
+ "prop": "monitorAzimuth"
},
{
- label: "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
- align: "center",
- prop: "scenePhotoAddr"
+ "label": "鎽勫儚鏈哄満鏅璁剧収鐗嘦RL",
+ "align": "center",
+ "prop": "scenePhotoAddr"
},
{
- label: "璁惧鍨嬪彿",
- align: "center",
- prop: "model"
+ "label": "璁惧鍨嬪彿",
+ "align": "center",
+ "prop": "model"
},
{
- label: "鐐逛綅淇楃О",
- align: "center",
- prop: "siteVulgo"
+ "label": "鐐逛綅淇楃О",
+ "align": "center",
+ "prop": "siteVulgo"
},
{
- label: "鎽勫儚鏈虹被鍨�",
- align: "center",
- prop: "cameraType"
+ "label": "鎽勫儚鏈虹被鍨�",
+ "align": "center",
+ "prop": "cameraType"
},
{
- label: "琛ュ厜灞炴��",
- align: "center",
- prop: "cameraLightType"
+ "label": "琛ュ厜灞炴��",
+ "align": "center",
+ "prop": "cameraLightType"
},
{
- label: "鎽勫儚鏈虹紪鐮佹牸寮�",
- align: "center",
- prop: "encodedFormat"
+ "label": "鎽勫儚鏈虹紪鐮佹牸寮�",
+ "align": "center",
+ "prop": "encodedFormat"
},
{
- label: "鎵�灞為儴闂�/琛屼笟",
- align: "center",
- prop: "cameraDept"
+ "label": "鎵�灞為儴闂�/琛屼笟",
+ "align": "center",
+ "prop": "cameraDept"
},
{
- label: "琛屼笟缂栫爜",
- align: "center",
- prop: "hybm"
+ "label": "琛屼笟缂栫爜",
+ "align": "center",
+ "prop": "hybm"
},
{
- label: "绫诲瀷缂栫爜",
- align: "center",
- prop: "lxbm"
+ "label": "绫诲瀷缂栫爜",
+ "align": "center",
+ "prop": "lxbm"
}
],
card: [
--
Gitblit v1.8.0