From 36ab943813e8874446e71a0ba1126d86e439a27a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 27 七月 2020 17:43:12 +0800
Subject: [PATCH] app: 添加实时监控
---
src/pages/desktop/index/App.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index b58209a..d87fecd 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -1,9 +1,9 @@
<template>
<div id="app">
<tools></tools>
- <preference></preference>
<desktop></desktop>
- <dock ref="dock_model"></dock>
+ <tools-entry ref="dock_model"></tools-entry>
+ <!-- <dock ref="dock_model"></dock> -->
<notice-tip ref="notice_tip_model"></notice-tip>
<notification-center></notification-center>
</div>
@@ -16,12 +16,13 @@
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, Dock, Preference, NotificationCenter, NoticeTip, Tools, ToolsEntry
},
mounted() {
document.getElementById('app').style.backgroundImage = process.env.VUE_APP_MAIN_URL;
@@ -33,9 +34,9 @@
});
}
- setTimeout(function () {
- _that.$refs.dock_model.initDockItem();
- }, 100);
+ // setTimeout(function () {
+ // _that.$refs.dock_model.initDockItem();
+ // }, 100);
// axios.get(process.env.VUE_APP_USER_DATA_URL).then(function (res) {
// });
@@ -113,6 +114,14 @@
width: 100%;
height: 100%;
background-size: 100% 100%;
- background-image: url("../../../assets/img/desktop/main.jpg");
+ background-image: url("../../../assets/img/desktop/desktop.png");
+ background-attachment: fixed;
+}
+
+.clearFix:after{
+ content: '';
+ display: block;
+ height: 0;
+ clear: both;
}
</style>
--
Gitblit v1.8.0