From a6119509e09abadc65f020f594ae446883567bd5 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 04 八月 2022 04:05:44 +0800
Subject: [PATCH] 修复场景无法编辑的bug
---
src/Pool/PollData.ts | 163 ++++++++++++++++++++++++-----------------------------
1 files changed, 74 insertions(+), 89 deletions(-)
diff --git a/src/Pool/PollData.ts b/src/Pool/PollData.ts
index cbd192b..96db2a7 100644
--- a/src/Pool/PollData.ts
+++ b/src/Pool/PollData.ts
@@ -1,106 +1,97 @@
-import { getPollConfig, changeRunType, getCamerasByServer, updateChannelCount } from "@/api/pollConfig";
-import { getSysThresholds } from "@/api/system"
-import {
- clusterStatisticRunInfo,
- deviceStatisticRunInfo,
- devicesSysInfo,
- clusterSysInfo
-} from "@/api/clusterManage";
+import { getPollConfig, changeRunType, getCamerasByServer, updateChannelCount } from "@/api/pollConfig"
+import { getSysThresholds } from "@/api/system"
+import { clusterStatisticRunInfo, deviceStatisticRunInfo, devicesSysInfo, clusterSysInfo } from "@/api/clusterManage"
export default class PollData {
- public Config: Object = {};
- public SearchName: String = "";
- public CameraList: Array<object> = [];
- public Enabled: boolean = false;
+ public Config: Object = {}
+ public SearchName: String = ""
+ public CameraList: Array<object> = []
+ public Enabled: boolean = false
//鎬荤畻鍔�
- public channelTotal: number = 0;
+ public channelTotal: number = 0
- public Running: number = 0;
- public Idle: number = 0;
+ public Running: number = 0
+ public Idle: number = 0
//瀹炴椂鍏ㄩ儴鎵撳紑
- public RealTimeSum: number = 0;
+ public RealTimeSum: number = 0
//瀹炴椂绠楀姏鎬绘暟
- public RealTimeValidCount: number = 0;
+ public RealTimeValidCount: number = 0
//瀹炴椂閰嶇疆涓嶅叏
- public RealTimeInvalid: number = 0;
+ public RealTimeInvalid: number = 0
//瀹炴椂姝ｅ湪澶勭悊
- public RealTimeRun: number = 0;
+ public RealTimeRun: number = 0
//瀹炴椂鏁呴殰
- public RealTimeNoDeal: number = 0;
-
+ public RealTimeNoDeal: number = 0
//杞绠楀姏鎬绘暟
- public PollValidCount: number = 0;
+ public PollValidCount: number = 0
//杞鍏ㄩ儴鎵撳紑
- public PollSum: number = 0;
+ public PollSum: number = 0
//杞姝ｅ湪鎵ц
- public PollRun: number = 0;
+ public PollRun: number = 0
//杞閰嶇疆涓嶅叏
- public PollInvalid: number = 0;
+ public PollInvalid: number = 0
//杞鏁呴殰
- public PollNoDeal: number = 0;
- public PollChannelTotal: number = 0;
-
+ public PollNoDeal: number = 0
+ public PollChannelTotal: number = 0
//鏁版嵁鏍堢畻鍔涙�绘暟
- public stackChannelCount: number = 0;
+ public stackChannelCount: number = 0
//鏁版嵁鏍堟�绘暟
- public stackTotal: number = 0;
+ public stackTotal: number = 0
//鏁版嵁鏍堥厤缃笉鍏�
- public stackInvalidCount: number = 0;
+ public stackInvalidCount: number = 0
//鏁版嵁鏍堟鍦ㄦ墽琛�
- public stackRunningCount: number = 0;
+ public stackRunningCount: number = 0
//鏁版嵁鏍堟晠闅�
- public stackNoDeal: number = 0;
-
+ public stackNoDeal: number = 0
//鏈湴绠楀姏閫氶亾鏁�
- public localVideo: number = 0;
+ public localVideo: number = 0
- public CpuUsedPercent: number = 0;
- public MemUsedPercent: number = 0;
- public GpuUsedPercent: number = 0;
- public DiskUsePercent: number = 0;
- public barCharts: Array<any> = [];
- public Thresholds: Array<object> = [];
+ public CpuUsedPercent: number = 0
+ public MemUsedPercent: number = 0
+ public GpuUsedPercent: number = 0
+ public DiskUsePercent: number = 0
+ public barCharts: Array<any> = []
+ public Thresholds: Array<object> = []
//绠楀姏閰嶇疆涓粦鍧楁暟鎹�
- public sliderList: Array<any> = [];
-
+ public sliderList: Array<any> = []
public init() {
- this.fetchPollConfig();
- this.fetchPollList();
- this.sysThresholds();
- this.statisticTaskInfo();
+ this.fetchPollConfig()
+ this.fetchPollList()
+ this.sysThresholds()
+ this.statisticTaskInfo()
}
public async fetchPollConfig() {
- const rsp: any = await getPollConfig();
+ const rsp: any = await getPollConfig()
if (rsp && rsp.success) {
- this.Config = rsp.data;
+ this.Config = rsp.data
if (rsp.data.enable) {
- this.Enabled = true;
+ this.Enabled = true
}
}
}
public async fetchPollList() {
this.CameraList = []
- let rsp: any = await getCamerasByServer({ cameraName: this.SearchName });
+ let rsp: any = await getCamerasByServer({ cameraName: this.SearchName })
if (rsp && rsp.success) {
if (rsp.data) {
- this.CameraList = rsp.data.sort(function (obj1: any, obj2: any) {
- var val1 = obj1.run_type;
- var val2 = obj2.run_type;
- return (val2 - val1)
- });
+ this.CameraList = rsp.data.sort(function(obj1: any, obj2: any) {
+ var val1 = obj1.run_type
+ var val2 = obj2.run_type
+ return val2 - val1
+ })
}
}
// 鏍规嵁rtsp 鎻愬彇ip鍦板潃
- const ipReg = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/;
+ const ipReg = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/
this.CameraList.forEach((cam: any) => {
// 鍥芥爣鎽勫儚鏈轰笉鏄剧ずip
if (cam.type === 1) {
@@ -115,13 +106,13 @@
}
public async switchType(id: string, type: number) {
- let rsp: any = await changeRunType({ camera_ids: [id], run_type: type });
+ let rsp: any = await changeRunType({ camera_ids: [id], run_type: type })
}
public async sysThresholds() {
let rsp: any = await getSysThresholds()
if (rsp && rsp.success) {
- this.Thresholds = rsp.data;
+ this.Thresholds = rsp.data
}
}
public async statistics() {
@@ -154,42 +145,37 @@
// this.Idle = RealTimeSum + PollSum - this.Running
// 璁＄畻绯荤粺淇℃伅
- let res: any
- if(sessionStorage.getItem("clusterId")) {
- res = await clusterSysInfo({
- clusterId: "",
- });
+ let res: any
+ if (sessionStorage.getItem("clusterId")) {
+ res = await clusterSysInfo({
+ clusterId: ""
+ })
+ } else {
+ res = await devicesSysInfo({
+ deviceId: [sessionStorage.getItem("devId")]
+ })
}
- else {
- res = await devicesSysInfo({
- deviceId:[sessionStorage.getItem('devId')],
- });
- }
- if (res && res.success ) {
- this.CpuUsedPercent =res.data.cpu.usedPercent.toFixed(2)
+ if (res && res.success) {
+ this.CpuUsedPercent = res.data.cpu.usedPercent.toFixed(2)
this.MemUsedPercent = res.data.mem.usedPercent.toFixed(2)
- this.DiskUsePercent =res.data.disk.usedPercent.toFixed(2)
+ this.DiskUsePercent = res.data.disk.usedPercent.toFixed(2)
this.GpuUsedPercent = res.data.gpu.usedPercent.toFixed(2)
- this.barCharts = [this.DiskUsePercent,this.CpuUsedPercent,this.GpuUsedPercent,this.MemUsedPercent]
- console.log(this.barCharts);
-
+ this.barCharts = [this.DiskUsePercent, this.CpuUsedPercent, this.GpuUsedPercent, this.MemUsedPercent]
}
}
public async statisticTaskInfo() {
let res: any
- if(sessionStorage.getItem("clusterId")) {
- res = await clusterStatisticRunInfo({});
+ if (sessionStorage.getItem("clusterId")) {
+ res = await clusterStatisticRunInfo({})
+ } else {
+ res = await deviceStatisticRunInfo({
+ deviceId: [sessionStorage.getItem("devId")],
+ userId: ""
+ })
}
- else {
- res = await deviceStatisticRunInfo({
- deviceId:[sessionStorage.getItem('devId')],
- userId:''
- });
- }
-
+
if (res && res.success) {
- // console.log(res,'缁熻瀹炴椂銆佽疆璇㈡暟閲�')
this.RealTimeSum = res.data.realTotal
this.RealTimeRun = res.data.realRunningCount
this.RealTimeValidCount = res.data.realValidCount
@@ -218,21 +204,20 @@
let totalCount = res.data.channelTotal
let realCount = res.data.realValidCount
let pollCount = res.data.pollChannelCount
- this.sliderList = [0,realCount,realCount + pollCount]
+ this.sliderList = [0, realCount, realCount + pollCount]
// if(realCount + pollCount == totalCount){
// this.sliderList = [0,realCount,realCount + pollCount]
// }else{
// this.sliderList = [0,realCount,realCount + pollCount,totalCount]
// }
-
}
}
- public async updateChannelCount(fileChannelCount,pollChannelCount){
+ public async updateChannelCount(fileChannelCount, pollChannelCount) {
let res: any = await updateChannelCount({
videoChannelCount: fileChannelCount,
pollChannelCount: pollChannelCount
})
this.statisticTaskInfo()
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0