Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap
This commit is contained in:
commit
2fc3bc7487
@ -11,7 +11,7 @@
|
|||||||
<div style="height: 100%; width: 100%">
|
<div style="height: 100%; width: 100%">
|
||||||
<h2 class="components-header">{{ title }}</h2>
|
<h2 class="components-header">{{ title }}</h2>
|
||||||
<div class="components-content" :key="keynum">
|
<div class="components-content" :key="keynum">
|
||||||
<swiper-container :slidesPerView="props.per_view" :loop="true" :spaceBetween="0" direction="vertical" :autoplay="{
|
<swiper-container :slidesPerView="props.per_view" :loop="true" :initialSlide="0" :spaceBetween="0" direction="vertical" :autoplay="{
|
||||||
delay: 3000,
|
delay: 3000,
|
||||||
disableOnInteraction: false,
|
disableOnInteraction: false,
|
||||||
}" autoHeight=true observer=true observeParents=true @progress="onProgress" :loopAdditionalSlides="1" @slidechange="onSlideChange">
|
}" autoHeight=true observer=true observeParents=true @progress="onProgress" :loopAdditionalSlides="1" @slidechange="onSlideChange">
|
||||||
@ -33,6 +33,26 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
</div>
|
</div>
|
||||||
</swiper-slide>
|
</swiper-slide>
|
||||||
|
<template v-if="props.tipList.length>=props.per_view && props.tipList.length<props.per_view*2">
|
||||||
|
<swiper-slide v-for="(res, index) in props.tipList" :key="res.id">
|
||||||
|
<div class="itemclass">
|
||||||
|
<el-row :gutter="5" class="row-flex">
|
||||||
|
<el-col :span="2" class="col-flex" style="color: #fff; font-size: 18px;">
|
||||||
|
{{ index + 1 }}
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="18" class="col-flex"
|
||||||
|
style="flex-direction: column; font-size: 18px; color: #fff; align-items: flex-start;">
|
||||||
|
<p><span>{{ label.name }} :</span><span>{{ res.name }}</span></p>
|
||||||
|
<p style="margin-top: 10px 0;">
|
||||||
|
<span>{{ label.date }}:</span><span>{{ res.date }}</span>
|
||||||
|
<span>{{ label.duration }}:</span><span>{{ res.duration }}</span>
|
||||||
|
</p>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="4" class="col-flex" style="font-size: 25px;font-weight: bold;" :style="{color:compare[res.status]?compare[res.status]:'red'}"> {{res.status}} </el-col>
|
||||||
|
</el-row>
|
||||||
|
</div>
|
||||||
|
</swiper-slide>
|
||||||
|
</template>
|
||||||
</swiper-container>
|
</swiper-container>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user