From a7fe0fb538bfb09ae50e58c12aa5fb57d83fb6bd Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 18 十一月 2021 10:11:13 +0800
Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus
---
src/pages/desktop/index/App.vue | 75 +++++++++++++++++--------------------
1 files changed, 34 insertions(+), 41 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 9b48ad9..922813d 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -1,8 +1,8 @@
<template>
<div id="app" @contextmenu.prevent>
- <tools></tools>
- <desktop></desktop>
- <tools-entry ref="dock_model"></tools-entry>
+ <tools @jumpToDock="onJumpToDock"></tools>
+ <desktop ref="desktop"></desktop>
+ <tools-entry @changeBackground="onChangeBg" ref="dock_model"></tools-entry>
<notice-tip ref="notice_tip_model"></notice-tip>
<notification-center></notification-center>
</div>
@@ -15,10 +15,8 @@
import NoticeTip from './components/NoticeTip';
import Tools from './components/Tools';
import ToolsEntry from './components/ToolsEntry';
-import axios from 'axios'
import { getApps } from '@/api/app'
-import { findAllSdk } from '@/api/taskMange'
import config from '../../../../package.json'
@@ -27,13 +25,14 @@
components: {
Desktop, NotificationCenter, NoticeTip, Tools, ToolsEntry
},
- data () {
+ data() {
return {
- buttonAuthority: sessionStorage.getItem('buttonAuthoritys') || []
+ buttonAuthority: sessionStorage.getItem('buttonAuthoritys') || [],
+ // defaultBgUrl:"/images/desktop/background.png"
}
},
computed: {
- isAdmin () {
+ isAdmin() {
if (
sessionStorage.getItem('userInfo') &&
sessionStorage.getItem('userInfo') !== ''
@@ -44,12 +43,14 @@
)
}
return false
+ },
+ defaultBgUrl(){
+ return JSON.parse(sessionStorage.getItem('userInfo')).backgroundpic
}
},
- mounted () {
- document.getElementById('app').style.backgroundImage = process.env.VUE_APP_MAIN_URL;
+ mounted() {
+ document.getElementById('app').style.backgroundImage = `url(${this.defaultBgUrl || "/images/desktop/background.png"})`
this.showApps();
-
let _that = this;
let msgResp = require("./mock/messages.json")
if (msgResp.success) {
@@ -57,7 +58,6 @@
_that.addMessage(item);
})
}
-
let weather = require("./mock/weather.json")
if (weather.success) {
_that.addWeather(weather.data.data);
@@ -68,7 +68,7 @@
icon: '/images/desktop/message.png',
tip: '娑堟伅',
title: 'SmartAI',
- body: config.version,
+ body: 'V' + config.version,
time: new Date()
}, true);
}, 1000);
@@ -76,40 +76,33 @@
if (e.data.msg == 'AppUpdate') {
this.showApps();
}
+ if (e.data.msg=='checkSN') {
+ debugger
+ this.$refs.desktop.validateSn()
+ }
+ if (e.data.msg === 'changeColor') {
+ const iframeArr = document.querySelectorAll("iframe")
+ iframeArr.forEach(item=>{
+ item.contentWindow.postMessage({msg:'changeColor',color:e.data.color},"*")
+ })
+ }
});
},
methods: {
- showApps () {
+ onJumpToDock(name){
+ this.$refs.dock_model.onJumpToDock(name)
+ },
+ onChangeBg(v){
+ document.getElementById('app').style.backgroundImage = "url(" + v + ")"
+ },
+ showApps() {
let _that = this;
getApps().then(rsp => {
if (rsp && rsp.success) {
_that.$store.state.desktop.docks = [];
let installedApps = [];
- let testObj = {
- id: 'tjcxjq',
- create_by: 'test',
- create_time: '',
- height: 675,
- icon: '../../images/app-mid/search.png',
- installed: true,
- isDelete: 0,
- isUpgrade: false,
- title: '缁熻鏌ヨ(闆嗙兢)',
- name: '缁熻鏌ヨ(闆嗙兢)',
- remoteVersion: '',
- type: '2',
- update_by: '',
- update_time: '',
- url: "/view/searchForCluster/",
- version: '1.0.0',
- width: 1344,
- isDefault: false
- };
-
- console.log(rsp.data);
- rsp.data.push(testObj);
-
+ rsp.data
rsp.data.forEach(function (item) {
if (item.installed) {
let temp = {
@@ -157,7 +150,7 @@
addWeather: function (weather) {
this.$store.commit('desktop/addWeather', weather);
},
- screenShot (dock) {
+ screenShot(dock) {
//鎵惧埌褰撳墠鐨刬frame
let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(dock.url) >= 0);
//淇濆瓨褰撳墠搴旂敤蹇収
@@ -203,12 +196,12 @@
width: 100%;
height: 100%;
background-size: 100% 100%;
- background-image: url('/images/desktop/background.png');
+ background-image: url("/images/desktop/background.png");
background-attachment: fixed;
}
.clearFix:after {
- content: '';
+ content: "";
display: block;
height: 0;
clear: both;
--
Gitblit v1.8.0