From 21a340c24815a55a07db2dc3d2e5a19e7de440cd Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 29 八月 2020 19:27:57 +0800
Subject: [PATCH] 添加摄像机区域管理应用
---
src/pages/desktop/index/components/ToolsEntry.vue | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index a18dc4f..36a0fc3 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -33,6 +33,7 @@
},
mounted() {
window.addEventListener('message', e => {
+ console.log('msg')
if (e.data && e.data.msg) {
let msg = e.data.msg;
// token 涓嶅悎娉�, 閫�鍑�
@@ -43,6 +44,7 @@
// 鎵撳紑妫�绱�, toSearch?showType=findByPic&targetId=108ba0bc-b0a1-433d-8e1e-d5d2e712b53b&picSmUrl=192.168.20.10:6700/47628,7cc869f3a9c714&compType=1
if (msg.indexOf("toSearch") >= 0) {
+ console.log('msg,search')
let params = msg.substring(7);
this.addFrameByName("search", params)
}
@@ -54,6 +56,7 @@
if (dock.type === '1') {
window.open(dock.url);
} else if (dock.type === '2' && !dock.isOpen) {
+
this.$store.dispatch('desktop/addFrame', {
id: dock.id,
icon: dock.src,
@@ -66,7 +69,15 @@
alt: dock.title,
type: "3",
highlight: true,
+ url: dock.url,
+ screenshot: ''
});
+ //鎵撳紑搴旂敤鍚庡紓姝ユ姄鎷�,涔嬪悗鐨勬姄鎷嶉噰鐢ㄨ繖寮犲浐瀹氱殑
+ //if(dock.name=='cameraVideo'||dock.name=='search'||dock.name=='library'||dock.name=='cameraAccess'||dock.name=='dataStack'){
+ setTimeout(()=>{
+ this.$parent.screenShot(dock);
+ },1500)
+ //}
} else if (dock.type === '2' && dock.isOpen) {
this.$store.commit('desktop/resetMinFrame', dock.id);
}
@@ -83,6 +94,7 @@
dockMask.style.width = dockItems.length * 60 + 40 + 'px';
},
addFrameByName(name, params) {
+
let dock = null;
this.$store.state.desktop.docks.forEach(app => {
if (app.name === name) {
@@ -98,6 +110,15 @@
icon: dock.src,
title: dock.title,
url: dock.url + "?" + params
+ });
+ this.$store.commit('desktop/addMinDock', {
+ id: dock.id,
+ src: dock.src,
+ alt: dock.title,
+ type: "3",
+ highlight: true,
+ url: dock.url,
+ screenshot: ''
});
}
}
@@ -150,6 +171,11 @@
.logo{
text-align: right;
padding-right: 50px;
+ user-select: none;
+ img{
+ user-select: none;
+ -webkit-user-drag: none;
+ }
}
}
}
--
Gitblit v1.8.0