From 2379a27a8b2e4368dc2079557525aeed6a11c631 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 22 十月 2020 14:10:31 +0800
Subject: [PATCH] 修复目录树切换数据栈treeNodes传入空串的bug
---
src/pages/cameraAccess/components/scene/SlideScene.vue | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/pages/cameraAccess/components/scene/SlideScene.vue b/src/pages/cameraAccess/components/scene/SlideScene.vue
index 8494733..9c6fe8c 100644
--- a/src/pages/cameraAccess/components/scene/SlideScene.vue
+++ b/src/pages/cameraAccess/components/scene/SlideScene.vue
@@ -1,41 +1,41 @@
<template>
<div class="swiper-box">
+ <p class="task-tip" v-if="sceneData.length == 0 ">鏆傛棤鍦烘櫙锛岃寮�濮嬪垱寤�</p>
<swiper ref="sceneSwiper" v-if="sceneData.length>=1" :options="swiperOption" class="swiper-box-container">
- <!-- <span class="task-tip" v-show="Camera.rules.length == 0 ">鏆傛棤鍦烘櫙,璇峰紑濮嬪垱寤�</span> -->
<swiper-slide v-for="item in sceneData" :key="item.id+'s'">
<div class="wrap-box" >
<div class="inner">
<div class="scenario-icon">
<div class="single" v-if="item.rules.length==1">
<div class="svg-wrap">
- <svg class="icon" aria-hidden="true" style="font-size:4rem;">
+ <!-- <svg class="icon" aria-hidden="true" style="font-size:4rem;">
<use :xlink:href="`#${item.rules[0].icon}`" />
- </svg>
- <!-- <img class="baseImg" :src="`data:image/png;base64,${item.rules[0].iconBlob}`" alt=""> -->
+ </svg> -->
+ <img class="baseImg" :src="`data:image/png;base64,${item.rules[0].icon_blob}`" alt="">
</div>
</div>
<div class="double" v-else-if="item.rules.length==2">
<div class="svg-wrap" v-for="(rule,index) in item.rules" :key="index">
- <svg class="icon" aria-hidden="true" style="font-size:2rem;">
+ <!-- <svg class="icon" aria-hidden="true" style="font-size:2rem;">
<use :xlink:href="`#${rule.icon}`" />
- </svg>
- <!-- <img class="baseImg" :src="`data:image/png;base64,${rule.iconBlob}`" alt=""> -->
+ </svg> -->
+ <img class="baseImg" :src="`data:image/png;base64,${rule.icon_blob}`" alt="">
</div>
</div>
<div class="third" v-else-if="item.rules.length==3">
<div class="svg-wrap" v-for="(rule,index) in item.rules" :key="'t'+index">
- <svg class="icon" aria-hidden="true" style="font-size:2rem;">
+ <!-- <svg class="icon" aria-hidden="true" style="font-size:2rem;">
<use :xlink:href="`#${rule.icon}`" />
- </svg>
- <!-- <img class="baseImg" :src="`data:image/png;base64,${rule.iconBlob}`" alt=""> -->
+ </svg> -->
+ <img class="baseImg" :src="`data:image/png;base64,${rule.icon_blob}`" alt="">
</div>
</div>
<div class="four" v-else-if="item.rules.length==4">
<div class="svg-wrap" v-for="(rule,index) in item.rules" :key="'f'+index">
- <svg class="icon" aria-hidden="true" style="font-size:2rem;">
+ <!-- <svg class="icon" aria-hidden="true" style="font-size:2rem;">
<use :xlink:href="`#${rule.icon}`" />
- </svg>
- <!-- <img class="baseImg" :src="`data:image/png;base64,${rule.iconBlob}`" alt=""> -->
+ </svg> -->
+ <img class="baseImg" :src="`data:image/png;base64,${rule.icon_blob}`" alt="">
</div>
</div>
</div>
@@ -143,6 +143,12 @@
fill: currentColor;
overflow: hidden;
}
+.task-tip{
+ font-family: PingFangSC-Regular;
+ font-size: 12px;
+ color: #cccccc;
+ margin-top: 10%;
+}
.wrap-box {
width: 100%;
display: inline-block;
@@ -217,11 +223,12 @@
padding-top: 47%;
text-align: center;
box-shadow: 0 0 3px 2px rgb(247, 247, 247) inset;
- svg {
+ img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
+ width: 76%;
}
}
}
@@ -232,6 +239,7 @@
left: 50%;
transform: translate(-50%, -50%);
box-shadow: none;
+ width: 100%
}
}
.double {
--
Gitblit v1.8.0