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/components/Tools.vue | 173 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 62 deletions(-) diff --git a/src/pages/desktop/index/components/Tools.vue b/src/pages/desktop/index/components/Tools.vue index 385e1d2..b02a46b 100644 --- a/src/pages/desktop/index/components/Tools.vue +++ b/src/pages/desktop/index/components/Tools.vue @@ -1,59 +1,45 @@ <template> <div class="tools"> - <div class="center"> - <div class="tools-left"> - <div - :class="['tools-icon', {clicked:this.$store.state.desktop.preferenceVisiable}]" - @click="togglePreference()" - > - <img class="system" :src="`${publicPath}images/header-icon/system.png`" /> - <!-- <span class="fa fa-apple"></span> --> - </div> - <div class="tools-icon" @click="openSafari()"> - <!-- <span class="fa fa-safari"></span> --> - <img class="smart-ai" :src="`${publicPath}images/header-icon/SmartAI.png`" alt=""> - </div> + <div class="tools-left"> + <div + :class="['tools-icon','tools-show-desktop', {clicked:this.$store.state.desktop.preferenceVisiable}]" + @click="togglePreference()" + > + <img class="system" :src="`${publicPath}images/desktop/header-icon/system.png`" /> </div> - <div class="tools-middle"></div> - <div class="tools-right"> - <div class="tools-icon"> - <!-- <span class="fa fa-battery-full"></span> --> - <img :src="`${publicPath}images/header-icon/search.png`" alt=""> - </div> - <div class="tools-icon"> - <!-- <span class="fa fa-battery-full"></span> --> - <img :src="`${publicPath}images/header-icon/help.png`" alt=""> - </div> - <div class="tools-icon"> - <!-- <span class="fa fa-battery-full"></span> --> - <img :src="`${publicPath}images/header-icon/notice.png`" alt=""> - </div> - <div class="tools-icon"> - <!-- <span class="fa fa-battery-full"></span> --> - <img :src="`${publicPath}images/header-icon/user.png`" alt=""> - </div> - <!-- <timer></timer> --> - <div class="tools-icon tools-notification-center" @click="notificationCenterClick()"> - <span - :class="['fa', {'fa-list-ul':notificationCenterNoMessage()}, {'fa-comment-o on-new-msg':!notificationCenterNoMessage()},{'fa-commenting-o':notificationCenterMessageFlicker()}]" - ></span> - </div> - <div class="tools-icon tools-show-desktop"> - <span> </span> - </div> + <div class="tools-icon"> + <img class="smart-ai" :src="`${publicPath}images/desktop/header-icon/SmartAI.png`" alt /> + </div> + </div> + <div class="tools-middle"> + <div v-for="dock in this.$store.state.desktop.minDocks" :key="dock.id" class="dock-item-wrap"> + <a @click="dockClick(dock)"> + <img class="dock-item" :src="dock.src" :alt="dock.alt" /> + <img class="dock-shot" :src="dock.screenshot" :alt="dock.name" /> + </a> + </div> + </div> + <div class="tools-right"> + <div class="tools-icon"> + <img :src="`${publicPath}images/desktop/header-icon/search.png`" alt /> + </div> + <div class="tools-icon"> + <img :src="`${publicPath}images/desktop/header-icon/help.png`" alt /> + </div> + <div class="tools-icon" @click="notificationCenterClick()"> + <img :src="`${publicPath}images/desktop/header-icon/notice.png`" alt /> + </div> + <div class="tools-icon"> + <img :src="`${publicPath}images/desktop/header-icon/user.png`" alt /> </div> </div> </div> </template> <script> -import Timer from "./Timer"; export default { name: "Tools", - components: { - Timer - }, data() { return { publicPath: process.env.BASE_URL, @@ -67,33 +53,55 @@ window.toolIntervalArr.forEach(item => clearInterval(item)); } window.toolIntervalArr = [ - setInterval(function() { + setInterval(function () { _that.notificationCenterMessageCount += 1; }, 600) ]; }, methods: { - notificationCenterClick: function() { + notificationCenterClick: function () { this.notificationCenterVisible = !this.notificationCenterVisible; this.$store.commit( "desktop/changeNotificationCenterVisible", this.notificationCenterVisible ); }, - notificationCenterNoMessage: function() { + notificationCenterNoMessage: function () { return this.$store.state.desktop.messageNotices.length === 0; }, - notificationCenterMessageFlicker: function() { + notificationCenterMessageFlicker: function () { return ( this.notificationCenterMessageCount % 2 === 0 && !this.notificationCenterNoMessage() ); }, - openSafari: function() { - this.$store.commit("desktop/openSafari"); + + togglePreference() { + //this.$store.commit("desktop/togglePreference"); + //鏄剧ず妗岄潰,鏈�灏忓寲宸叉墦寮�鐨勫簲鐢� + debugger; + this.$store.state.desktop.frames.forEach(frame => { + this.$store.commit('desktop/addMinDock', { + id: frame.id, + src: frame.icon, + alt: frame.title, + type: "3" + }); + }) }, - togglePreference: function() { - this.$store.commit("desktop/togglePreference"); + dockClick(dock) { + if (dock.type === "1") { + window.open(dock.url); + } else if (dock.type === "2") { + this.$store.dispatch("desktop/addFrame", { + id: dock.id, + icon: dock.src, + title: dock.name, + url: dock.url + }); + } else if (dock.type === "3") { + this.$store.commit("desktop/resetMinFrame", dock.id); + } } } }; @@ -120,17 +128,63 @@ width: 200px; height: 100%; float: left; - margin-left: 8px; - + margin-left: 14px; } - +.tools .tools-middle { + float: left; + position: relative; +} +.tools .tools-middle::before { + width: 1px; + height: 20px; + content: ""; + position: absolute; + top: 10px; + left: 0; + background: rgba(0, 0, 0, 0.2); +} +.tools .tools-middle .dock-item-wrap { + display: inline-block; + padding: 0 10px; + height: 38px; + line-height: 54px; + margin-right: 1px; + border-bottom: 2px solid transparent; + position: relative; +} +.tools .tools-middle .dock-item-wrap:hover, +.tools .tools-middle .dock-item-wrap.clicked { + color: white; + background-color: #98aabe; + border-color: #40c3ff; + cursor: pointer; +} +.dock-item-wrap a { + height: 100%; +} +.dock-item-wrap img { + width: auto; + height: 70%; +} +.dock-item-wrap .dock-shot { + visibility: hidden; + width: 100px; + height: 46px; + position: absolute; + top: 44px; + left: -50%; +} +.tools .tools-middle .dock-item-wrap:hover .dock-shot, +.tools .tools-middle .dock-item-wrap.clicked .dock-shot { + visibility: visible; +} .tools-icon { text-align: center; height: 100%; display: inline-block; vertical-align: top; line-height: 56px; - margin-right: 28px; + padding: 0 15px; } .tools .tools-icon:hover, @@ -143,11 +197,6 @@ .tools .tools-right { float: right; height: 100%; -} - -.tools .tools-right .tools-show-desktop { - border-left: grey 1px solid; - width: 5px; - margin-left: 3px; + margin-right: 14px; } </style> \ No newline at end of file -- Gitblit v1.8.0