From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/desktop/index/components/ToolsEntry.vue | 64 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 4 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index 2caf1af..f4e5e7d 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -12,15 +12,19 @@
<div class="app-icon">
<img :src="dock.src" :alt="dock.alt" />
</div>
- <div class="app-name">{{dock.name}}</div>
+ <div class="app-name">{{dock.title}}</div>
</div>
</div>
+ </div>
+ <div class="logo">
+ <img :src="`${publicPath}images/desktop/desk-logo.png`" alt="">
</div>
</div>
</div>
</template>
<script>
+
export default {
name: 'toolsEntry',
data() {
@@ -28,25 +32,45 @@
publicPath: process.env.BASE_URL,
}
},
+ mounted() {
+ window.addEventListener('message', e => {
+ console.log('msg')
+ if (e.data && e.data.msg) {
+ let msg = e.data.msg;
+ // token 涓嶅悎娉�, 閫�鍑�
+ if (msg === "logout") {
+ location.assign("/");
+ return;
+ }
+
+ // 鎵撳紑妫�绱�, 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)
+ }
+ }
+ })
+ },
methods: {
dockClick(dock) {
- debugger
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,
- title: dock.name,
+ title: dock.title,
url: dock.url
});
- debugger
this.$store.commit('desktop/addMinDock', {
id: dock.id,
src: dock.src,
alt: dock.title,
type: "3",
highlight: true,
+ url: dock.url,
+ screenshot: ''
});
} else if (dock.type === '2' && dock.isOpen) {
this.$store.commit('desktop/resetMinFrame', dock.id);
@@ -63,6 +87,34 @@
}
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) {
+ dock = app;
+ }
+ });
+
+ if (dock.isOpen) {
+ this.$store.dispatch('desktop/closeFrame', dock);
+ }
+ this.$store.dispatch('desktop/addFrame', {
+ id: dock.id,
+ 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: ''
+ });
+ }
}
};
</script>
@@ -110,6 +162,10 @@
}
}
}
+ .logo{
+ text-align: right;
+ padding-right: 50px;
+ }
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0