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 | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue index f4e5e7d..36a0fc3 100644 --- a/src/pages/desktop/index/components/ToolsEntry.vue +++ b/src/pages/desktop/index/components/ToolsEntry.vue @@ -24,7 +24,6 @@ </template> <script> - export default { name: 'toolsEntry', data() { @@ -57,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, @@ -72,6 +72,12 @@ 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); } @@ -88,7 +94,7 @@ dockMask.style.width = dockItems.length * 60 + 40 + 'px'; }, addFrameByName(name, params) { - debugger + let dock = null; this.$store.state.desktop.docks.forEach(app => { if (app.name === name) { @@ -165,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