From 17b3cf1889304ae7f861ef05e7735d61f9c18e74 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 07 十二月 2020 17:20:03 +0800
Subject: [PATCH] 桌面分屏指示器添加临界条件判断是否显示
---
src/pages/desktop/index/components/ToolsEntry.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/pages/desktop/index/components/ToolsEntry.vue b/src/pages/desktop/index/components/ToolsEntry.vue
index 2e38c2b..cbc5e4f 100644
--- a/src/pages/desktop/index/components/ToolsEntry.vue
+++ b/src/pages/desktop/index/components/ToolsEntry.vue
@@ -1,9 +1,10 @@
<template>
<div class="tools-entry">
<div class="entry-wrap">
- <el-carousel :height="rowSize==3?'600px':'770px'" :autoplay="false" arrow="never">
+ <el-carousel :height="rowSize==3?'600px':'770px'" :autoplay="false" arrow="never" :indicator-position="carousels.length==1?'none':''">
<el-carousel-item v-for="(carousel,index) in carousels" :key="index">
<div class="app-list clearFix sdk-list">
+ <!-- <draggable v-model="carousel" @start="drag=true" @end="drag=false"> -->
<div v-for="item in carousel" :key="item.id">
<div class="app" v-if="item.url" @click="dockClick(item)">
<div class="wrap">
@@ -29,7 +30,7 @@
</div>
</div>
</div>
-
+ <!-- </draggable> -->
<!-- <div class="app" v-for="dock in stateDocks" :key="dock.id" @click="dockClick(dock)">
<div class="wrap">
<div class="app-icon">
@@ -61,9 +62,11 @@
</template>
<script>
+import draggable from "vuedraggable"
import { findAllSdk } from '@/api/taskMange';
export default {
name: 'toolsEntry',
+ components: { draggable },
data () {
return {
publicPath: process.env.BASE_URL,
@@ -96,10 +99,10 @@
this.badgeNum = upgradeArr.length;
let arr = null;
//鏍规嵁灞忓箷楂樺害鏉ュ垽鏂槸灞曠ず3鎺掕繕鏄�4鎺� 闃堝��:970
- if(window.innerHeight >= 930 ){
+ if (window.innerHeight >= 930) {
this.rowSize = 4;
arr = this.chunk(tempArr, 24);
- }else{
+ } else {
this.rowSize = 3;
arr = this.chunk(tempArr, 18);
}
@@ -264,8 +267,8 @@
}
.badge {
position: absolute;
- top: 12px;
- right: 5px;
+ top: 13px;
+ right: 8px;
width: 22px;
height: 22px;
font-size: 14px;
@@ -309,7 +312,7 @@
text-align: right;
padding-right: 50px;
user-select: none;
- margin-top: -80px;
+ margin-top: -74px;
img {
user-select: none;
-webkit-user-drag: none;
--
Gitblit v1.8.0