From f5a0751be938eefbd3c327fd50b9234f49b98440 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 04 八月 2020 14:49:33 +0800
Subject: [PATCH] 修改iconfont 引入方式,添加到index.html
---
src/pages/desktop/index/App.vue | 53 ++++++++++++++++-------------------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index b58209a..9917b26 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -1,9 +1,8 @@
<template>
<div id="app">
<tools></tools>
- <preference></preference>
<desktop></desktop>
- <dock ref="dock_model"></dock>
+ <tools-entry ref="dock_model"></tools-entry>
<notice-tip ref="notice_tip_model"></notice-tip>
<notification-center></notification-center>
</div>
@@ -11,17 +10,16 @@
<script>
import Desktop from './components/Desktop';
-import Dock from './components/Dock';
-import Preference from './components/Preference';
import NotificationCenter from './components/NotificationCenter';
import NoticeTip from './components/NoticeTip';
import Tools from './components/Tools';
+import ToolsEntry from './components/ToolsEntry';
import axios from 'axios'
export default {
name: 'app',
components: {
- Desktop, Dock, Preference, NotificationCenter, NoticeTip, Tools
+ Desktop, NotificationCenter, NoticeTip, Tools, ToolsEntry
},
mounted() {
document.getElementById('app').style.backgroundImage = process.env.VUE_APP_MAIN_URL;
@@ -33,54 +31,27 @@
});
}
- setTimeout(function () {
- _that.$refs.dock_model.initDockItem();
- }, 100);
- // axios.get(process.env.VUE_APP_USER_DATA_URL).then(function (res) {
-
- // });
-
let msgResp = require("./mock/messages.json")
if (msgResp.success) {
msgResp.data.forEach(function (item) {
_that.addMessage(item);
})
}
- // axios.get(process.env.VUE_APP_MESSAGE_URL).then(function (res) {
-
- // });
let weather = require("./mock/weather.json")
if (weather.success) {
_that.addWeather(weather.data.data);
}
- // axios.get(process.env.VUE_APP_WEATHER_URL).then(function (res) {
-
- // });
-
- setTimeout(function () {
- _that.addMessage({
- id: 'N1',
- icon: 'images/frost.png',
- tip: '鍒嗗竷寮忎换鍔¤皟搴�',
- title: '榛樿璐﹀彿',
- body: '璐﹀彿锛歠rost 瀵嗙爜锛歠rost',
- time: new Date()
- }, true);
- }, 3000);
-
setTimeout(function () {
_that.addMessage({
id: 'N2',
- icon: 'images/message.png',
+ icon: '/images/desktop/message.png',
tip: '娑堟伅',
- title: '瀹樻柟QQ',
- body: '1106088328',
+ title: 'SmartAi',
+ body: 'v1.0.0',
time: new Date()
}, true);
- }, 6000);
-
- console.log(this.$store.state.desktop)
+ }, 1000);
},
methods: {
addMessage: function (message, ding) {
@@ -113,6 +84,14 @@
width: 100%;
height: 100%;
background-size: 100% 100%;
- background-image: url("../../../assets/img/desktop/main.jpg");
+ background-image: url("/images/desktop/background.png");
+ background-attachment: fixed;
+}
+
+.clearFix:after {
+ content: "";
+ display: block;
+ height: 0;
+ clear: both;
}
</style>
--
Gitblit v1.8.0