diff --git a/src/views/home/components/vacancy.vue b/src/views/home/components/vacancy.vue
index e730be2..18acda3 100644
--- a/src/views/home/components/vacancy.vue
+++ b/src/views/home/components/vacancy.vue
@@ -35,6 +35,7 @@
return {
...item,
value: item.occupiedSpaces,
+ total: item.total,
itemStyle: {
color: {
type: 'linear',
@@ -62,6 +63,7 @@
return {
...item,
value: item.occupiedSpaces,
+ total: item.total,
itemStyle: {
color: '#fff',
opacity: 1
@@ -70,7 +72,9 @@
})
}
const getYAxisData = () => {
- return props.list.map((item) => item.occupiedSpaces)
+ return props.list.map((item) => {
+ return{value:item.occupiedSpaces,total:item.total}
+ })
}
const init = () => {
if (!params) {
@@ -129,7 +133,8 @@
padding: [0, 0, 6, 0],
inside: true,
formatter: function (value) {
- return `{value|余}{value|${value}}`
+ let obj = props.list.find((item) => item.occupiedSpaces == value)
+ return `{value|余}{value|${value}}/{total|总}{total|${obj?.total}}`
},
rich: {
value: {
@@ -137,7 +142,13 @@
color: '#fff',
fontWeight: 600,
fontSize: fitChartSize(14)
- }
+ },
+ total: {
+ align: 'center',
+ color: '#fff',
+ fontWeight: 600,
+ fontSize: fitChartSize(14)
+ },
}
},
data: getYAxisData()
diff --git a/src/views/monitor/components/alarmRate.vue b/src/views/monitor/components/alarmRate.vue
index 9853c35..d2e95a8 100644
--- a/src/views/monitor/components/alarmRate.vue
+++ b/src/views/monitor/components/alarmRate.vue
@@ -42,7 +42,7 @@
itemGap: fitChartSize(6),
formatter: (name) => {
let obj = props.dataList.find((item) => item.name == name)
- return `{name|${name}} {value|${obj?.value}}{value|次}`
+ return `{name|${name}} {value|${obj?.value}}{value|%}`
},
textStyle: {
rich: {
diff --git a/src/views/monitor/components/box-2.vue b/src/views/monitor/components/box-2.vue
index ebdc08d..e1e8b32 100644
--- a/src/views/monitor/components/box-2.vue
+++ b/src/views/monitor/components/box-2.vue
@@ -500,7 +500,6 @@
console.log(regionList.value, ' regionList.value')
}
const onMonitorChange = () => {
-
monitorChange = pubSub.subscribe('monitorChange', (res, data) => {
cameraName.value = ''
current.value = 0
@@ -509,8 +508,12 @@
videoList.value = []
regionList.value = []
total.value = 0
- getVideoType()
- getVideoRegions()
+ setTimeout(()=>{
+ getVideoType()
+ getVideoRegions()
+ },1500)
+
+
})
}
onMounted(() => {