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 | 477 +++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 317 insertions(+), 160 deletions(-) diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js index 5aaedc4..30f7f92 100644 --- a/src/views/system/data-manage/data-detail/list.js +++ b/src/views/system/data-manage/data-detail/list.js @@ -1055,21 +1055,27 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', - prop: 'online', + prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', - prop: 'online', + prop: 'checkCount', width: 200, }, { label: '褰撴棩绂荤嚎娆℃暟', align: 'center', - prop: 'online', + prop: 'offLineCount', width: 200, }, { @@ -1087,7 +1093,16 @@ label: '璁惧鎬绘暟' }, { - label: '浠婃棩鍦ㄧ嚎鐜�' + label: '璁惧姝e父鏁�' + }, + { + label: '璁惧寮傚父鏁�' + }, + { + label: '鏈煡鏁�' + }, + { + label: '鍦ㄧ嚎鐜�' }, ] } @@ -1104,6 +1119,12 @@ { key: 3, label: `鐪佸巺鏍囩`, visible: false }, { key: 3, label: `鐪佸巺鏍囩鍒楄〃`, visible: false }, ], + options: [ + { label: '绂荤嚎',value: -1 }, + { label: '鏈煡',value: 0 }, + { label: '鍦ㄧ嚎',value: 1 }, + ], + optionsName: '鍦ㄧ嚎鎯呭喌', }, { title: "鐐逛綅鍦ㄧ嚎鐜�", @@ -1128,21 +1149,27 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', - prop: 'online', + prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', - prop: 'online', + prop: 'checkCount', width: 200, }, { label: '褰撴棩绂荤嚎娆℃暟', align: 'center', - prop: 'online', + prop: 'offLineCount', width: 200, }, { @@ -1160,7 +1187,16 @@ label: '璁惧鎬绘暟' }, { - label: '浠婃棩鍦ㄧ嚎鐜�' + label: '璁惧姝e父鏁�' + }, + { + label: '璁惧寮傚父鏁�' + }, + { + label: '鏈煡鏁�' + }, + { + label: '鍦ㄧ嚎鐜�' }, ] } @@ -1177,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: "褰曞儚鍙敤鐜�", @@ -1243,6 +1285,9 @@ icon: 'el-icon-wind-power', dataList: [ { + label: '鎬绘暟' + }, + { label: '瀹屾暣' }, { @@ -1252,11 +1297,17 @@ label: '寮傚父' }, { - label: '浠婃棩鍙敤鐜�' + label: '褰曞儚鍙敤鐜�' }, ] } - ] + ], + options: [ + { label: '瀹屾暣',value: 1 }, + { label: '闂存瓏',value: 0 }, + { label: '寮傚父',value: -1 }, + ], + optionsName: '褰曞儚鐘舵��', }, { title: "閮ㄧ骇宸℃褰曞儚鍙敤鐜�", @@ -1323,6 +1374,9 @@ icon: 'el-icon-wind-power', dataList: [ { + label: '鎬绘暟' + }, + { label: '瀹屾暣' }, { @@ -1332,11 +1386,17 @@ label: '寮傚父' }, { - label: '浠婃棩鍙敤鐜�' + label: '褰曞儚鍙敤鐜�' }, ] } - ] + ], + options: [ + { label: '瀹屾暣',value: 1 }, + { label: '闂存瓏',value: 0 }, + { label: '寮傚父',value: -1 }, + ], + optionsName: '褰曞儚鐘舵��', }, { title: "鏍囨敞姝g‘鐜�", @@ -1699,21 +1759,27 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', - prop: 'online', + prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', - prop: 'online', + prop: 'checkCount', width: 200, }, { label: '褰撴棩绂荤嚎娆℃暟', align: 'center', - prop: 'online', + prop: 'offLineCount', width: 200, }, { @@ -1731,7 +1797,16 @@ label: '璁惧鎬绘暟' }, { - label: '浠婃棩鍦ㄧ嚎鐜�' + label: '璁惧姝e父鏁�' + }, + { + label: '璁惧寮傚父鏁�' + }, + { + label: '鏈煡鏁�' + }, + { + label: '鍦ㄧ嚎鐜�' }, ] } @@ -1748,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: '閲嶇偣鐐逛綅褰曞儚鍙敤鐜�', @@ -1814,6 +1895,9 @@ icon: 'el-icon-wind-power', dataList: [ { + label: '鎬绘暟' + }, + { label: '瀹屾暣' }, { @@ -1823,11 +1907,17 @@ label: '寮傚父' }, { - label: '浠婃棩閲嶇偣鍙敤鐜�' + label: '褰曞儚鍙敤鐜�' }, ] } - ] + ], + options: [ + { label: '瀹屾暣',value: 1 }, + { label: '闂存瓏',value: 0 }, + { label: '寮傚父',value: -1 }, + ], + optionsName: '褰曞儚鐘舵��', }, { title: '閲嶇偣鐐逛綅鏍囨敞姝g‘鐜�', @@ -1872,63 +1962,62 @@ { "label": "osd鏃堕棿鏄惁姝g‘", "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: '鐐逛綅鍚嶇О鏍囨敞姝g‘鏁�' + label: '鎬绘暟' }, { - label: '鐐逛綅鍚嶇О鏍囨敞閿欒鏁�' + label: 'OSD姝g‘鏁�' }, { - label: 'osd鏃堕棿鏍囨敞姝g‘鏁�' + label: 'OSD閿欒鏁�' }, { - label: 'osd鏃堕棿鏍囨敞閿欒鏁�' + label: 'OSD鏈煡鏁�' }, { - label: '浠婃棩鏍囨敞姝g‘鐜�' + label: '閲嶇偣鐐逛綅鏍囨敞姝g‘鐜�' }, ] } ], + options: [ + { label: '姝g‘',value: 1 }, + { label: '閿欒',value: -1 }, + { label: '鏈煡',value: 0 }, + ], + optionsName: 'OSD鐘舵��', }, { title: '閲嶇偣鐐逛綅鏍℃椂姝g‘鐜�', @@ -1973,57 +2062,62 @@ { "label": "osd鏃堕棿鏄惁姝g‘", "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鏃堕棿鏍囨敞姝g‘鏁�' + label: '鎬绘暟' }, { - label: 'osd鏃堕棿鏍囨敞閿欒鏁�' + label: 'OSD姝g‘鏁�' }, { - label: '浠婃棩鏍℃椂姝g‘鐜�' + label: 'OSD閿欒鏁�' + }, + { + label: 'OSD鏈煡鏁�' + }, + { + label: '閲嶇偣鐐逛綅鏍囨敞姝g‘鐜�' }, ] } ], + options: [ + { label: '姝g‘',value: 1 }, + { label: '閿欒',value: -1 }, + { label: '鏈煡',value: 0 }, + ], + optionsName: 'OSD鏃堕棿', showList: [ { key: 0, label: `璁惧鍘傚晢`, visible: false }, { key: 1, label: `琛屾斂鍖哄煙`, visible: false }, @@ -2068,21 +2162,27 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', - prop: 'online', + prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', - prop: 'online', + prop: 'checkCount', width: 200, }, { label: '褰撴棩绂荤嚎娆℃暟', align: 'center', - prop: 'online', + prop: 'offLineCount', width: 200, }, { @@ -2100,7 +2200,16 @@ label: '璁惧鎬绘暟' }, { - label: '浠婃棩鍦ㄧ嚎鐜�' + label: '璁惧姝e父鏁�' + }, + { + label: '璁惧寮傚父鏁�' + }, + { + label: '鏈煡鏁�' + }, + { + label: '鍦ㄧ嚎鐜�' }, ] } @@ -2117,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: "瑙嗛鍥惧儚璐ㄩ噺妫�娴嬫姤鍛�", @@ -2340,21 +2455,27 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', - prop: 'online', + prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', - prop: 'online', + prop: 'checkCount', width: 200, }, { label: '褰撴棩绂荤嚎娆℃暟', align: 'center', - prop: 'online', + prop: 'offLineCount', width: 200, }, { @@ -2372,11 +2493,26 @@ label: '璁惧鎬绘暟' }, { - label: '浠婃棩鍦ㄧ嚎鐜�' + label: '璁惧姝e父鏁�' + }, + { + label: '璁惧寮傚父鏁�' + }, + { + label: '鏈煡鏁�' + }, + { + label: '鍦ㄧ嚎鐜�' }, ] } - ] + ], + options: [ + { label: '绂荤嚎',value: -1 }, + { label: '鏈煡',value: 0 }, + { label: '鍦ㄧ嚎',value: 1 }, + ], + optionsName: '鍦ㄧ嚎鎯呭喌', }, { title: '鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼', @@ -3682,21 +3818,27 @@ width: 200, }, { - label: '鏈�杩戠洃娴嬪湪绾跨姸鎬�', + label: '璁惧鐘舵��', align: 'center', - prop: 'online', + prop: 'onlineStr', + width: 200, + }, + { + label: '鏈�杩慞ing鐩戞祴鐘舵��', + align: 'center', + prop: 'pingOnlineStr', width: 200, }, { label: '褰撴棩鐩戞祴娆℃暟', align: 'center', - prop: 'online', + prop: 'checkCount', width: 200, }, { label: '褰撴棩绂荤嚎娆℃暟', align: 'center', - prop: 'online', + prop: 'offLineCount', width: 200, }, { @@ -3714,11 +3856,26 @@ label: '璁惧鎬绘暟' }, { - label: '浠婃棩鍦ㄧ嚎鐜�' + label: '璁惧姝e父鏁�' + }, + { + label: '璁惧寮傚父鏁�' + }, + { + label: '鏈煡鏁�' + }, + { + label: '鍦ㄧ嚎鐜�' }, ] } - ] + ], + options: [ + { label: '绂荤嚎',value: -1 }, + { label: '鏈煡',value: 0 }, + { label: '鍦ㄧ嚎',value: 1 }, + ], + optionsName: '鍦ㄧ嚎鎯呭喌', }, { title: '鐩綍涓�鑷寸巼', @@ -4799,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