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/dyf-vue-ui/src/views/homeIndex/index.vue b/dyf-vue-ui/src/views/homeIndex/index.vue new file mode 100644 index 0000000..4716ddb --- /dev/null +++ b/dyf-vue-ui/src/views/homeIndex/index.vue @@ -0,0 +1,174 @@ + + \ No newline at end of file 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/alarmIMG.png b/src/assets/homeIndex/alarmIMG.png new file mode 100644 index 0000000..92771d0 Binary files /dev/null and b/src/assets/homeIndex/alarmIMG.png differ 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 new file mode 100644 index 0000000..9f445f7 Binary files /dev/null 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/assets/homeIndex/nav.png b/src/assets/homeIndex/nav.png new file mode 100644 index 0000000..7d69121 Binary files /dev/null and b/src/assets/homeIndex/nav.png differ diff --git a/src/router/index.ts b/src/router/index.ts index af4e1a8..f4089a8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -39,6 +39,12 @@ export const constantRoutes: RouteRecordRaw[] = [ component: () => import('@/views/error/401.vue'), hidden: true }, + { + path: "/homeIndex", + name: "HomeIndex", + component: () => import("@/views/homeIndex/index.vue"), + meta: {title: '数据大屏', icon: 'dashboard', preload: true, keepAlive: true }, + }, { path: '', component: Layout, @@ -48,10 +54,11 @@ export const constantRoutes: RouteRecordRaw[] = [ path: '/index', component: () => import('@/views/index.vue'), name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true,keepAlive: false } + meta: { title: '首页', icon: 'dashboard', affix: true, keepAlive: false } } ] }, + { path: '/user', component: Layout, diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue index 0cf81b0..5f6ff9f 100644 --- a/src/views/equipmentManagement/devices/index.vue +++ b/src/views/equipmentManagement/devices/index.vue @@ -56,8 +56,8 @@ - 导出 + 导出 - + @@ -517,7 +517,7 @@ const handleExport = () => { { ...queryParams.value }, - `${new Date().getTime()}.xlsx`, + `设备列表${new Date().getTime()}.xlsx`, 'get' ); }; @@ -913,12 +913,19 @@ const beforeImportUpload = (file: any) => { const head_upload = () => getBearerToken(); const handleImportSuccess = (response: any) => { if (response.code == 200) { + console.log('导入成功了么'); importResult.value.isShow = true; + if (response.data) { - importResult.value.succeed = response.data.successCount || 0; - importResult.value.errorSun = response.data.failureCount || 0; + console.log(response.data,'response.data'); + + importResult.value.succeed = response.data.successCount; + importResult.value.errorSun = response.data.failureCount; importResult.value.total = importResult.value.succeed + importResult.value.errorSun; - importResult.value.link = response.data.errorExcelUrl || ''; + importResult.value.link = response.data.errorExcelUrl; + } + if (importUpload.value) { + importUpload.value.clearFiles(); } getList(); // 初始化列表数据 } else { diff --git a/src/views/homeIndex/components/AlarmCount.vue b/src/views/homeIndex/components/AlarmCount.vue new file mode 100644 index 0000000..066d876 --- /dev/null +++ b/src/views/homeIndex/components/AlarmCount.vue @@ -0,0 +1,139 @@ + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/AlarmEvent.vue b/src/views/homeIndex/components/AlarmEvent.vue new file mode 100644 index 0000000..01a30f7 --- /dev/null +++ b/src/views/homeIndex/components/AlarmEvent.vue @@ -0,0 +1,140 @@ + + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/AlarmOverview.vue b/src/views/homeIndex/components/AlarmOverview.vue new file mode 100644 index 0000000..35b2fc5 --- /dev/null +++ b/src/views/homeIndex/components/AlarmOverview.vue @@ -0,0 +1,81 @@ + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceCategory.vue b/src/views/homeIndex/components/DeviceCategory.vue new file mode 100644 index 0000000..ae52341 --- /dev/null +++ b/src/views/homeIndex/components/DeviceCategory.vue @@ -0,0 +1,120 @@ + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceOverview.vue b/src/views/homeIndex/components/DeviceOverview.vue new file mode 100644 index 0000000..f596d45 --- /dev/null +++ b/src/views/homeIndex/components/DeviceOverview.vue @@ -0,0 +1,81 @@ + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/DeviceUsage.vue b/src/views/homeIndex/components/DeviceUsage.vue new file mode 100644 index 0000000..bbb964a --- /dev/null +++ b/src/views/homeIndex/components/DeviceUsage.vue @@ -0,0 +1,158 @@ + + + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/MapComponent.vue b/src/views/homeIndex/components/MapComponent.vue new file mode 100644 index 0000000..c1e1fd8 --- /dev/null +++ b/src/views/homeIndex/components/MapComponent.vue @@ -0,0 +1,8 @@ + + + \ No newline at end of file diff --git a/src/views/homeIndex/components/RealTimeAlarm.vue b/src/views/homeIndex/components/RealTimeAlarm.vue new file mode 100644 index 0000000..5ebb21d --- /dev/null +++ b/src/views/homeIndex/components/RealTimeAlarm.vue @@ -0,0 +1,110 @@ + + + \ No newline at end of file diff --git a/src/views/homeIndex/index.vue b/src/views/homeIndex/index.vue new file mode 100644 index 0000000..50adb9f --- /dev/null +++ b/src/views/homeIndex/index.vue @@ -0,0 +1,245 @@ + + + + +