From b23a2a35a14b010a3b97a1b61a02ec179dfab924 Mon Sep 17 00:00:00 2001 From: zhangzengfei <zhangzengfei@iotlink.com> Date: 星期五, 04 九月 2020 17:25:14 +0800 Subject: [PATCH] feat: sort camera tree --- src/pages/desktop/index/components/Tools.vue | 43 +++++++++++-------------------------------- 1 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/pages/desktop/index/components/Tools.vue b/src/pages/desktop/index/components/Tools.vue index 81393fd..8bc66e7 100644 --- a/src/pages/desktop/index/components/Tools.vue +++ b/src/pages/desktop/index/components/Tools.vue @@ -12,7 +12,7 @@ </div> </div> <div class="tools-middle"> - <div v-for="dock in $store.state.desktop.minDocks" :key="dock.id" class="dock-item-wrap" :class="{'actived':dock.highlight}" @mouseover="screenShot(dock)"> + <div v-for="dock in $store.state.desktop.minDocks" :key="dock.id" class="dock-item-wrap" :class="{'actived':dock.highlight}" > <a @click="dockClick(dock)"> <img class="dock-item" :src="dock.src" :alt="dock.alt" /> <img class="dock-shot" :src="dock.screenshot" v-if="dock.screenshot"/> @@ -77,7 +77,7 @@ // '$store.state.desktop.frames':{ // handler(n,o){ // if(n){ - // debugger; + // ; // n.forEach((item,index) => { // if(item.order >= this.maxOrder){ // this.maxOrderOne = item.id; @@ -111,7 +111,7 @@ togglePreference() { //this.$store.commit("desktop/togglePreference"); //鏄剧ず妗岄潰,鏈�灏忓寲宸叉墦寮�鐨勫簲鐢� - debugger; + ; this.$store.state.desktop.frames.forEach(frame => { this.$store.commit('desktop/addMinDock', { id: frame.id, @@ -123,7 +123,7 @@ }) }, dockClick(dock) { - debugger + if (dock.type === "1") { window.open(dock.url); } else if (dock.type === "2") { @@ -136,37 +136,13 @@ } else if (dock.type === "3") { this.$store.commit("desktop/resetMinFrame", dock.id); //鐐瑰嚮鐨刬frame缃《骞堕珮浜� - debugger this.$store.commit("desktop/refreshFrame", dock); } }, - screenShot(dock){ - debugger - //鎵惧埌褰撳墠鐨刬frame - let curIframe = Array.from(document.querySelectorAll('iframe')).find(iframe => iframe.src.indexOf(dock.url) >= 0); - //淇濆瓨褰撳墠搴旂敤蹇収 - html2canvas(curIframe.contentWindow.document.body, { - dpi: window.devicePixelRatio * 4, - logging: true, //鏌ョ湅html2canvas鍐呴儴鎵ц娴佺▼ - removeContainer: true, - imageTimeout: 0, - useCORS: true, //寮�鍚法鍩熼厤缃� - //allowTaint: true - }).then(canvas => { - let shotSrc = canvas.toDataURL(); - // this.$store.commit('desktop/addMinDock', { - // id: dock.id, - // src: dock.icon, - // alt: dock.title, - // type: "3", - // screenshot: shotSrc - // }); - this.$store.commit('desktop/shotscreen', {id:dock.id, src:shotSrc}); - - }).catch(e => { - this.$store.commit('desktop/shotscreen', {id:dock.id, src:''}); - }); + toolHover(dock){ + //this.$parent.screenShot(dock) }, + toLogout(){ this.$confirm("鎻愮ず锛氱‘瀹氶��鍑哄悧锛�", { center: true, @@ -279,8 +255,11 @@ vertical-align: top; line-height: 56px; padding: 0 15px; + } - +.tools-icon img{ + -webkit-user-drag: none; +} .tools .tools-icon:not(.no-hover-style):hover, .tools .tools-icon:not(.no-hover-style).clicked { color: white; -- Gitblit v1.8.0