Commit de754ce8 authored by 朱松文's avatar 朱松文

计算方式调整

parent bafd1f2c
...@@ -78,13 +78,19 @@ class DogTrack extends Component { ...@@ -78,13 +78,19 @@ class DogTrack extends Component {
//跟踪框大小 //跟踪框大小
myel.style.width = `${(value.x2 - value.x1) * this.defaultWidth}px` myel.style.width = `${(value.x2 - value.x1) * this.defaultWidth}px`
myel.style.height = `${(value.y2 - value.y1) * (this.defaultHeight + 30)}px` myel.style.height = `${(value.y2 - value.y1) * (this.defaultHeight + 30)}px`
//跟踪框位置
myel.style.top = `${value.y1 * this.defaultHeight}px`
myel.style.left = `${value.x1 * this.defaultWidth}px`
console.log(`top:${myel.style.top},left:${myel.style.left},screen-width:${this.defaultWidth},screen-height:${this.defaultHeight},dogs:${JSON.stringify(value)}`)
} else { } else {
myel.style.width = `${(value.x2 - value.x1) * this.fullWidth}px` myel.style.width = `${(value.x2 - value.x1) * this.fullWidth}px`
myel.style.height = `${(value.y2 - value.y1) * (this.fullHeight + 30)}px` myel.style.height = `${(value.y2 - value.y1) * (this.fullHeight + 30)}px`
//跟踪框位置
myel.style.top = `${value.y1 * this.fullHeight}px`
myel.style.left = `${value.x1 * this.fullWidth}px`
// console.log(`top:${myel.style.top},left:${myel.style.left},screen-width:${this.defaultWidth},screen-height:${this.defaultHeight},dogs:${dogs}`)
} }
//跟踪框位置
myel.style.top = `${value.y1 * 100}%`
myel.style.left = `${value.x1 * 100}%`
myel.className = myel.className.replace(/display-none/ig, "") myel.className = myel.className.replace(/display-none/ig, "")
} }
//清理掉当前frame没有的dog追踪 //清理掉当前frame没有的dog追踪
......
...@@ -67,6 +67,7 @@ export function getLabelInfo(fileName: string) { ...@@ -67,6 +67,7 @@ export function getLabelInfo(fileName: string) {
*/ */
export function convertLabelInfo(data: TrackData[]) { export function convertLabelInfo(data: TrackData[]) {
if (!data || data.length === 0) return [] if (!data || data.length === 0) return []
const now = new Date().getTime()
const trackData = new Map(); const trackData = new Map();
const dogIds = new Map() const dogIds = new Map()
data.forEach((frame: TrackData) => { data.forEach((frame: TrackData) => {
...@@ -76,5 +77,6 @@ export function convertLabelInfo(data: TrackData[]) { ...@@ -76,5 +77,6 @@ export function convertLabelInfo(data: TrackData[]) {
trackData.set(frame.FrameIndex, m) trackData.set(frame.FrameIndex, m)
dogIds.set(frame.DogId, frame.FrameIndex) dogIds.set(frame.DogId, frame.FrameIndex)
}); });
console.log(`标识文件大小:${data.length}行,处理耗时:${new Date().getTime() - now}毫秒`)
return [dogIds, trackData] return [dogIds, trackData]
} }
\ No newline at end of file
...@@ -220,7 +220,6 @@ export default class SysSetting extends BaseVue { ...@@ -220,7 +220,6 @@ export default class SysSetting extends BaseVue {
} }
async handleQuery(data: any): Promise<void> { async handleQuery(data: any): Promise<void> {
console.log("query", data);
this.isDisabled = true; this.isDisabled = true;
this.queryData = { ...this.queryData, ...data }; this.queryData = { ...this.queryData, ...data };
await this.queryCamera(); await this.queryCamera();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment