diff --git a/apps/web-antd/src/store/notify.ts b/apps/web-antd/src/store/notify.ts index 00e81fa4..0a5fa553 100644 --- a/apps/web-antd/src/store/notify.ts +++ b/apps/web-antd/src/store/notify.ts @@ -63,8 +63,6 @@ export const useNotifyStore = defineStore( watch(data, (message) => { if (!message) return - console.log(`接收到消息: ${message}`) - try { // 尝试解析JSON const obj = JSON.parse(message) diff --git a/apps/web-antd/src/views/dashboard/analytics/index.vue b/apps/web-antd/src/views/dashboard/analytics/index.vue index f330e43d..a0c9d5ab 100644 --- a/apps/web-antd/src/views/dashboard/analytics/index.vue +++ b/apps/web-antd/src/views/dashboard/analytics/index.vue @@ -19,11 +19,12 @@ import { getStatisticsCurrDay, getStatistics, } from '#/api/analytics/index'; +import { getVisitorList } from '#/api/property/resident/passRecordManagement'; const overviewItems = ref([ { icon: SvgCardIcon, - title: '今日访客量', - totalTitle: '总访客量', + title: '今日通行量', + totalTitle: '总通行量', totalValue: 0, value: 0, }, @@ -73,6 +74,37 @@ const handleDateChange = (date: any) => { } }; +// 通行量 +async function getPersonCount() { + const date = new Date(); + const nowDate = date + .toLocaleDateString('zh-CN', { + year: 'numeric', + month: '2-digit', + day: '2-digit', + }) + .replace(/\//g, '-'); + + const historyData = { + pageNum: 1, + pageSize: 10, + begTime: '2025-09-01', + endTime: nowDate, + }; + + const todayData = { + pageNum: 1, + pageSize: 10, + begTime: nowDate, + endTime: nowDate, + }; + + const historyTotal = await getVisitorList(historyData); + const todayTotal = await getVisitorList(todayData); + overviewItems.value[0].totalValue = historyTotal.total; + overviewItems.value[0].value = todayTotal.total; +} + // 工单数量 async function getIndex() { const res = await getIndexCount(); @@ -146,6 +178,7 @@ async function getStatisticsCount() { onMounted(() => { getIndex(); getCarCount(); + getPersonCount(); getStatisticsCurrDayCount(); getStatisticsCount(); }); diff --git a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue index 767526bb..35da0d07 100644 --- a/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue +++ b/apps/web-antd/src/views/property/energyManagement/electricEnergy/elctricitySituation/index.vue @@ -19,18 +19,15 @@ onMounted(() => { () => notifyStore.sseList, (val) => { const latestMessage = val[val.length - 1]; - try { // 尝试解析消息内容 const parsedMessage = JSON.parse(latestMessage); - console.log('收到sse消息:', parsedMessage); if (parsedMessage.type === 'meter') { // 根据消息内容执行相应操作 handleSSEMessage(parsedMessage); } } catch (e) { console.log('收到非JSON消息:', latestMessage); - // 处理非JSON格式消息 } }, { deep: true }, diff --git a/apps/web-antd/src/views/sis/video/channel-tree.vue b/apps/web-antd/src/views/sis/video/playback/channel-tree.vue similarity index 100% rename from apps/web-antd/src/views/sis/video/channel-tree.vue rename to apps/web-antd/src/views/sis/video/playback/channel-tree.vue diff --git a/apps/web-antd/src/views/sis/video/data.ts b/apps/web-antd/src/views/sis/video/playback/data.ts similarity index 100% rename from apps/web-antd/src/views/sis/video/data.ts rename to apps/web-antd/src/views/sis/video/playback/data.ts diff --git a/apps/web-antd/src/views/sis/video/index.vue b/apps/web-antd/src/views/sis/video/playback/index.vue similarity index 82% rename from apps/web-antd/src/views/sis/video/index.vue rename to apps/web-antd/src/views/sis/video/playback/index.vue index b7247a16..56f66a49 100644 --- a/apps/web-antd/src/views/sis/video/index.vue +++ b/apps/web-antd/src/views/sis/video/playback/index.vue @@ -14,7 +14,7 @@
-
+
-
-
- - - - +
+
+ +
+ +
+
+
+
+ +
+ +
+ + + + + + + + + + +
+
+
@@ -64,27 +79,18 @@ diff --git a/apps/web-antd/src/views/sis/video/playback/process.vue b/apps/web-antd/src/views/sis/video/playback/process.vue new file mode 100644 index 00000000..52d9ced7 --- /dev/null +++ b/apps/web-antd/src/views/sis/video/playback/process.vue @@ -0,0 +1,386 @@ + + + + + diff --git a/apps/web-antd/tsconfig.json b/apps/web-antd/tsconfig.json index d45e3d7a..40a9fdef 100644 --- a/apps/web-antd/tsconfig.json +++ b/apps/web-antd/tsconfig.json @@ -3,6 +3,7 @@ "extends": "@vben/tsconfig/web-app.json", "compilerOptions": { "baseUrl": ".", + "allowJs": true, "paths": { "#/*": [ "./src/*"