diff --git a/public/config/config.json b/public/config/config.json index 4aeb8c9..9110c3f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.55:6909/safe-server/", + "baseUrl": "http://192.168.83.42:6909/safe-server/", "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************", "deployPath": "/alarm", "mediaBaseUrl": "http://192.168.83.42:8099", diff --git a/public/config/config.json b/public/config/config.json index 4aeb8c9..9110c3f 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,6 +1,6 @@ { "title": "安全生产智慧监管系统", - "baseUrl": "http://192.168.83.55:6909/safe-server/", + "baseUrl": "http://192.168.83.42:6909/safe-server/", "deployPathDec": "****************注意：这个/alarm的alarm一定要改成部署的文件夹的名字***************************", "deployPath": "/alarm", "mediaBaseUrl": "http://192.168.83.42:8099", diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue index 2086551..0b1f6d8 100644 --- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue +++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue @@ -31,6 +31,8 @@ const videoHeight = ref(360) const cameraIndexCode = ref('') // 设备国标号 const nvrIndexCode = ref('') // nvr国标号 +const deviceNo = ref('') // 设备编号 +const deviceName = ref('') // 设备名称 const currentDrawButton = ref('2') // 显示标题 const textMap: { [key: string]: string } = { @@ -589,6 +591,8 @@ dialogStatus.value = dialogstatus // 类型 新建add 编辑edit 详情detail cameraIndexCode.value = row.cameraIndexCode || '' // 设备国标号 nvrIndexCode.value = row.nvrIndexCode || '' // nvr国标号 + deviceNo.value = `${row.deviceNo}` || '' // 设备编号 + deviceName.value = `${row.deviceName}` || '' // 设备名称 if (systemType.value === 'sm' && cameraIndexCode.value && nvrIndexCode.value) { // 流媒体 console.log('sm请求视频前') await fetchMediaStream(cameraIndexCode.value, nvrIndexCode.value) @@ -930,6 +934,9 @@ +
{{ deviceNo }} - {{ deviceName }} - {{ nvrIndexCode }}
+ +