From 388ba4d322db4dd426cecfa6ec916388aaf3437d Mon Sep 17 00:00:00 2001 From: wenlele Date: Tue, 24 Oct 2023 17:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../control/components/alarm-chart.jsx | 16 +- .../service/containers/automaticReport.jsx | 761 ++++++++++++++++++ .../src/sections/service/containers/index.js | 9 +- .../service/containers/reportFile.jsx | 271 +++++++ web/client/src/sections/service/nav-item.jsx | 22 +- web/client/src/sections/service/routes.js | 196 ++--- 6 files changed, 1168 insertions(+), 107 deletions(-) create mode 100644 web/client/src/sections/service/containers/automaticReport.jsx create mode 100644 web/client/src/sections/service/containers/reportFile.jsx diff --git a/web/client/src/sections/control/components/alarm-chart.jsx b/web/client/src/sections/control/components/alarm-chart.jsx index e01728c..9a72a7e 100644 --- a/web/client/src/sections/control/components/alarm-chart.jsx +++ b/web/client/src/sections/control/components/alarm-chart.jsx @@ -155,7 +155,7 @@ const AlarmChart = ({ dispatch, actions, user, history, projectPoms, loading, so }) } - setRankData(dataList.sort((a, b) => b.sum - a.sum)?.slice(0, 5) || []) + setRankData(dataList.sort((a, b) => b.sum - a.sum)?.slice(0, 5)?.sort((a, b) => a.sum - b.sum) || []) } const getData = async (radio, pepProjectId, diff1, diff2) => { @@ -382,9 +382,9 @@ const AlarmChart = ({ dispatch, actions, user, history, projectPoms, loading, so {behind ? <> -
+
故障数统计
-
+
setProjectSearch(v)} /> + {/* */} + + {projectList?.map(v => { + return
{ + setPepProjectId(v.pepProjectId) + fileList(v.pepProjectId) + setDataSource([]) + setFileId('') + }}> + +
{v.pepProjectName}
+ +
+ })} + {/*
*/} +
+
+ +
+ + + + {limits > 0 &&
+
+
+
+ + 共{limits}条信息 + + { + setQuery({ limit: pageSize, page: currentPage - 1 }); + page.current = currentPage - 1 + setChange(!change) + }} + /> +
+
} + + + + + + {//推送配置弹框 + pushModal ? + { + setPushModal(false); + }} + close={() => { + setPushModal(false); + getPushList(query) + }} > + : '' + } + {setup ? ( + { + setSetup(false); + attribute(projectStatus); + }} + /> + ) : ( + "" + )} + + ) +} + +function mapStateToProps (state) { + const { auth, global, getPush, ProjectPoms } = state; + console.log(global); + return { + loading: getPush.isRequesting, + user: auth.user, + actions: global.actions, + clientHeight: global?.clientHeight, + projectPoms: ProjectPoms?.data?.rows + }; +} + +export default connect(mapStateToProps)(AutomaticReport); diff --git a/web/client/src/sections/service/nav-item.jsx b/web/client/src/sections/service/nav-item.jsx index 94abaf4..9811751 100644 --- a/web/client/src/sections/service/nav-item.jsx +++ b/web/client/src/sections/service/nav-item.jsx @@ -16,7 +16,13 @@ export function getNavItem (user, dispatch) { to: '/service/reportingServices/reportManagement', items: [{ itemKey: 'reportManagement', to: '/service/reportingServices/reportManagement', text: '报表管理' - }] + } + // , { + // itemKey: 'automaticReport', to: '/service/reportingServices/automaticReport', text: '自动化报表' + // }, { + // itemKey: 'reportFile', to: '/service/reportingServices/reportFile', text: '报表文件' + // } + ] }, { itemKey: 'maintenancePlan', text: '维护计划', @@ -26,7 +32,7 @@ export function getNavItem (user, dispatch) { itemKey: 'cyclePlan', to: '/service/maintenancePlan/cyclePlan', text: '周期计划' }, { itemKey: 'temporaryResponse', to: '/service/maintenancePlan/temporaryResponse', text: '临时响应' - },{ + }, { itemKey: 'serviceRecord1', to: '/service/serviceRecord/serviceRecord1', text: '响应记录', },] }, { @@ -36,11 +42,11 @@ export function getNavItem (user, dispatch) { to: '/service/carrierPigeon/emPush', items: [{ itemKey: 'emPush', to: '/service/carrierPigeon/emPush', text: 'EM推送' - }, - // { - // itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送' - // } - ] + }, + // { + // itemKey: 'appPush', to: '/service/carrierPigeon/appPush', text: '应用推送' + // } + ] }, // { // itemKey: 'preventiveMaintenance', @@ -56,7 +62,7 @@ export function getNavItem (user, dispatch) { text: '硬件维修', icon: , to: '/service/serviceRecord/MaintenanceRecords', - items: [{ itemKey:'MaintenanceRecords',to:'/service/serviceRecord/MaintenanceRecords',text:'维修记录'}] + items: [{ itemKey: 'MaintenanceRecords', to: '/service/serviceRecord/MaintenanceRecords', text: '维修记录' }] }, // { // itemKey: 'firmwareUpgrade', diff --git a/web/client/src/sections/service/routes.js b/web/client/src/sections/service/routes.js index 67133bb..8daa0e5 100644 --- a/web/client/src/sections/service/routes.js +++ b/web/client/src/sections/service/routes.js @@ -1,95 +1,109 @@ -import { ReportManagement, CyclePlan, TemporaryResponse, EmPush, AppPush, MaintenanceModel, ServiceRecord, MaintenanceRecords,FirmwareLibrary,DeviceManagement } from './containers'; +import { + ReportManagement, CyclePlan, TemporaryResponse, EmPush, AppPush, + MaintenanceModel, ServiceRecord, MaintenanceRecords, FirmwareLibrary, + DeviceManagement, AutomaticReport, ReportFile +} from './containers'; export default [{ - type: 'inner', - route: { - path: '/service', - key: 'service', - breadcrumb: '服务', - // 不设置 component 则面包屑禁止跳转 - childRoutes: [{ - path: '/reportingServices', - key: 'reportingServices', - breadcrumb: '报表服务', - childRoutes: [{ - path: '/reportManagement', - key: 'reportManagement', - component: ReportManagement, - breadcrumb: '报表管理', - }] - }, { - path: '/maintenancePlan', - key: 'maintenancePlan', - breadcrumb: '维护计划', - childRoutes: [{ - path: '/cyclePlan', - key: 'cyclePlan', - component: CyclePlan, - breadcrumb: '周期计划', - }, { - path: '/temporaryResponse', - key: 'temporaryResponse', - component: TemporaryResponse, - breadcrumb: '临时响应', - },] - }, { - path: '/carrierPigeon', - key: 'carrierPigeon', - breadcrumb: '信鸽服务', - childRoutes: [{ - path: '/emPush', - key: 'emPush', - component: EmPush, - breadcrumb: 'EM推送', - }, { - path: '/appPush', - key: 'appPush', - component: AppPush, - breadcrumb: '应用推送', - },] - }, { - path: '/preventiveMaintenance', - key: 'preventiveMaintenance', - breadcrumb: '预防性维保', - childRoutes: [{ - path: '/maintenanceModel', - key: 'maintenanceModel', - component: MaintenanceModel, - breadcrumb: '维保模型', - }] - }, { - path: '/serviceRecord', - key: 'serviceRecord', + type: 'inner', + route: { + path: '/service', + key: 'service', + breadcrumb: '服务', + // 不设置 component 则面包屑禁止跳转 + childRoutes: [{ + path: '/reportingServices', + key: 'reportingServices', + breadcrumb: '报表服务', + childRoutes: [{ + path: '/reportManagement', + key: 'reportManagement', + component: ReportManagement, + breadcrumb: '报表管理', + }, { + path: '/automaticReport', + key: 'automaticReport', + component: AutomaticReport, + breadcrumb: '自动化报表', + }, { + path: '/reportFile', + key: 'reportFile', + component: ReportFile, + breadcrumb: '报表文件', + }] + }, { + path: '/maintenancePlan', + key: 'maintenancePlan', + breadcrumb: '维护计划', + childRoutes: [{ + path: '/cyclePlan', + key: 'cyclePlan', + component: CyclePlan, + breadcrumb: '周期计划', + }, { + path: '/temporaryResponse', + key: 'temporaryResponse', + component: TemporaryResponse, + breadcrumb: '临时响应', + },] + }, { + path: '/carrierPigeon', + key: 'carrierPigeon', + breadcrumb: '信鸽服务', + childRoutes: [{ + path: '/emPush', + key: 'emPush', + component: EmPush, + breadcrumb: 'EM推送', + }, { + path: '/appPush', + key: 'appPush', + component: AppPush, + breadcrumb: '应用推送', + },] + }, { + path: '/preventiveMaintenance', + key: 'preventiveMaintenance', + breadcrumb: '预防性维保', + childRoutes: [{ + path: '/maintenanceModel', + key: 'maintenanceModel', + component: MaintenanceModel, + breadcrumb: '维保模型', + }] + }, { + path: '/serviceRecord', + key: 'serviceRecord', + breadcrumb: '服务记录', + childRoutes: [{ + path: '/serviceRecord1', + key: 'serviceRecord1', + component: ServiceRecord, breadcrumb: '服务记录', - childRoutes: [{ - path: '/serviceRecord1', - key: 'serviceRecord1', - component: ServiceRecord, - breadcrumb: '服务记录', - }, - { - path: '/MaintenanceRecords', - key: 'MaintenanceRecords', - component: MaintenanceRecords, - breadcrumb: '维护记录', - }] - }, - { - path: '/firmwareUpgrade', - key: 'firmwareUpgrade', - breadcrumb: '固件升级', - childRoutes: [{ - path: '/FirmwareLibrary', - key: 'firmwareLibrary', - component: FirmwareLibrary, - breadcrumb: '固件库', - },{ - path: '/DeviceManagement', - key: 'deviceManagement', - component: DeviceManagement, - breadcrumb: '设备管理', - }] - } - ] - } + }, + { + path: '/MaintenanceRecords', + key: 'MaintenanceRecords', + component: MaintenanceRecords, + breadcrumb: '维护记录', + }] + }, + { + path: '/firmwareUpgrade', + key: 'firmwareUpgrade', + breadcrumb: '固件升级', + childRoutes: [{ + path: '/FirmwareLibrary', + key: 'firmwareLibrary', + component: FirmwareLibrary, + breadcrumb: '固件库', + }, { + path: '/DeviceManagement', + key: 'deviceManagement', + component: DeviceManagement, + breadcrumb: '设备管理', + }] + } + ] + } }]; \ No newline at end of file