diff --git a/components.d.ts b/components.d.ts index 004db6d..47eb26d 100644 --- a/components.d.ts +++ b/components.d.ts @@ -23,6 +23,7 @@ declare module 'vue' { Editor: typeof import('./src/components/dashboard/Editor/src/Editor.vue')['default'] ElAvatar: typeof import('element-plus/es')['ElAvatar'] ElButton: typeof import('element-plus/es')['ElButton'] + ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] ElCard: typeof import('element-plus/es')['ElCard'] ElCascader: typeof import('element-plus/es')['ElCascader'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] diff --git a/src/api/module/eam/device/index.ts b/src/api/module/eam/device/index.ts index 8a1f64c..786b751 100644 --- a/src/api/module/eam/device/index.ts +++ b/src/api/module/eam/device/index.ts @@ -57,7 +57,30 @@ export const getDevicePage = (params: PageParam) => total: number }>({ url: '/device/page', method: 'get', params }) +export const getDeviceStorageAndMaintainChart = (params: { + type: number + time?: string + year?: number + month?: number +}) => + eamServer({ + url: `/statistics-device/get-device-chart`, + method: 'post', + data: params, + }) + +export const getDeviceSummary = () => + eamServer({ + url: `/statistics-device/get-device-summary`, + method: 'get', + }) +export const getDeviceSummaryByStatus = () => { + return eamServer({ + url: `/statistics-device/get-device-summary-by-status`, + method: 'get', + }) +} // ============== 测试工单相关 ============== diff --git a/src/api/module/eam/device/storage.ts b/src/api/module/eam/device/storage.ts index 2b679b5..314d451 100644 --- a/src/api/module/eam/device/storage.ts +++ b/src/api/module/eam/device/storage.ts @@ -35,3 +35,4 @@ export const getStorageStatics = () => url: `/storage/statics`, method: 'get', }) + diff --git a/src/api/server/axiosInstance.ts b/src/api/server/axiosInstance.ts index 86d5029..300d184 100644 --- a/src/api/server/axiosInstance.ts +++ b/src/api/server/axiosInstance.ts @@ -136,7 +136,7 @@ const createAxiosInstance = (module: APIConfigKeys, config: Config) => { }) requestList = [] // 重连接socket - openSocket() + // openSocket() return service(config) } catch (e) { logout() diff --git a/src/assets/image/dashboard/login/bg.png b/src/assets/image/dashboard/login/bg.png new file mode 100644 index 0000000..b9ef171 Binary files /dev/null and b/src/assets/image/dashboard/login/bg.png differ diff --git a/src/assets/image/dashboard/login/logo.png b/src/assets/image/dashboard/login/logo.png new file mode 100644 index 0000000..0439741 Binary files /dev/null and b/src/assets/image/dashboard/login/logo.png differ diff --git a/src/assets/image/login/bg.png b/src/assets/image/login/bg.png deleted file mode 100644 index 28bf205..0000000 Binary files a/src/assets/image/login/bg.png and /dev/null differ diff --git a/src/assets/image/login/icon_logo_pg.png b/src/assets/image/login/icon_logo_pg.png deleted file mode 100644 index 7c94084..0000000 Binary files a/src/assets/image/login/icon_logo_pg.png and /dev/null differ diff --git a/src/components/dashboard/Edfs-exception.vue b/src/components/dashboard/Edfs-exception.vue index fbc8b21..98bc27b 100644 --- a/src/components/dashboard/Edfs-exception.vue +++ b/src/components/dashboard/Edfs-exception.vue @@ -10,7 +10,7 @@ type="primary" @click=" () => { - router.push('/device/data') + router.push('/home') } " >返回首页 { return { height: '1em', color, + fontSize: `${size}px`, } }) diff --git a/src/pages/deviceInfo/components/BasicInfo.vue b/src/pages/deviceInfo/components/BasicInfo.vue index 713bda8..30262ec 100644 --- a/src/pages/deviceInfo/components/BasicInfo.vue +++ b/src/pages/deviceInfo/components/BasicInfo.vue @@ -245,7 +245,7 @@ onMounted(() => { white-space: nowrap; width: 70px; text-align: right; - color: var(--label-text); + color: var(--label-color); margin-right: 8px; } .input { diff --git a/src/pages/deviceInfo/components/DeliveryInfo.vue b/src/pages/deviceInfo/components/DeliveryInfo.vue index ded6e8e..1ff9fb3 100644 --- a/src/pages/deviceInfo/components/DeliveryInfo.vue +++ b/src/pages/deviceInfo/components/DeliveryInfo.vue @@ -145,7 +145,7 @@ onMounted(() => { white-space: nowrap; width: 80px; text-align: right; - color: var(--label-text); + color: var(--label-color); margin-right: 8px; } } diff --git a/src/pages/deviceInfo/index.vue b/src/pages/deviceInfo/index.vue index 124ecbd..8c8b409 100644 --- a/src/pages/deviceInfo/index.vue +++ b/src/pages/deviceInfo/index.vue @@ -273,7 +273,7 @@ function onView(row: any) { .label { white-space: nowrap; width: 70px; - color: var(--label-text); + color: var(--label-color); } } } diff --git a/src/pages/deviceInfo/info.vue b/src/pages/deviceInfo/info.vue index b98fb8b..59febf0 100644 --- a/src/pages/deviceInfo/info.vue +++ b/src/pages/deviceInfo/info.vue @@ -1,4 +1,14 @@