diff --git a/apps/web-antd/src/api/analytics/index.ts b/apps/web-antd/src/api/analytics/index.ts index fdfe5a8d..f2f58cbe 100644 --- a/apps/web-antd/src/api/analytics/index.ts +++ b/apps/web-antd/src/api/analytics/index.ts @@ -37,6 +37,10 @@ export function getAccessControl() { export function getCamera() { return requestClient.get('/sis/deviceManage/online'); } +// 访客 +export function getVisitorCount() { + return requestClient.get('/property/screen/todayVisitorCount'); +} //车流 export async function queryTwentyfourRunningDatasByPlNos() { let params = { diff --git a/apps/web-antd/src/views/screen/property/analytics-trends.vue b/apps/web-antd/src/views/screen/property/analytics-trends.vue index e7367b62..d1da54a1 100644 --- a/apps/web-antd/src/views/screen/property/analytics-trends.vue +++ b/apps/web-antd/src/views/screen/property/analytics-trends.vue @@ -17,6 +17,7 @@ const getDaysInMonth = (date: any) => { const daysInMonth = new Date(year, month, 0).getDate(); return Array.from({ length: daysInMonth }, (_, i) => i + 1); }; +const emit = defineEmits(['getPowerDate']); const getMeterRecordTrend = async (selectedDate: any) => { const res = await meterRecordTrend({ day: dayjs().format('YYYY-MM-DD'), @@ -26,7 +27,7 @@ const getMeterRecordTrend = async (selectedDate: any) => { meterId: null, floorId: null, }); - + emit('getPowerDate',res); // 处理返回的数据 const chartData = res.day.nowMonth.data || []; @@ -45,11 +46,11 @@ const getMeterRecordTrend = async (selectedDate: any) => { }); renderEcharts({ grid: { - bottom: 125, + bottom: 20, containLabel: true, left: '2%', right: '2%', - top: '2%', + top: '5%', }, series: [ { @@ -133,6 +134,6 @@ defineExpose({ diff --git a/apps/web-antd/src/views/screen/property/index.vue b/apps/web-antd/src/views/screen/property/index.vue index 1a91c5a2..d5ab9a0b 100644 --- a/apps/web-antd/src/views/screen/property/index.vue +++ b/apps/web-antd/src/views/screen/property/index.vue @@ -5,7 +5,7 @@
--:--:--
----
-
南川区综合服务中心数智管理平台物业大屏
+
南川区综合服务中心数智管理平台物业驾驶舱
{{ weekDay }}
@@ -22,13 +22,13 @@
今年用电量 - 180 - 亿kwh + {{powerYear}} + KW·h
本月用电总量 - 1.8 - 亿kwh + {{powerMonth}} + KW·h
今年用水总量 @@ -53,14 +53,15 @@
-
+
-
+
@@ -70,6 +71,10 @@
+
+
离线
+
在线
+
- - - - - - - - - - - - - - - - - - - - - -
- -
-
+
{{item.total}}
-
-
- +
会议室总数
{{todayMeetCount?.meetCount}}
@@ -177,7 +158,7 @@ @@ -945,14 +757,12 @@ onBeforeUnmount(() => { margin-right: 0.5rem; letter-spacing: 0.05em; } - .header-value { font-size: 1.5rem; font-weight: bold; margin: 0 0.2rem; font-family: ShiShangZhongHeiJianTi; } - .header-value.orange { color: #ffb300; } @@ -965,7 +775,6 @@ onBeforeUnmount(() => { .header-value.purple { color: #b388ff; } - .header-unit { color: #fff; font-size: 1rem; @@ -989,43 +798,14 @@ onBeforeUnmount(() => { justify-content: space-between; .first { height: 16.81rem; - .pie3d-title { - color: #fff; - font-size: 1.1rem; - font-weight: bold; - margin-bottom: 0.3rem; - } - .pie3d-water { - color: #fff; - font-size: 0.95rem; - margin-bottom: 0.2rem; - } - .pie3d-water-num { - font-size: 1.3rem; - color: #3ec6ff; - background: #0a1e3a; - border-radius: 0.2rem; - padding: 0 0.2rem; - margin: 0 0.2rem; - letter-spacing: 0.1em; - } - .pie3d-chart { - width: 100%; - height: 176px; - min-height: unset; - margin: 0 auto; - } .bar-chart { margin-top: 35px; } } .second { height: 12rem; - /* margin-top:2.25rem; */ - /* margin-bottom: 2rem; */ .power-chart { height: 100%; - /* margin-top: 0.2rem; */ } } .third { @@ -1055,6 +835,26 @@ onBeforeUnmount(() => { height: 12.5rem; display: flex; justify-content: space-around; + .offline,.online { + display: flex; + align-items: center; + gap: 8px; + color: #fff; + font-size: 14px; + } + .offline::before,.online::before { + content: ""; + width: 30px; + height: 15px; + border-radius: 3px; + border: 1.5px solid #fff; + } + .offline::before{ + background-color: #5470C6; + } + .online::before { + background-color: #9CDB7D; + } } } .content-right { @@ -1064,11 +864,6 @@ onBeforeUnmount(() => { justify-content: space-between; .first { height: 16.81rem; - //background-color: red; - .water-chart { - height: 100%; - /* margin-top: 0.2rem; */ - } } .second { height: 11rem; @@ -1136,45 +931,14 @@ onBeforeUnmount(() => { height: 4rem; background: url('../../../assets/monitor/device-alerts-bg2.png'); background-size: 100% 100%; - font-family: Microsoft YaHei; font-weight: 400; font-size: 1.2rem; color: #ffffff; } } - .device-chart { - height: 10rem; - margin-top: 2rem; - } } } } } -.pie3d-title { - color: #fff; - font-size: 1.1rem; - font-weight: bold; - margin-bottom: 0.3rem; -} -.pie3d-water { - color: #fff; - font-size: 0.95rem; - margin-bottom: 0.2rem; -} -.pie3d-water-num { - font-size: 1.3rem; - color: #3ec6ff; - background: #0a1e3a; - border-radius: 0.2rem; - padding: 0 0.2rem; - margin: 0 0.2rem; - letter-spacing: 0.1em; -} -.pie3d-chart { - width: 100%; - height: 176px; - min-height: unset; - margin: 0 auto; -}