diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue index bc2f721..f0f5bcd 100644 --- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue +++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue @@ -55,6 +55,8 @@ mediaServerId: '', // 流媒体 recognitionGb: '', // 识别流国标号 + + isProxyStream: '0', // 是否是代理流 }) const selectModelList = ref([]) // 选择的算法 const drawAreaRef = ref() @@ -74,6 +76,7 @@ rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }], mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }], // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }], + // isProxyStream: [{ required: true, message: '是否是代理流必选', trigger: ['blur', 'change'] }], }) // 算法表格表头 @@ -84,6 +87,7 @@ ]) // --------------------------------------------字典--------------------------------------- const mediaServerIdMapList: any = ref([]) // 流媒体id +const isProxyStreamList: any = ref([]) // 是否是代理流 // 获取字典值 async function getDict() { // 可选决策项 @@ -91,6 +95,10 @@ if (response && response.data && response.data.length) { mediaServerIdMapList.value = response.data } + // 是否是代理流 + getDictByCode('keyArea').then((response) => { + isProxyStreamList.value = response.data + }) } getDict() // ---------------------------------------------------------------------------------------- @@ -297,6 +305,7 @@ mediaServerId: '', // 流媒体 recognitionGb: '', // 识别流国标号 + isProxyStream: '0', // 是否是代理流 } edgeDeviceList.value = [] // 边缘设备列表 sceneList.value = [] // 业务场景列表 @@ -564,6 +573,7 @@ formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址 formData.value.mediaServerId = row.mediaServerId // 流媒体 formData.value.recognitionGb = row.recognitionGb // 识别流国标号 + formData.value.isProxyStream = row.isProxyStream || '0' // 是否是代理流 } if (dialogstatus === 'detail') { formDataRef.value?.clearValidate() @@ -902,7 +912,7 @@ - + - + - + - + - + + + + + + + + diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue index bc2f721..f0f5bcd 100644 --- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue +++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue @@ -55,6 +55,8 @@ mediaServerId: '', // 流媒体 recognitionGb: '', // 识别流国标号 + + isProxyStream: '0', // 是否是代理流 }) const selectModelList = ref([]) // 选择的算法 const drawAreaRef = ref() @@ -74,6 +76,7 @@ rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }], mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }], // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }], + // isProxyStream: [{ required: true, message: '是否是代理流必选', trigger: ['blur', 'change'] }], }) // 算法表格表头 @@ -84,6 +87,7 @@ ]) // --------------------------------------------字典--------------------------------------- const mediaServerIdMapList: any = ref([]) // 流媒体id +const isProxyStreamList: any = ref([]) // 是否是代理流 // 获取字典值 async function getDict() { // 可选决策项 @@ -91,6 +95,10 @@ if (response && response.data && response.data.length) { mediaServerIdMapList.value = response.data } + // 是否是代理流 + getDictByCode('keyArea').then((response) => { + isProxyStreamList.value = response.data + }) } getDict() // ---------------------------------------------------------------------------------------- @@ -297,6 +305,7 @@ mediaServerId: '', // 流媒体 recognitionGb: '', // 识别流国标号 + isProxyStream: '0', // 是否是代理流 } edgeDeviceList.value = [] // 边缘设备列表 sceneList.value = [] // 业务场景列表 @@ -564,6 +573,7 @@ formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址 formData.value.mediaServerId = row.mediaServerId // 流媒体 formData.value.recognitionGb = row.recognitionGb // 识别流国标号 + formData.value.isProxyStream = row.isProxyStream || '0' // 是否是代理流 } if (dialogstatus === 'detail') { formDataRef.value?.clearValidate() @@ -902,7 +912,7 @@ - + - + - + - + - + + + + + + + + diff --git a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts index 5bd2d0f..6ae0ea2 100644 --- a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts +++ b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts @@ -45,4 +45,6 @@ sceneRelationId?: string // 前端使用 mediaServerId?: string // 流媒体id recognitionGb?: string // 识别流国标号 + + isProxyStream: string // 是否是代理流 } diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue index bc2f721..f0f5bcd 100644 --- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue +++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue @@ -55,6 +55,8 @@ mediaServerId: '', // 流媒体 recognitionGb: '', // 识别流国标号 + + isProxyStream: '0', // 是否是代理流 }) const selectModelList = ref([]) // 选择的算法 const drawAreaRef = ref() @@ -74,6 +76,7 @@ rtspUrl: [{ required: true, message: 'rtsp地址必填', trigger: ['blur', 'change'] }], mediaServerId: [{ required: true, message: '流媒体必选', trigger: ['blur', 'change'] }], // recognitionGb: [{ required: true, message: '识别流国标号必填', trigger: ['blur', 'change'] }], + // isProxyStream: [{ required: true, message: '是否是代理流必选', trigger: ['blur', 'change'] }], }) // 算法表格表头 @@ -84,6 +87,7 @@ ]) // --------------------------------------------字典--------------------------------------- const mediaServerIdMapList: any = ref([]) // 流媒体id +const isProxyStreamList: any = ref([]) // 是否是代理流 // 获取字典值 async function getDict() { // 可选决策项 @@ -91,6 +95,10 @@ if (response && response.data && response.data.length) { mediaServerIdMapList.value = response.data } + // 是否是代理流 + getDictByCode('keyArea').then((response) => { + isProxyStreamList.value = response.data + }) } getDict() // ---------------------------------------------------------------------------------------- @@ -297,6 +305,7 @@ mediaServerId: '', // 流媒体 recognitionGb: '', // 识别流国标号 + isProxyStream: '0', // 是否是代理流 } edgeDeviceList.value = [] // 边缘设备列表 sceneList.value = [] // 业务场景列表 @@ -564,6 +573,7 @@ formData.value.rtspUrl = row.rtspUrl || 'http://192.168.83.42/rtsp' // rtsp地址 formData.value.mediaServerId = row.mediaServerId // 流媒体 formData.value.recognitionGb = row.recognitionGb // 识别流国标号 + formData.value.isProxyStream = row.isProxyStream || '0' // 是否是代理流 } if (dialogstatus === 'detail') { formDataRef.value?.clearValidate() @@ -902,7 +912,7 @@ - + - + - + - + - + + + + + + + + diff --git a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts index 5bd2d0f..6ae0ea2 100644 --- a/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts +++ b/src/views/alarm/policyConfig/monitorPoint/monitorPoint-interface.ts @@ -45,4 +45,6 @@ sceneRelationId?: string // 前端使用 mediaServerId?: string // 流媒体id recognitionGb?: string // 识别流国标号 + + isProxyStream: string // 是否是代理流 } diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue index 315aea2..5f3cc96 100644 --- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue +++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue @@ -14,6 +14,8 @@ import { controlBox } from '@/api/alarm/policyConfig/edgeDevice' import { videoTree } from '@/api/monitor/broadcast' import drawArea from '@/views/alarm/policyConfig/monitorPoint/drawArea.vue' +import useUserStore from '@/store/modules/user' +const user = useUserStore() // 用户信息 const timer = ref() // gm取流定时器 const router = useRouter() const baseurl = ref(window.location.href.split('/#')[0]) @@ -138,7 +140,7 @@ } if (systemType.value === 'sm') { // sm识别流 // 获取原始流 - fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode, data.device.deptId).then((res: any) => { + fetchRecognitionUrl(data.device.boxId, data.device.recognitionGb, data.device.nvrIndexCode, user.deptId).then((res: any) => { leafLoading.value = false mediaUrl.value = `${res}?token=${window.localStorage.getItem('token')}` jessibucaRef.value.play(mediaUrl.value) @@ -462,7 +464,7 @@ } if (systemType.value === 'sm') { leafLoading.value = true - fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId, currentData.value.deptId).then((res: any) => { + fetchRecognitionUrl(currentData.value.boxId, currentData.value.recognitionGb, currentData.value.mediaServerId, user.deptId).then((res: any) => { leafLoading.value = false mediaUrl.value = res jessibucaRef.value.play(mediaUrl.value)