From 013c4922a3296e95a54c1902c09b44d62a000eb2 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 27 七月 2022 17:14:02 +0800
Subject: [PATCH] Merge branch 'shandong' of ssh://192.168.5.5:29418/web/saas-web into shandong
---
src/components/CameraLeft.vue | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/components/CameraLeft.vue b/src/components/CameraLeft.vue
index 1dd293a..49176ec 100644
--- a/src/components/CameraLeft.vue
+++ b/src/components/CameraLeft.vue
@@ -499,7 +499,7 @@
created() {
if (this.showCam) {
this.TreeDataPool.treeActiveName = "camera";
- this.TreeDataPool.fetchTreeData();
+ // this.TreeDataPool.fetchTreeData();
} else {
this.TreeDataPool.treeActiveName = "dataStack";
this.DataStackPool.fetchFiles();
@@ -698,7 +698,17 @@
camera.rtsp = String(sheetArray[item].rtsp);
camera.addr = String(sheetArray[item].addr);
- promiseArr.push(createCamera(camera));
+ let tem = {
+ camera: camera,
+ sensors: camera.sensors,
+ };
+ tem.camera.clusterId = this.TreeDataPool.clusterId;
+ tem.camera.devId = this.TreeDataPool.devId;
+ tem.camera.parentUserId = "";
+ tem.camera.enable = false;
+ delete tem.camera.sensors;
+
+ promiseArr.push(createCamera(tem));
}
let _this = this;
Promise.allSettled(promiseArr)
@@ -981,7 +991,7 @@
z-index: 2;
font-size: 16px;
position: absolute;
- top: 62px;
+ top: 59px;
cursor: pointer;
button {
border: 0px;
--
Gitblit v1.8.0