From 907a3504a77873a8e762adc2f684222c8946adec Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@smartai.com> Date: 星期三, 10 八月 2022 21:18:54 +0800 Subject: [PATCH] 添加实时监控,调整树的滚动条 --- src/Pool/VideoTaskData.ts | 67 +++++++++++++++++---------------- 1 files changed, 34 insertions(+), 33 deletions(-) diff --git a/src/Pool/VideoTaskData.ts b/src/Pool/VideoTaskData.ts index 8a3e784..8e40905 100644 --- a/src/Pool/VideoTaskData.ts +++ b/src/Pool/VideoTaskData.ts @@ -1,29 +1,30 @@ -import { getCameraTask, initTaskData, monitorRealTimeTaskData } from "@/api/task"; +import { getCameraTask, initTaskData, monitorRealTimeTaskData } from "@/api/task" export default class VideoTaskData { - public tasks: Array<any> = []; - public taskCard: Array<object> = []; - public cameras: Array<string> = []; - public activeIndex: number; - public separateRulesTasks: object = []; + public tasks: Array<any> = [] + public taskCard: Array<object> = [] + public cameras: Array<string> = [] + public activeIndex: number + public separateRulesTasks: object = [] constructor() { - this.tasks = []; - this.taskCard = []; - this.cameras = []; - this.activeIndex = 0; - this.separateRulesTasks = []; + this.tasks = [] + this.taskCard = [] + this.cameras = [] + this.activeIndex = 0 + this.separateRulesTasks = [] } public async fetchTasks() { + console.log("fetchTasks") // 鏍规嵁閫変腑鎽勫儚鏈猴紝鏌ユ壘浠诲姟锛屽幓閲� const rsp: any = await getCameraTask({ - cameraIds: this.cameras - }); + cameraId: this.cameras[0] + }) if (rsp && rsp.success) { //let taskIds = [] - let taskNames = []; - this.tasks = []; + let taskNames = [] + this.tasks = [] // rsp.data.forEach((d: any) => { // if (d.tasks) { @@ -45,19 +46,19 @@ // }) // } // }) - rsp.data.forEach((d: any) => { - if (taskNames.indexOf(d.name) < 0) { - taskNames.push(d.name); + rsp.data.rules.forEach((d: any) => { + if (taskNames.indexOf(d.scene_name) < 0) { + taskNames.push(d.scene_name) this.tasks.push(d) } else { - let repeatOne = this.tasks.find((one: any) => one.name == d.name); - repeatOne.id += `,${d.id}`; - repeatOne.isDelete = repeatOne.isDelete && d.isDelete; + let repeatOne = this.tasks.find((one: any) => one.scene_name == d.scene_name) + repeatOne.id += `,${d.id}` + repeatOne.isDelete = repeatOne.isDelete && d.isDelete } - }); + }) this.tasks = this.tasks.filter((d: any) => !d.isDelete) - console.log(this.tasks); + console.log(this.tasks) // 鍒濆鍖栫涓�浠诲姟鐨勪俊鎭� this.initTaskList() @@ -68,39 +69,39 @@ // console.log(this.tasks, this.activeIndex, '鍒濆鍖栬幏鍙栦汉鏁版姄鎷�') this.taskCard.splice(0, this.taskCard.length) if (!this.tasks[this.activeIndex]) { - return; + return } const rsp: any = await initTaskData({ //tasks: [this.tasks[this.activeIndex].taskId], - tasks: this.tasks[this.activeIndex].id.split(','), + tasks: this.tasks[this.activeIndex].id.split(","), treeNodes: this.cameras - }); + }) if (rsp && rsp.success && rsp.data.datalist) { - rsp.data.datalist.forEach(element => { + rsp.data.datalist.forEach((element) => { // this.taskCard.push({ // list: [element], // activeObject: element // }); this.taskCard.push(element) - }); + }) } } public async monitorTaskData() { if (!this.tasks[this.activeIndex]) { - return; + return } const rsp: any = await monitorRealTimeTaskData({ //tasks: [this.tasks[this.activeIndex].id], - tasks: this.tasks[this.activeIndex].id.split(','), + tasks: this.tasks[this.activeIndex].id.split(","), treeNodes: this.cameras - }); + }) if (rsp && rsp.success) { if (rsp.data.datalist && rsp.data.datalist.length > 0) { - rsp.data.datalist.reverse().forEach(element => { + rsp.data.datalist.reverse().forEach((element) => { let rt = this.taskCard.filter((c: any) => { return c.activeObject.id === element.activeObject.id }) @@ -111,7 +112,7 @@ // }); this.taskCard.unshift(element) } - }); + }) this.taskCard.splice(20, this.taskCard.length - 20) } } -- Gitblit v1.8.0