From 01b516a3c3304c966d413b768d2e3078bf83b61c Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 22 六月 2022 13:38:20 +0800
Subject: [PATCH] 联动场景传参
---
src/scripts/httpRequest.ts | 8 ++++++++
src/views/hashrate/CameraManage/index.vue | 2 +-
src/views/hashrate/CameraManage/CameraRules/index.vue | 13 ++++++-------
src/Pool/TreeData.ts | 2 ++
src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue | 2 ++
5 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 8c9ad4c..330295e 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -128,6 +128,7 @@
function nodeFilter(node: any) {
if (node.type === '4' && node.selected) {
_selected.push(node.id)
+ sessionStorage.setItem('cameraDevId',node.devId)
}
if (node.children) {
node.children.forEach((n: any) => {
@@ -170,6 +171,7 @@
function nodeFilter(node: any) {
if (node.type === '4' && (node.selected || node.checked)) {
+ sessionStorage.setItem("cameraDevId", node.devId);
_this.selectedNodes.push(node.id)
}
if (node.children) {
diff --git a/src/scripts/httpRequest.ts b/src/scripts/httpRequest.ts
index 95a6c30..2253ea4 100644
--- a/src/scripts/httpRequest.ts
+++ b/src/scripts/httpRequest.ts
@@ -12,6 +12,10 @@
/* //POST浼犲弬搴忓垪鍖�(娣诲姞璇锋眰鎷︽埅鍣�) */
Axios.interceptors.request.use(
config => {
+ console.log(9898);
+ console.log(config);
+
+
if (
config.method === "post" &&
sessionStorage.getItem('clusterId') ||
@@ -25,6 +29,10 @@
config.data.clusterId = sessionStorage.getItem('clusterId')
config.data.devId = sessionStorage.getItem('devId')
}
+
+ if(config.url === '/saas/api-s/camera/rule/getLinkRulesByCameraIds') {
+ config.data.devId = sessionStorage.getItem('cameraDevId')
+ }
}
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue b/src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue
index db5aba2..9793550 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue
@@ -809,6 +809,8 @@
? rule.polygonObj.cameraId
: rule.camera_id;
rule.group_id = this.group_id;
+ console.log(9799898);
+ this.$forceUpdate();
},
//閫夋嫨绠楁硶 resetArgs涓簍rue鏄坊鍔犱负false鏄垵濮嬪寲缂栬緫
selectSDKOption(sdkItem, resetArgs) {
diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue
index 0d9f0ee..53953a3 100644
--- a/src/views/hashrate/CameraManage/CameraRules/index.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -901,20 +901,19 @@
};
if (this.addData.type === "linkage") {
this.addData.cameras = [];
+ this.linkageRule[index].camera_polygons = [];
this.Carmeras.forEach((camera) => {
this.addData.cameras.push({
polygonData: camera.polygonData,
cameraName: camera.cameraName,
cameraId: camera.cameraId,
});
- });
- /* this.linkageRule[index].camera_polygons.forEach((item) => {
- this.addData.cameras.push({
- polygonData: item.polygon,
- cameraName: item.camera_name,
- cameraId: item.camera_id,
+ this.linkageRule[index].camera_polygons.push({
+ polygon: camera.polygonData,
+ camera_name: camera.cameraName,
+ camera_id: camera.cameraId,
});
- }); */
+ });
}
this.showSdkBox = false;
this.showSdkSettingBox = true;
diff --git a/src/views/hashrate/CameraManage/index.vue b/src/views/hashrate/CameraManage/index.vue
index ce7ff42..f07d8be 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);
--
Gitblit v1.8.0