From 3b2791d8a76d96c698990b2fe1fbe443fa8bd8de Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 31 十月 2024 17:11:41 +0800
Subject: [PATCH] ll
---
screen/src/views/SecurityControl.vue | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index a8f450a..beec715 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -201,15 +201,15 @@
<div class="item">
<div class="name">寰呰闂�</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.waitVisitNum }}</span>
<span>浜�</span>
</div>
</div>
<div class="spacing"></div>
<div class="item">
- <div class="name">宸茬櫥鏈�</div>
+ <div class="name">宸茬櫥璁�</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.registerVisitNum }}</span>
<span>浜�</span>
</div>
</div>
@@ -217,7 +217,7 @@
<div class="item">
<div class="name">宸茬寮�</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.levelNum }}</span>
<span>浜�</span>
</div>
</div>
@@ -225,7 +225,7 @@
<div class="item">
<div class="name">婊炵暀</div>
<div class="num_wrap">
- <span class="num">22</span>
+ <span class="num">{{ data4.retentionNum }}</span>
<span>浜�</span>
</div>
</div>
@@ -419,7 +419,7 @@
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import * as echarts from 'echarts'
-import { getEnergyCenterData, getSecurityDeviceData, getVisitRetentionData } from '@/api'
+import { getEnergyCenterData, getSecurityDeviceData, getVisitRetentionData, afgetVisitData } from '@/api'
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
@@ -594,6 +594,11 @@
offset: 1,
color: '#61d3f9'
}])]
+ const data = []
+ data.push({ name: '寰呰闂�', value: data4.value.waitVisitNum,rate: data4.value.waitVisitRata })
+ data.push({ name: '宸茬櫥璁�', value: data4.value.registerVisitNum,rate: data4.value.registerVisitRata })
+ data.push({ name: '宸茬寮�', value: data4.value.levelNum,rate: data4.value.levelRata })
+ data.push({ name: '婊炵暀', value: data4.value.retentionNum,rate: data4.value.retentionRata })
const option = {
color: colors,
tooltip: {
@@ -617,7 +622,7 @@
color: "#000"
},
itemHeight: 2,
- data: ['寰呰闂�', '宸茬櫥璁�', '宸茬寮�', '婊炵暀']
+ data: data.map(i => i.name)
},
series: [
{
@@ -639,13 +644,7 @@
borderWidth: 0,
borderColor: '#fff'
},
- data: [
- { value: 100, name: '寰呰闂�', },
- { value: 50, name: '宸茬櫥璁�' },
- { value: 20, name: '宸茬寮�' },
- { value: 30, name: '婊炵暀' },
-
- ]
+ data
},
{
type: 'funnel',
@@ -691,13 +690,7 @@
opacity: 1
}
},
- data: [
- { value: 100, name: '寰呰闂�', },
- { value: 50, name: '宸茬櫥璁�' },
- { value: 20, name: '宸茬寮�' },
- { value: 30, name: '婊炵暀' },
-
- ]
+ data
},
]
}
@@ -752,12 +745,22 @@
})
})
}
+const data4 = ref({})
+const getData4 = () => {
+ afgetVisitData().then(res => {
+ const result = res.data || {}
+ dataList4.value = result
+ initEchart3()
+ })
+}
+
onMounted(() => {
getData1()
getData2()
getData3()
- initEchart3()
+ getData4()
+
// initEchart1()
})
--
Gitblit v1.9.3