From 829517bc9c6ff792c93be3ddbeff0e4d1dfca648 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 15 九月 2021 17:21:04 +0800
Subject: [PATCH] fix run serve. user npm 7.12.0
---
src/pages/desktop/index/App.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 7babd3b..5925c0d 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'
@@ -29,7 +27,8 @@
},
data() {
return {
- buttonAuthority: sessionStorage.getItem('buttonAuthoritys') || []
+ buttonAuthority: sessionStorage.getItem('buttonAuthoritys') || [],
+ defaultBgUrl:"/images/desktop/background.png"
}
},
computed: {
@@ -47,9 +46,10 @@
}
},
mounted() {
- document.getElementById('app').style.backgroundImage = process.env.VUE_APP_MAIN_URL;
+ // document.getElementById('app').style.backgroundImage = process.env.VUE_APP_MAIN_URL;
+ const url = localStorage.getItem("backgroundPic")
+ document.getElementById('app').style.backgroundImage = `url(${url||this.defaultBgUrl})`
this.showApps();
-
let _that = this;
let msgResp = require("./mock/messages.json")
if (msgResp.success) {
@@ -57,7 +57,6 @@
_that.addMessage(item);
})
}
-
let weather = require("./mock/weather.json")
if (weather.success) {
_that.addWeather(weather.data.data);
@@ -76,9 +75,21 @@
if (e.data.msg == 'AppUpdate') {
this.showApps();
}
+ if (e.data.msg=='checkSN') {
+ debugger
+ this.$refs.desktop.validateSn()
+ }
});
},
methods: {
+ onJumpToDock(name){
+ this.$refs.dock_model.onJumpToDock(name)
+ },
+ onChangeBg(v){
+ document.getElementById('app').style.backgroundImage = "url(" + v + ")"
+ this.defaultBgUrl = v
+ localStorage.setItem("backgroundPic", v)
+ },
showApps() {
let _that = this;
--
Gitblit v1.8.0