From f7f0e44c4be8eb0e77fd310296c3b43bde21e4f9 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 23 六月 2022 14:17:01 +0800
Subject: [PATCH] 新增联动场景
---
src/views/hashrate/CameraManage/CameraRules/index.vue | 13 +++++++++++--
src/main.ts | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/main.ts b/src/main.ts
index 7363b3e..d327137 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,7 +8,7 @@
import numeral from 'numeral';
import preview from "vue-photo-preview";
import "vue-photo-preview/dist/skin.css";
-import * as VueWindow from "@hscmap/vue-window";
+//import * as VueWindow from "@hscmap/vue-window";
import VueAwesomeSwiper from "vue-awesome-swiper";
import ToggleButton from 'vue-js-toggle-button';
@@ -24,7 +24,7 @@
Vue.config.productionTip = false;
Vue.mixin(Mixin);
Vue.use(preview);
-Vue.use(VueWindow);
+//Vue.use(VueWindow);
Vue.use(VueAwesomeSwiper as any);
Vue.use(ToggleButton)
Vue.use(ImageShow)
diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue
index 3100947..f951851 100644
--- a/src/views/hashrate/CameraManage/CameraRules/index.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -178,7 +178,9 @@
<!-- 鎽勫儚鏈� -->
<LinkageCameraBox
:cameras="item.cameraIds"
- @addLinkageRule="addLinkageRule(item.cameraIds)"
+ @addLinkageRule="
+ addLinkageRule(item.cameraIds, item.camera_polygons)
+ "
></LinkageCameraBox>
<div class="Anchor" :id="'linkage_camera' + index"></div>
@@ -355,6 +357,7 @@
},
showNewLinkage: false,
newLinkageIds: [],
+ newLinkPlg: null,
// swiperOption: {
// slidesPerView: 5,
@@ -807,7 +810,9 @@
this.showAddBox = true;
},
- addLinkageRule(ids) {
+ addLinkageRule(ids, camera_polygons) {
+ console.log(7979);
+ console.log(camera_polygons);
if (ids.length < 2) {
this.$message({
message: "璇疯嚦灏戦�夋嫨涓ゅ彴鎽勫儚鏈�",
@@ -818,6 +823,7 @@
this.newLinkageIds = ids;
this.ruleType = "linkage";
this.showAddBox = true;
+ this.newLinkPlg = camera_polygons;
},
//鍥炲～鏂扮殑鐙珛鍦烘櫙
@@ -835,6 +841,9 @@
});
} else {
//鑱斿姩鍦烘櫙
+ if (this.newLinkPlg) {
+ newRule.data.camera_polygons = this.newLinkPlg;
+ }
newRule.data.cameraIds = this.newLinkageIds;
this.linkageRule.push(newRule.data);
this.$nextTick(() => {
--
Gitblit v1.8.0