Merge branch 'master' of https://codeup.aliyun.com/645deca397d94d909e439238/iotplatform_sourcecode/screenFront into dismap
This commit is contained in:
commit
326e6af5b2
@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
* @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\center.vue
|
* @FilePath: \screenFront\src\views\Offsite\child\childContent\center.vue
|
||||||
* @Author: 王路平
|
* @Author: 王路平
|
||||||
* @文件版本: V1.0.0
|
* @文件版本: V1.0.0
|
||||||
* @Date: 2023-04-12 08:46:57
|
* @Date: 2023-04-12 08:46:57
|
||||||
@ -145,8 +145,8 @@ function changedevlist(val: any) {
|
|||||||
res.deviceType,
|
res.deviceType,
|
||||||
res.realityDate,
|
res.realityDate,
|
||||||
JSON.parse(res.deviceStatus)
|
JSON.parse(res.deviceStatus)
|
||||||
? t('messages.onLine')
|
? `<span style="color:#20aec5;">${t('messages.onLine')}</span>`
|
||||||
: t('messages.offline'),
|
: `<span style="color:rgb(228, 57, 97);">${t('messages.offline')}</span>`,
|
||||||
// "",
|
// "",
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@ -194,7 +194,7 @@ function setDataList(val: any) {
|
|||||||
//设置页面数据
|
//设置页面数据
|
||||||
topTitleRef.value.setData({ title: t('messages.OnlineNum'), num: tipdata.ison });
|
topTitleRef.value.setData({ title: t('messages.OnlineNum'), num: tipdata.ison });
|
||||||
topTitleRef2.value.setData({ title: t('messages.TOTAL'), num: tipdata.isall });
|
topTitleRef2.value.setData({ title: t('messages.TOTAL'), num: tipdata.isall });
|
||||||
topTitleRef3.value.setData({ title: t('messages.OffNum'), num: tipdata.isoff });
|
topTitleRef3.value.setData({ title: t('messages.OffNum'), num: tipdata.isoff ,color:'rgb(228, 57, 97)' });
|
||||||
changedevlist(val.citylist);
|
changedevlist(val.citylist);
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
* @FilePath: \wwwd:\code\screenFront\src\views\Offsite\child\childContent\chart\topTitle.vue
|
* @FilePath: \screenFront\src\views\Offsite\child\childContent\chart\topTitle.vue
|
||||||
* @Author: 王路平
|
* @Author: 王路平
|
||||||
* @文件版本: V1.0.0
|
* @文件版本: V1.0.0
|
||||||
* @Date: 2023-04-12 13:03:15
|
* @Date: 2023-04-12 13:03:15
|
||||||
@ -13,7 +13,7 @@
|
|||||||
<template v-slot>
|
<template v-slot>
|
||||||
<div class="box" :key="keynum" :style="{ width: boxWH.width, height: boxWH.height }">
|
<div class="box" :key="keynum" :style="{ width: boxWH.width, height: boxWH.height }">
|
||||||
|
|
||||||
<p>{{ data.num }}<span>{{t('messages.units')}}</span></p>
|
<p :style="{color:data.color?data.color:''}">{{ data.num }}<span>{{t('messages.units')}}</span></p>
|
||||||
<h2>{{ data.title }}</h2>
|
<h2>{{ data.title }}</h2>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@ -39,6 +39,7 @@ let keynum = ref(0);
|
|||||||
let data = reactive({
|
let data = reactive({
|
||||||
title: "",
|
title: "",
|
||||||
num: 0,
|
num: 0,
|
||||||
|
color: "",
|
||||||
});
|
});
|
||||||
let refborder6 = ref();
|
let refborder6 = ref();
|
||||||
let marginbox = ref();
|
let marginbox = ref();
|
||||||
|
Loading…
Reference in New Issue
Block a user