diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue index 055e669..62810ce 100644 --- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue +++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue @@ -61,7 +61,6 @@ // ---------------------------------线-------------------------------- // 获取线的颜色 if (lineColors.value.length) { - console.log('当前正在画的线的颜色-----------', lineColors.value[index]) ctx.strokeStyle = lineColors.value[index] } else { @@ -127,7 +126,6 @@ } // 计算商和余数的辅助函数 const { quotient, remainder } = divideAndModulo(pointIndex, 4) - console.log(`移动的是第${quotient + 1}条数据,第${remainder + 1}个点`) if (props.currentDrawButton === '1') { const rect = pointsInfo.value[quotient].boundary // 获取矩形的四个顶点数组 const draggedPoint = rect[remainder] // 当前被拖拽的顶点对象 @@ -297,8 +295,6 @@ }) // pointsInfo.value = newValue pointsInfo.value = tempValue - console.log('===========', pointsInfo.value) - nextTick(() => { initDraw() }) diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue index 055e669..62810ce 100644 --- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue +++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue @@ -61,7 +61,6 @@ // ---------------------------------线-------------------------------- // 获取线的颜色 if (lineColors.value.length) { - console.log('当前正在画的线的颜色-----------', lineColors.value[index]) ctx.strokeStyle = lineColors.value[index] } else { @@ -127,7 +126,6 @@ } // 计算商和余数的辅助函数 const { quotient, remainder } = divideAndModulo(pointIndex, 4) - console.log(`移动的是第${quotient + 1}条数据,第${remainder + 1}个点`) if (props.currentDrawButton === '1') { const rect = pointsInfo.value[quotient].boundary // 获取矩形的四个顶点数组 const draggedPoint = rect[remainder] // 当前被拖拽的顶点对象 @@ -297,8 +295,6 @@ }) // pointsInfo.value = newValue pointsInfo.value = tempValue - console.log('===========', pointsInfo.value) - nextTick(() => { initDraw() }) diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue index 0f274c5..3efbdb9 100644 --- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue +++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue @@ -488,14 +488,14 @@ cameraIndexCode.value = row.cameraIndexCode || '' // 设备国标号 nvrIndexCode.value = row.nvrIndexCode || '' // nvr国标号 if (systemType.value === 'sm' && cameraIndexCode.value && nvrIndexCode.value) { // 流媒体 - console.log('请求视频前') + console.log('sm请求视频前') await fetchMediaStream(cameraIndexCode.value, nvrIndexCode.value) - console.log('请求视频后') + console.log('sm请求视频后') } if (systemType.value === 'gm' && cameraIndexCode.value) { // gm取流 - console.log('请求视频前') + console.log('gm请求视频前') await playGmStream(cameraIndexCode.value) - console.log('请求视频后') + console.log('gm请求视频后') } // 在视频加载出来之后画框 setTimeout(() => { diff --git a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue index 055e669..62810ce 100644 --- a/src/views/alarm/policyConfig/monitorPoint/drawArea.vue +++ b/src/views/alarm/policyConfig/monitorPoint/drawArea.vue @@ -61,7 +61,6 @@ // ---------------------------------线-------------------------------- // 获取线的颜色 if (lineColors.value.length) { - console.log('当前正在画的线的颜色-----------', lineColors.value[index]) ctx.strokeStyle = lineColors.value[index] } else { @@ -127,7 +126,6 @@ } // 计算商和余数的辅助函数 const { quotient, remainder } = divideAndModulo(pointIndex, 4) - console.log(`移动的是第${quotient + 1}条数据,第${remainder + 1}个点`) if (props.currentDrawButton === '1') { const rect = pointsInfo.value[quotient].boundary // 获取矩形的四个顶点数组 const draggedPoint = rect[remainder] // 当前被拖拽的顶点对象 @@ -297,8 +295,6 @@ }) // pointsInfo.value = newValue pointsInfo.value = tempValue - console.log('===========', pointsInfo.value) - nextTick(() => { initDraw() }) diff --git a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue index 0f274c5..3efbdb9 100644 --- a/src/views/alarm/policyConfig/monitorPoint/editDialog.vue +++ b/src/views/alarm/policyConfig/monitorPoint/editDialog.vue @@ -488,14 +488,14 @@ cameraIndexCode.value = row.cameraIndexCode || '' // 设备国标号 nvrIndexCode.value = row.nvrIndexCode || '' // nvr国标号 if (systemType.value === 'sm' && cameraIndexCode.value && nvrIndexCode.value) { // 流媒体 - console.log('请求视频前') + console.log('sm请求视频前') await fetchMediaStream(cameraIndexCode.value, nvrIndexCode.value) - console.log('请求视频后') + console.log('sm请求视频后') } if (systemType.value === 'gm' && cameraIndexCode.value) { // gm取流 - console.log('请求视频前') + console.log('gm请求视频前') await playGmStream(cameraIndexCode.value) - console.log('请求视频后') + console.log('gm请求视频后') } // 在视频加载出来之后画框 setTimeout(() => { diff --git a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue index 3336677..4bd987f 100644 --- a/src/views/alarm/policyConfig/videoPreview/videoPreview.vue +++ b/src/views/alarm/policyConfig/videoPreview/videoPreview.vue @@ -24,6 +24,7 @@ const jessibucaRef = ref() const videoWidth = ref(640) const videoHeight = ref(360) +const canvasHeight = ref() const points = ref([]) as any // 标注信息 const drawPoints = ref([]) as any // 标注信息 // const palyUrl = `${url}?token=${window.localStorage.getItem('token')}` @@ -59,7 +60,8 @@ // width.value = divPlugin.clientWidth // height.value = divPlugin.clientHeight - 5 // 宽高比要16:9,因为监控点位管理里面在视频上画框的宽高比就是16:9,同比例同位置 - height.value = divPlugin.clientHeight - 5 - 28 + height.value = divPlugin.clientHeight + canvasHeight.value = height.value - 30 width.value = Number(((height.value / 9) * 16).toFixed(2)) } @@ -80,7 +82,7 @@ if (data.device.deviceStatusName === '离线') { ElMessage.warning(`设备 ${data.device.monitorName} 离线`) - // return false + return false } const now = new Date().getTime() @@ -447,7 +449,7 @@ item = item.map((e) => { return { x: (e.x * width.value).toFixed(0), - y: (e.y * height.value).toFixed(0), + y: (e.y * canvasHeight.value).toFixed(0), } }) return item @@ -455,7 +457,7 @@ else { return { x: (item.x * width.value).toFixed(0), - y: (item.y * height.value).toFixed(0), + y: (item.y * canvasHeight.value).toFixed(0), } } }) @@ -703,7 +705,7 @@