diff --git a/index.html b/index.html index ec114e1..9ed4a4d 100644 --- a/index.html +++ b/index.html @@ -1,15 +1,20 @@ - + + 智联装备云控平台 - - -
- - - + + +
+ + + + + + diff --git a/src/views/home/map.vue b/src/views/home/map.vue index f2c2b44..2d09124 100644 --- a/src/views/home/map.vue +++ b/src/views/home/map.vue @@ -1,23 +1,15 @@ @@ -572,7 +646,8 @@ onMounted(async () => {
-

一、设备基础信息 ({{ mapData.uuid || '-' }})

+

一、设备基础信息 ({{ mapData.uuid || '-' }}) +

@@ -836,49 +911,65 @@ onMounted(async () => {
电压 - {{ tagData?.voltage ? `${Number(tagData.voltage).toFixed(2)} V` : '-' }} + {{ tagData?.voltage ? `${Number(tagData.voltage).toFixed(2)} V` : '-' + }}
电流 - {{ tagData?.current ? `${Number(tagData.current).toFixed(2)} A` : '-' }} + {{ tagData?.current ? `${Number(tagData.current).toFixed(2)} A` : '-' + }}
有功功率 - {{ tagData?.activePower ? `${Number(tagData.activePower).toFixed(2)} W` : '-' }} + {{ tagData?.activePower ? `${Number(tagData.activePower).toFixed(2)} W` : '-' + }}
无功功率 - {{ tagData?.reactivePower ? `${Number(tagData.reactivePower).toFixed(2)} VAR` : '-' }} + {{ tagData?.reactivePower ? `${Number(tagData.reactivePower).toFixed(2)} VAR` : '-' + }}
功率因素 - {{ tagData?.powerFactor ? `${Number(tagData.powerFactor).toFixed(2)}` : '-' }} + {{ tagData?.powerFactor ? `${Number(tagData.powerFactor).toFixed(2)}` : '-' + }}
频率 - {{ tagData?.frequency ? `${Number(tagData.frequency).toFixed(2)} Hz` : '-' }} + {{ tagData?.frequency ? `${Number(tagData.frequency).toFixed(2)} Hz` : '-' + }}
正向有功 - {{ tagData?.forwardActiveEnergy ? `${Number(tagData.forwardActiveEnergy).toFixed(2)} kWh` : '-' }} + {{ tagData?.forwardActiveEnergy ? `${Number(tagData.forwardActiveEnergy).toFixed(2)} kWh` : '-' + }}
正向无功 - {{ tagData?.forwardReactiveEnergy ? `${Number(tagData.forwardReactiveEnergy).toFixed(2)} kvarh` : '-' }} + {{ tagData?.forwardReactiveEnergy ? `${Number(tagData.forwardReactiveEnergy).toFixed(2)} kvarh` : '-' + }}
@@ -892,44 +983,6 @@ onMounted(async () => { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {
-

一、设备基础信息({{ mapWorkCardData.uuid || '-' }})

+

一、设备基础信息({{ mapWorkCardData.uuid || '-' + }})

@@ -1119,7 +1173,6 @@ onMounted(async () => {
- + \ No newline at end of file