From 773134bc5889cbfa8e570f012220a451ce2e6622 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 27 十月 2020 16:36:39 +0800
Subject: [PATCH] 修改国标端口校验规则
---
src/pages/desktop/index/components/ToolsEntry.vue | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index f4e5e7d..13de460 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -2,12 +2,7 @@
<div class="tools-entry">
<div class="entry-wrap">
<div class="app-list clearFix">
- <div
- class="app"
- v-for="dock in this.$store.state.desktop.docks"
- :key="dock.id"
- @click="dockClick(dock)"
- >
+ <div class="app" v-for="dock in stateDocks" :key="dock.id" @click="dockClick(dock)">
<div class="wrap">
<div class="app-icon">
<img :src="dock.src" :alt="dock.alt" />
@@ -17,24 +12,29 @@
</div>
</div>
<div class="logo">
- <img :src="`${publicPath}images/desktop/desk-logo.png`" alt="">
+ <img :src="`${publicPath}images/desktop/desk-logo.png`" alt />
</div>
</div>
</div>
</template>
<script>
-
export default {
name: 'toolsEntry',
data() {
return {
publicPath: process.env.BASE_URL,
+ loading: true,
+ localApps: []
+ }
+ },
+ computed: {
+ stateDocks() {
+ return this.$store.state.desktop.docks
}
},
mounted() {
window.addEventListener('message', e => {
- console.log('msg')
if (e.data && e.data.msg) {
let msg = e.data.msg;
// token 涓嶅悎娉�, 閫�鍑�
@@ -45,18 +45,19 @@
// 鎵撳紑妫�绱�, 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) {
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 +73,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 +95,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) {
@@ -147,6 +154,20 @@
margin-right: -3px;
}
}
+ .el-loading-mask {
+ border-radius: 8px;
+ }
+ .el-loading-spinner {
+ top: 20px;
+ }
+ .el-loading-spinner .path {
+ stroke: #78adf7;
+ }
+ .el-loading-spinner .el-loading-text {
+ line-height: 1;
+ margin-top: -30px;
+ color: #78adf7;
+ }
.app-name {
padding-top: 10px;
text-align: center;
@@ -162,9 +183,14 @@
}
}
}
- .logo{
+ .logo {
text-align: right;
padding-right: 50px;
+ user-select: none;
+ img {
+ user-select: none;
+ -webkit-user-drag: none;
+ }
}
}
}
--
Gitblit v1.8.0