hanzhengzheng/screenFront
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap

Browse Source
This commit is contained in:
hzz 2023-05-22 18:33:55 +08:00
commit 7917cdd5f8
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/img/water_room.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 KiB

2
src/views/electronicControl/childContent/chart/devTip.vue
View File

@ -18,7 +18,7 @@
</div> </div>
<div v-if="tipList.length > 0" class="swiperbox"> <div v-if="tipList.length > 0" class="swiperbox">
<swiper-container :slides-per-view="per_view" :initialSlide="1" :loop="true" :space-between="spaceBetween" <swiper-container :slides-per-view="per_view" :initialSlide="1" :loop="true" :space-between="spaceBetween"
:centered-slides="true" direction="vertical" :autoplay="{ direction="vertical" :autoplay="{
delay: 3000, delay: 3000,
disableOnInteraction: false, disableOnInteraction: false,
}" @progress="onProgress" @slidechange="onSlideChange"> }" @progress="onProgress" @slidechange="onSlideChange">

3
src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
View File

@ -13,7 +13,7 @@
<template v-slot> <template v-slot>
<div class="box" ref="classBox1"> <div class="box" ref="classBox1">
<div class="icontip"> <div class="icontip">
<div v-for="items in value.data" style="margin: auto 5px;" v-show="(+items.val > +value.quota)&&item.status"> <div v-for="items in value.data" style="margin: auto 5px;" v-show="(+items.val > +value.quota)&&items.status">
<el-popover placement="bottom" :width="250" trigger="hover" effect="dark" <el-popover placement="bottom" :width="250" trigger="hover" effect="dark"
:popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }"> :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
<ul class="icontipBox"> <ul class="icontipBox">
@ -78,7 +78,6 @@ let item = computed(() => {
return value.data[i.value]||{"name":"","val":"0","type":"","field":"","ts":0,"status":false}; return value.data[i.value]||{"name":"","val":"0","type":"","field":"","ts":0,"status":false};
}); });
let iconcolor = computed(() => { let iconcolor = computed(() => {
console.log(value.data[i.value]);
//开始进入渲染是没有获取到该数据则需要判断 如果没有则返回空 //开始进入渲染是没有获取到该数据则需要判断 如果没有则返回空
if (value.data[i.value]) { if (value.data[i.value]) {
return value.data[i.value].status ? +value.data[i.value].val > +value.quota ? "icon-red" : "icon-blue" : "icon-grey"; return value.data[i.value].status ? +value.data[i.value].val > +value.quota ? "icon-red" : "icon-blue" : "icon-grey";

12
src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
View File

@ -40,11 +40,8 @@
</div> </div>
<!-- <h2>{{ `${t(item.i18n[0])}${t(item.i18n[1])}`}}</h2> --> <!-- <h2>{{ `${t(item.i18n[0])}${t(item.i18n[1])}`}}</h2> -->
<h2>{{ item.name}}</h2> <h2>{{ item.name}}</h2>
<i :class="+item.val > +limit <i :class="['iconfont',icon,iconcolor,'iconbig-size']"></i>
? 'iconfont ' + icon + ' icon-red iconbig-size' <p class="unit" v-if="unit&&item.status">
: 'iconfont ' + icon + ' icon-blue iconbig-size'
"></i>
<p class="unit" v-if="unit">
<p class="num">{{item.val}}</p> <p class="num">{{item.val}}</p>
<span>{{ unit }}</span> <span>{{ unit }}</span>
</p> </p>
@ -70,6 +67,11 @@ let timer = null;
let item = computed(() => { let item = computed(() => {
return props.value[i.value]; return props.value[i.value];
}); });
let iconcolor = computed(() => {
console.log(props);
return props.value[i.value].status?props.value[i.value].val > props.limit ? "icon-red" : "icon-blue":"icon-grey";
});
let props = defineProps<{ let props = defineProps<{
title: string; title: string;
icon: string; icon: string;