From 98a6297b10a4b97c3022f84d3ba7908c178d9ee0 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期二, 20 十月 2020 10:30:10 +0800
Subject: [PATCH] 应用中心安装提示bug修复
---
src/pages/desktop/index/components/ToolsEntry.vue | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index f4e5e7d..8ffbfc7 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -4,15 +4,15 @@
<div class="app-list clearFix">
<div
class="app"
- v-for="dock in this.$store.state.desktop.docks"
+ v-for="dock in stateDocks"
:key="dock.id"
@click="dockClick(dock)"
>
<div class="wrap">
- <div class="app-icon">
+ <div class="app-icon" >
<img :src="dock.src" :alt="dock.alt" />
</div>
- <div class="app-name">{{dock.title}}</div>
+ <div class="app-name" >{{dock.title}}</div>
</div>
</div>
</div>
@@ -24,12 +24,18 @@
</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() {
@@ -50,13 +56,15 @@
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 +80,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 +102,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 +161,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;
@@ -165,6 +193,11 @@
.logo{
text-align: right;
padding-right: 50px;
+ user-select: none;
+ img{
+ user-select: none;
+ -webkit-user-drag: none;
+ }
}
}
}
--
Gitblit v1.8.0