From abe3a86c15105f215992d78bcaaf9b51efa1d565 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 28 七月 2022 10:22:41 +0800
Subject: [PATCH] 解决冲突
---
src/views/hashrate/CameraManage/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/hashrate/CameraManage/index.vue b/src/views/hashrate/CameraManage/index.vue
index ce7ff42..b738df9 100644
--- a/src/views/hashrate/CameraManage/index.vue
+++ b/src/views/hashrate/CameraManage/index.vue
@@ -79,7 +79,7 @@
watch: {
"TreeDataPool.activeNode": function (node) {
- console.log("cclickaaa");
+ sessionStorage.setItem("cameraDevId", node.devId);
if (this.activeTab == "淇℃伅缁存姢") {
if (this.TreeDataPool.treeActiveName == "camera") {
this.$refs.cameraInfo.selectCamera(node);
@@ -148,10 +148,10 @@
this.selectedNodes = [];
},
beforeDestroy() {
- clearInterval(this.intervalTimer);
- //this.TreeDataPool.treeActiveName = "camera";
sessionStorage.removeItem("devId");
sessionStorage.removeItem("clusterId");
+ clearInterval(this.intervalTimer);
+ //this.TreeDataPool.treeActiveName = "camera";
},
mounted() {
this.$nextTick(() => {
--
Gitblit v1.8.0