From 959895b80e8915cacb17e4f36830254c6c271572 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期二, 16 三月 2021 18:32:22 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/desktop/index/components/ToolsEntry.vue | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index cbc5e4f..eefc72f 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -64,6 +64,8 @@
<script>
import draggable from "vuedraggable"
import { findAllSdk } from '@/api/taskMange';
+import {chunkArr} from '@/scripts/util';
+import bus from '@/plugin/bus'
export default {
name: 'toolsEntry',
components: { draggable },
@@ -84,7 +86,7 @@
title: '浜哄憳璺熻釜'
}
],
- rowSize: 3,
+ //rowSize: 3,
badgeNum: 0,
}
},
@@ -100,14 +102,23 @@
let arr = null;
//鏍规嵁灞忓箷楂樺害鏉ュ垽鏂槸灞曠ず3鎺掕繕鏄�4鎺� 闃堝��:970
if (window.innerHeight >= 930) {
- this.rowSize = 4;
+ //this.rowSize = 4;
arr = this.chunk(tempArr, 24);
+ //arr = chunkArr(tempArr,24);
} else {
- this.rowSize = 3;
+ //this.rowSize = 3;
arr = this.chunk(tempArr, 18);
+ //arr = chunkArr(tempArr, 18);
}
console.log(arr)
return arr
+ },
+ rowSize (){
+ if (window.innerHeight >= 930) {
+ return 4;
+ }else{
+ return 3;
+ }
}
},
mounted () {
@@ -126,6 +137,12 @@
if (msg.indexOf("toSearch") >= 0) {
let params = msg.substring(7);
this.addFrameByName("search", params)
+ }
+
+ if (msg.indexOf("toOpenApp") >= 0) {
+ let id = msg.substring(10);
+ console.log(id);
+ this.addFrameByID(id)
}
}
});
@@ -153,7 +170,9 @@
console.log(e)
})
},
+
dockClick (dock) {
+
if (dock.type === '1') {
window.open(dock.url);
} else if (dock.type === '2' && !dock.isOpen) {
@@ -195,7 +214,6 @@
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) {
@@ -221,6 +239,20 @@
url: dock.url,
screenshot: ''
});
+ },
+ addFrameByID (id, params) {
+
+ let dock = null;
+ let toClose = null
+ this.$store.state.desktop.docks.forEach(app => {
+ if (app.id == id) {
+ dock = app;
+ }
+ if(app.name=="algorithmManage"){
+ toClose = app
+ }
+ });
+ this.dockClick(dock)
}
}
};
--
Gitblit v1.8.0