diff --git a/.env.development b/.env.development index 27b9b6a..1ff3f96 100644 --- a/.env.development +++ b/.env.development @@ -5,8 +5,8 @@ VITE_APP_TITLE = 云平台管理系统 VITE_APP_ENV = 'development' # 开发环境 - VITE_APP_BASE_API = 'https://fuyuanshen.com/backend' - #VITE_APP_BASE_API = 'http://192.168.2.23:8000' + #VITE_APP_BASE_API = 'https://fuyuanshen.com/backend' + VITE_APP_BASE_API = 'http://192.168.2.23:8000' #代永飞接口 #VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689' diff --git a/src/api/homeIndex/index.ts b/src/api/homeIndex/index.ts new file mode 100644 index 0000000..9b94d16 --- /dev/null +++ b/src/api/homeIndex/index.ts @@ -0,0 +1,59 @@ +import request from '@/utils/request'; +// 获取设备总览 DataOverview +export const getDeviceOverview = (params) => { + return request({ + url: '/api/largeScreen/getDeviceOverview', + method: 'get', + params: params + }); +}; + + +// 报警事件,报警总数统计 +export const getAlarmStatistics = (params) => { + return request({ + url: '/api/largeScreen/getAlarmStatistics', + method: 'get', + params: params + }); +} + + +// 报警次数 +export const getMonthlyAlarmStatistics = (params) => { + return request({ + url: '/api/largeScreen/getMonthlyAlarmStatistics', + method: 'get', + params: params + }); +} + +// 设备类别 +export const getDeviceCommunicationModeStatistics = (params = {}) => { + return request({ + url: '/api/largeScreen/getDeviceCommunicationModeStatistics', + method: 'get', + params: params + }); +} + +// 设备使用频次 +export const getDeviceUsageFrequency = (params = {}) => { + return request({ + url: '/api/largeScreen/getDeviceUsageFrequency', + method: 'get', + params: params + }); +} + +// 实时报警 +export const getRealtimeAlarm = (params = {}) => { + return request({ + url: '/api/largeScreen/getRealtimeAlarm', + method: 'get', + params: params + }); +} + + + diff --git a/src/api/homeIndex/types.ts b/src/api/homeIndex/types.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/assets/homeIndex/btn.png b/src/assets/homeIndex/btn.png new file mode 100644 index 0000000..44aa41d Binary files /dev/null and b/src/assets/homeIndex/btn.png differ diff --git a/src/assets/homeIndex/btn_cur.png b/src/assets/homeIndex/btn_cur.png new file mode 100644 index 0000000..3e2baaa Binary files /dev/null and b/src/assets/homeIndex/btn_cur.png differ diff --git a/src/assets/homeIndex/card.png b/src/assets/homeIndex/card.png index c73def8..9f445f7 100644 Binary files a/src/assets/homeIndex/card.png and b/src/assets/homeIndex/card.png differ diff --git a/src/assets/homeIndex/deviceIMG.png b/src/assets/homeIndex/deviceIMG.png new file mode 100644 index 0000000..276fb7d Binary files /dev/null and b/src/assets/homeIndex/deviceIMG.png differ diff --git a/src/views/homeIndex/components/AlarmCount.vue b/src/views/homeIndex/components/AlarmCount.vue index 222094f..066d876 100644 --- a/src/views/homeIndex/components/AlarmCount.vue +++ b/src/views/homeIndex/components/AlarmCount.vue @@ -1,6 +1,139 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/homeIndex/components/AlarmEvent.vue b/src/views/homeIndex/components/AlarmEvent.vue index 222094f..01a30f7 100644 --- a/src/views/homeIndex/components/AlarmEvent.vue +++ b/src/views/homeIndex/components/AlarmEvent.vue @@ -1,6 +1,140 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/homeIndex/components/AlarmOverview.vue b/src/views/homeIndex/components/AlarmOverview.vue index 82a5f0e..35b2fc5 100644 --- a/src/views/homeIndex/components/AlarmOverview.vue +++ b/src/views/homeIndex/components/AlarmOverview.vue @@ -3,20 +3,20 @@
-
1000
+
{{ alarmOverview.activeAlarms || '0' }}
正在报警
-
1000
+
{{ alarmOverview.totalAlarms || '0' }}
报警总数
-
1000
+
{{ alarmOverview.processedAlarms || '0' }}
已处理
@@ -24,6 +24,14 @@
\ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceCategory.vue b/src/views/homeIndex/components/DeviceCategory.vue index 222094f..ae52341 100644 --- a/src/views/homeIndex/components/DeviceCategory.vue +++ b/src/views/homeIndex/components/DeviceCategory.vue @@ -1,6 +1,120 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceOverview.vue b/src/views/homeIndex/components/DeviceOverview.vue index 222094f..f596d45 100644 --- a/src/views/homeIndex/components/DeviceOverview.vue +++ b/src/views/homeIndex/components/DeviceOverview.vue @@ -1,6 +1,81 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceUsage.vue b/src/views/homeIndex/components/DeviceUsage.vue index 222094f..bbb964a 100644 --- a/src/views/homeIndex/components/DeviceUsage.vue +++ b/src/views/homeIndex/components/DeviceUsage.vue @@ -1,6 +1,158 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/homeIndex/components/RealTimeAlarm.vue b/src/views/homeIndex/components/RealTimeAlarm.vue index 3614f4e..5ebb21d 100644 --- a/src/views/homeIndex/components/RealTimeAlarm.vue +++ b/src/views/homeIndex/components/RealTimeAlarm.vue @@ -10,54 +10,39 @@
-
{{ item.alarmTime }}
-
{{ item.deviceType }}
-
{{ item.deviceIMEI }}
-
{{ item.alarmEvent }}
-
{{ item.alarmLocation }}
-
- -
-
{{ item.alarmTime }}
-
{{ item.deviceType }}
-
{{ item.deviceIMEI }}
-
{{ item.alarmEvent }}
-
{{ item.alarmLocation }}
+
{{ item.startTime }}
+
{{ item.deviceTypeName }}
+
{{ item.deviceImei }}
+
+ {{ { + 0: '强制报警', + 1: '撞击闯入', + 2: '自动报警', + 3: '电子围栏告警' + }[item.deviceAction]}} + +
+
{{ item.location }}