diff --git a/public/config/config.json b/public/config/config.json index 1d590fe..54966b0 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -10,7 +10,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "lineColors": [ diff --git a/public/config/config.json b/public/config/config.json index 1d590fe..54966b0 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -10,7 +10,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "lineColors": [ diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue index 5f3cc96..d533d56 100644 --- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue +++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue @@ -86,7 +86,7 @@ if (data.type !== '3' && data.device.deviceStatusName === '离线') { ElMessage.warning(`设备 ${data.device.monitorName} 离线`) - // return false + return false } const now = new Date().getTime() @@ -140,7 +140,7 @@ } if (systemType.value === 'sm') { // sm识别流 // 获取原始流 - fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode, user.deptId).then((res: any) => { + fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.mediaServerId, user.deptId).then((res: any) => { leafLoading.value = false mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}` jessibucaRef.value.play(mediaUrl.value) diff --git a/public/config/config.json b/public/config/config.json index 1d590fe..54966b0 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -10,7 +10,7 @@ "maxZoom": "18", "zoom": "15", "timeGap": 600000, - "systemType": "sm", + "systemType": "gm", "lineWidth": "3", "lineColor": "#1aa034", "lineColors": [ diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue index 5f3cc96..d533d56 100644 --- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue +++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue @@ -86,7 +86,7 @@ if (data.type !== '3' && data.device.deviceStatusName === '离线') { ElMessage.warning(`设备 ${data.device.monitorName} 离线`) - // return false + return false } const now = new Date().getTime() @@ -140,7 +140,7 @@ } if (systemType.value === 'sm') { // sm识别流 // 获取原始流 - fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode, user.deptId).then((res: any) => { + fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.mediaServerId, user.deptId).then((res: any) => { leafLoading.value = false mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}` jessibucaRef.value.play(mediaUrl.value) diff --git a/src/views/monitor/groupEmpower/edit.vue b/src/views/monitor/groupEmpower/edit.vue index d43a11d..1c59a15 100644 --- a/src/views/monitor/groupEmpower/edit.vue +++ b/src/views/monitor/groupEmpower/edit.vue @@ -215,6 +215,27 @@ emits('closeRefresh') } +function addNewNameField(nodes: any[]) { + return nodes.map((node: any) => { + // 创建当前节点的浅拷贝(保留所有原始属性) + const newNode = { ...node } + + // 处理 newName 字段 + if (newNode.device + && typeof newNode.device === 'object' + && newNode.device.nvrIndexCode !== undefined) { + newNode.name = `${newNode.name}(${newNode.device.nvrIndexCode})` + } + + // 递归处理子节点(如果有) + if (newNode.children && newNode.children.length > 0) { + newNode.children = addNewNameField(newNode.children) + } + + return newNode + }) +} + // 关闭弹窗 function dialogClose() { dialogVisible.value = false @@ -230,11 +251,13 @@ videoTree().then((response) => { if (response.code === 200) { data.value = response.data + data.value = addNewNameField(response.data) } }) personTree().then((response) => { if (response.code === 200) { dataPerson.value = response.data + dataPerson.value = addNewNameField(response.data) } }) }) @@ -247,7 +270,7 @@