From a5e8ef032f149ac7a3827169a8affa8ecd4cb4f9 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 19 八月 2020 18:06:51 +0800
Subject: [PATCH] 打开应用异步抓取快照去掉最小化快照,应用中心界面调整,初始应用窗口计算修改
---
src/pages/ai/index/App.vue | 61 +++++------
src/pages/desktop/index/store/modules/desktop.js | 11 +-
src/pages/desktop/index/components/ToolsEntry.vue | 10 +
src/components/cardWindow.vue | 1
src/pages/search/index/Searching.vue | 25 +++++
src/pages/desktop/index/components/DFrame.vue | 69 ++++++++-----
src/pages/settings/components/BasicSetting.vue | 12 ++
src/pages/desktop/index/App.vue | 27 +++++
src/pages/desktop/index/components/Tools.vue | 38 +------
9 files changed, 152 insertions(+), 102 deletions(-)
diff --git a/src/components/cardWindow.vue b/src/components/cardWindow.vue
index d862113..e752779 100644
--- a/src/components/cardWindow.vue
+++ b/src/components/cardWindow.vue
@@ -49,6 +49,7 @@
</div>
</template>
<script>
+import bus from '@/plugin/bus'
import ModelCard from '@/components/subComponents/ModelCard'
export default {
name: 'cardWindow',
diff --git a/src/pages/ai/index/App.vue b/src/pages/ai/index/App.vue
index 1917651..0c1a640 100644
--- a/src/pages/ai/index/App.vue
+++ b/src/pages/ai/index/App.vue
@@ -46,16 +46,23 @@
</div>
<div class="wrap-box" v-for="(item) in installedList" :key="item.id">
<div class="list-choose-item-left">
- <div class="mask" v-if="!item.isEdit">
+ <!-- <div class="mask" v-if="!item.isEdit">
<el-button
@click="commandAlgLib(item)"
type="primary"
class="bot-btn"
>缂栬緫鍚嶇О</el-button>
- </div>
+ </div> -->
<div class="list-complete-item-handle">
<!-- <span :class="`iconfont ${item.icon}`" style="font-size:3rem;"></span> -->
<div class="svg-wrap">
+ <div class="mask" v-if="!item.isEdit">
+ <el-button
+ @click="commandAlgLib(item)"
+ type="primary"
+ class="bot-btn"
+ >缂栬緫鍚嶇О</el-button>
+ </div>
<!-- <svg class="icon" aria-hidden="true" style="font-size:7rem;">
<use :xlink:href="`#${item.icon}`" />
</svg>-->
@@ -1161,7 +1168,8 @@
}
}
.src-title{
- color: #333;
+ //color: #bfbfbf;
+ color: #bbcee8;
font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC';
font-weight: 650;
font-style: normal;
@@ -1250,7 +1258,7 @@
}
}
.task-list {
- background: #fff;
+ background: #fdfdfd;
padding: 20px;
box-sizing: border-box;
@@ -1258,36 +1266,14 @@
display: flex;
flex-direction: row;
flex-wrap: wrap;
- // justify-content: space-around;
- // align-content: space-around;
- // &:after {
- // content: "";
- // flex: auto;
- // }
.wrap-box {
width: 16.66%;
}
.list-choose-item-left {
- // width: 220px;
- // height: 214px;
width: 80%;
height: auto;
margin: auto;
margin-bottom: 30px;
- // @media screen and(min-width: 1895px) {
- // //margin: 20px 25px 20px 20px;
- // width: 230px;
- // height: 224px;
- // }
- // @media screen and(min-width: 1695px) and(max-width:1895px ) {
- // margin: 20px 10px 20px 15px;
- // }
- // @media screen and(min-width: 1460px) and(max-width: 1695px) {
- // margin: 20px 25px 20px 20px;
- // }
- // @media screen and(max-width: 1460px) {
- // margin: 20px 15px 20px 10px;
- // }
}
}
}
@@ -1680,8 +1666,8 @@
// height: 214px;
transition: all 1s;
background: #ffffff;
- border: 1px solid #e2e2e2;
- box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.07);
+ //border: 1px solid #e2e2e2;
+ //box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.07);
border-radius: 4px;
p {
display: none;
@@ -1701,6 +1687,7 @@
.mask {
display: flex;
align-items: flex-end;
+ top: 0;
.bot-btn {
flex: 1;
}
@@ -1816,11 +1803,12 @@
color: #222222;
}
.alg-name {
- margin-top: 12px;
+ //margin-top: 12px;
line-height: 36px;
font-family: PingFangSC-Regular;
- font-size: 15px;
- color: #222222;
+ font-size: 14px;
+ letter-spacing: 0.05em;
+ color: #3e4664;
// background-color: #ecf5ff;
.el-input {
position: relative;
@@ -1852,13 +1840,16 @@
}
.list-complete-item-handle {
height: 100%;
- padding-bottom: 10px;
+ //padding-bottom: 10px;
text-align: center;
.svg-wrap {
- width: 80%;
+ //width: 80%;
+ width: 100%;
margin: auto;
padding-top: 80%;
+ padding-top: 100%;
position: relative;
+ box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.07);
svg {
position: absolute;
top: 50%;
@@ -1866,11 +1857,13 @@
transform: translate(-50%, -50%);
}
.baseImg {
- width: 60%;
+ width: 56%;
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
+ max-width: 106px;
+ max-height: 106px;
}
}
}
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 73741ab..5a5251e 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -9,6 +9,7 @@
</template>
<script>
+import html2canvas from 'html2canvas';
import Desktop from './components/Desktop';
import NotificationCenter from './components/NotificationCenter';
import NoticeTip from './components/NoticeTip';
@@ -64,6 +65,32 @@
},
addWeather: function (weather) {
this.$store.commit('desktop/addWeather', weather);
+ },
+ screenShot(dock){
+ //鎵惧埌褰撳墠鐨刬frame
+ let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(dock.url) >= 0);
+ //淇濆瓨褰撳墠搴旂敤蹇収
+ html2canvas(curIframe.contentWindow.document.body, {
+ dpi: window.devicePixelRatio * 4,
+ logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
+ removeContainer: true,
+ imageTimeout: 0,
+ useCORS: true, //寮�鍚法鍩熼厤缃�
+ //allowTaint: true
+ }).then(canvas => {
+ let shotSrc = canvas.toDataURL();
+ // this.$store.commit('desktop/addMinDock', {
+ // id: dock.id,
+ // src: dock.icon,
+ // alt: dock.title,
+ // type: "3",
+ // screenshot: shotSrc
+ // });
+ this.$store.commit('desktop/shotscreen', {id:dock.id, src:shotSrc});
+
+ }).catch(e => {
+ this.$store.commit('desktop/shotscreen', {id:dock.id, src:''});
+ });
}
}
}
diff --git a/src/pages/desktop/index/components/DFrame.vue b/src/pages/desktop/index/components/DFrame.vue
index 2b3f22d..3c5fe82 100644
--- a/src/pages/desktop/index/components/DFrame.vue
+++ b/src/pages/desktop/index/components/DFrame.vue
@@ -107,37 +107,48 @@
this.$store.commit('desktop/refreshFrame', this.data);
},
minFrame(data, e) {
- debugger
+
+ //if(data.name=='cameraVideo'||data.name=='search'||data.name=='library'||data.name=='cameraAccess'||data.name=='dataStack'){
+ //let shotSrc = canvas.toDataURL();
+ this.$store.commit('desktop/addMinDock', {
+ id: this.data.id,
+ src: this.data.icon,
+ alt: this.data.title,
+ type: "3",
+ //screenshot: shotSrc
+ });
+ return false;
+ //}
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(data.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
- html2canvas(curIframe.contentWindow.document.body, {
- dpi: window.devicePixelRatio * 4,
- logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
- removeContainer: true,
- imageTimeout: 0,
- useCORS: true, //寮�鍚法鍩熼厤缃�
- //allowTaint: true
- }).then(canvas => {
- let shotSrc = canvas.toDataURL();
- this.$store.commit('desktop/addMinDock', {
- id: this.data.id,
- src: this.data.icon,
- alt: this.data.title,
- type: "3",
- screenshot: shotSrc
- });
- }).catch(e=>{
- console.log(e);
- this.$store.commit('desktop/addMinDock', {
- id: this.data.id,
- src: this.data.icon,
- alt: this.data.title,
- type: "3",
- screenshot: ''
- });
- });
- return false;
+ // html2canvas(curIframe.contentWindow.document.body, {
+ // dpi: window.devicePixelRatio * 4,
+ // logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
+ // removeContainer: true,
+ // imageTimeout: 0,
+ // useCORS: true, //寮�鍚法鍩熼厤缃�
+ // //allowTaint: true
+ // }).then(canvas => {
+ // let shotSrc = canvas.toDataURL();
+ // this.$store.commit('desktop/addMinDock', {
+ // id: this.data.id,
+ // src: this.data.icon,
+ // alt: this.data.title,
+ // type: "3",
+ // screenshot: shotSrc
+ // });
+ // }).catch(e=>{
+ // console.log(e);
+ // this.$store.commit('desktop/addMinDock', {
+ // id: this.data.id,
+ // src: this.data.icon,
+ // alt: this.data.title,
+ // type: "3",
+ // screenshot: ''
+ // });
+ // });
+ //return false;
//this.refreshDock();
},
refreshDock: function () {
@@ -240,6 +251,7 @@
border-top: 1px solid #d0d0d0;
border-left: 1px solid #d0d0d0;
border-right: 1px solid #d0d0d0;
+
}
.iframe-mask{
position: absolute;
@@ -327,6 +339,7 @@
height: calc(100% - 30px);
border-radius: 0 0 4px 4px;
background-color: #fff;
+
}
.d-frame-content iframe {
diff --git a/src/pages/desktop/index/components/Tools.vue b/src/pages/desktop/index/components/Tools.vue
index 81393fd..e75d173 100644
--- a/src/pages/desktop/index/components/Tools.vue
+++ b/src/pages/desktop/index/components/Tools.vue
@@ -12,7 +12,7 @@
</div>
</div>
<div class="tools-middle">
- <div v-for="dock in $store.state.desktop.minDocks" :key="dock.id" class="dock-item-wrap" :class="{'actived':dock.highlight}" @mouseover="screenShot(dock)">
+ <div v-for="dock in $store.state.desktop.minDocks" :key="dock.id" class="dock-item-wrap" :class="{'actived':dock.highlight}" >
<a @click="dockClick(dock)">
<img class="dock-item" :src="dock.src" :alt="dock.alt" />
<img class="dock-shot" :src="dock.screenshot" v-if="dock.screenshot"/>
@@ -77,7 +77,7 @@
// '$store.state.desktop.frames':{
// handler(n,o){
// if(n){
- // debugger;
+ // ;
// n.forEach((item,index) => {
// if(item.order >= this.maxOrder){
// this.maxOrderOne = item.id;
@@ -111,7 +111,7 @@
togglePreference() {
//this.$store.commit("desktop/togglePreference");
//鏄剧ず妗岄潰,鏈�灏忓寲宸叉墦寮�鐨勫簲鐢�
- debugger;
+ ;
this.$store.state.desktop.frames.forEach(frame => {
this.$store.commit('desktop/addMinDock', {
id: frame.id,
@@ -123,7 +123,7 @@
})
},
dockClick(dock) {
- debugger
+
if (dock.type === "1") {
window.open(dock.url);
} else if (dock.type === "2") {
@@ -136,37 +136,13 @@
} else if (dock.type === "3") {
this.$store.commit("desktop/resetMinFrame", dock.id);
//鐐瑰嚮鐨刬frame缃《骞堕珮浜�
- debugger
this.$store.commit("desktop/refreshFrame", dock);
}
},
- screenShot(dock){
- debugger
- //鎵惧埌褰撳墠鐨刬frame
- let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(dock.url) >= 0);
- //淇濆瓨褰撳墠搴旂敤蹇収
- html2canvas(curIframe.contentWindow.document.body, {
- dpi: window.devicePixelRatio * 4,
- logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼
- removeContainer: true,
- imageTimeout: 0,
- useCORS: true, //寮�鍚法鍩熼厤缃�
- //allowTaint: true
- }).then(canvas => {
- let shotSrc = canvas.toDataURL();
- // this.$store.commit('desktop/addMinDock', {
- // id: dock.id,
- // src: dock.icon,
- // alt: dock.title,
- // type: "3",
- // screenshot: shotSrc
- // });
- this.$store.commit('desktop/shotscreen', {id:dock.id, src:shotSrc});
-
- }).catch(e => {
- this.$store.commit('desktop/shotscreen', {id:dock.id, src:''});
- });
+ toolHover(dock){
+ //this.$parent.screenShot(dock)
},
+
toLogout(){
this.$confirm("鎻愮ず锛氱‘瀹氶��鍑哄悧锛�", {
center: true,
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index f4e5e7d..89d8f14 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) {
diff --git a/src/pages/desktop/index/store/modules/desktop.js b/src/pages/desktop/index/store/modules/desktop.js
index ed18975..98327d8 100644
--- a/src/pages/desktop/index/store/modules/desktop.js
+++ b/src/pages/desktop/index/store/modules/desktop.js
@@ -97,8 +97,7 @@
//璇诲彇褰撳墠灞忓箷鍒嗚鲸鐜�
console.log(window.screen.availWidth);
console.log(window.screen.availHeight);
-
- debugger;
+ dframe.name = curDframe.name;
dframe.width = curDframe.width;
dframe.height = curDframe.height;
//鏍规嵁鍒嗚鲸鐜囧姩鎬佽皟鏁�(鎽勫儚鏈洪厤缃�,鏁版嵁鏍堥厤缃�,姣斿搴撶鐞�,绠楀姏绠＄悊,瀹炴椂鐩戞帶)
@@ -106,8 +105,8 @@
let ratio = curDframe.width/curDframe.height;
if(curDframe.name == 'cameraAccess' || curDframe.name == 'dataStack' || curDframe.name == 'library' || curDframe.name == 'analysisPower' || curDframe.name == 'cameraVideo'){
//澶勭悊瀵屼綑楂樺害澶т簬140鐨勭獥鍙�
- if(window.screen.availHeight - curDframe.height > 140){
- dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height;
+ if(window.screen.availHeight - curDframe.height > 120){
+ dframe.height = (window.screen.availHeight - curDframe.height)/2 + curDframe.height - 50;
dframe.width = dframe.height*ratio;
}
}
@@ -117,6 +116,7 @@
state.framesOrder = order;
state.framesOffset = offset;
+ debugger
state.frames.push(dframe);
return true;
@@ -140,7 +140,7 @@
minOne.highlight = false;
debugger
- minOne.screenshot = dock.screenshot;
+ minOne.screenshot = dock.screenshot?dock.screenshot:minOne.screenshot;
//鎵惧埌minDocks鏈�杩戞墦寮�鐨勭姸鎬乮sShow涓簍rue鐨刣ock缃负楂樹寒
let minLen = state.minDocks.length;
for(var i = minLen-1; i >= 0; i--){
@@ -177,7 +177,6 @@
state.notificationCenterVisible = visible;
},
closeFrame: (state, item) => {
- debugger
state.frames.find(function (it, idx) {
if (it.id === item.id) {
state.frames.splice(idx, 1);
diff --git a/src/pages/search/index/Searching.vue b/src/pages/search/index/Searching.vue
index 5fee51a..cfbaa35 100644
--- a/src/pages/search/index/Searching.vue
+++ b/src/pages/search/index/Searching.vue
@@ -275,6 +275,9 @@
this.TreeDataPool.fetchTreeData();
},
mounted() {
+ debugger
+ //this.isShowUpload();
+ console.log('search mounted')
this.$nextTick(() => {
let scrollContain = this.$refs.scrollContain
this.VideoPhotoData.scrollContainDom = scrollContain
@@ -453,6 +456,28 @@
}
},
methods: {
+ isShowUpload(){
+ console.log('isShowUpload',this.VideoPhotoData.uploadDiaplay)
+ this.getHeight();
+ console.log("upload鐨勫�兼槸锛�", this.VideoPhotoData.uploadDiaplay)
+ if (this.VideoPhotoData.uploadDiaplay) {
+ if (!this.VideoPhotoData.uploadType) {
+ console.log("uploadDisplay涓殑鍒锋柊");
+ let scrollContain = this.$refs.scrollContain
+ this.VideoPhotoData.scrollContainDom = scrollContain
+ this.VideoPhotoData.showType = "search";
+ // this.VideoPhotoData.querySearchList();
+ //this.setLoadSearch(this.VideoPhotoData.querySearchList());
+ this.isDisabled = false;
+ } else {
+ //this.VideoPhotoData.scrollContainDom = '';
+ this.VideoPhotoData.showType = "findByPic";
+ }
+ } else {
+ this.VideoPhotoData.uploadType = false;
+ this.VideoPhotoData.showType = "search";
+ }
+ },
resizeWidth(w) {
this.defaultWidth = w;
},
diff --git a/src/pages/settings/components/BasicSetting.vue b/src/pages/settings/components/BasicSetting.vue
index a862654..34573a2 100644
--- a/src/pages/settings/components/BasicSetting.vue
+++ b/src/pages/settings/components/BasicSetting.vue
@@ -76,7 +76,7 @@
<template slot="title">
<b class="tree-font">璇︾粏淇℃伅</b>
</template>
- <el-menu-item-group class="item-group">
+ <el-menu-item-group class="item-group desc-info">
<el-row :gutter="gutter">
<el-col :span="12" class="flex-box">
<div class="xiangqin-label">ID</div>
@@ -933,6 +933,16 @@
width: 300px;
}
}
+.desc-info{
+ margin-bottom: 14px;
+ .flex-box{
+ height: 40px;
+ line-height: 40px;
+ .xiangqin-label{
+ width: 80px;
+ }
+ }
+}
.menu-css,
.el-menu {
border-right: none;
--
Gitblit v1.8.0