7 Commits

Author SHA1 Message Date
Misaka_Company
00c75fb0b8 1.6.0 2026-03-26 10:37:28 +08:00
Misaka_Company
a56d37a2e9 docs: add release notes for version 1.6.0
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-26 10:36:41 +08:00
Misaka_Company
43e6d1f4b4 feat(ui): add single-select mode for metrics in comparison view
- Restrict metric selection to single choice in user comparison view
- Auto-keep first selected metric when switching to comparison mode
- Update UI label to show "单选" or "多选" based on view mode
- Improve chart readability by preventing metric overload in comparison mode

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-26 10:35:35 +08:00
Misaka_Company
5ff5e5d18b fix(ui): correct per-order execution time calculation in report analysis
Fix bug where chart displayed accumulated total execution time instead of per-order average. The executionTimeSecs field now correctly shows average time per order (total time / total orders) for proper performance metrics.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-26 10:32:41 +08:00
Misaka_Company
44483120a5 Merge branch 'feature/report-analysis-12739002938269072937' into dev
This merge brings in the report analysis feature for admin users, including:
- Report analysis dialog with metrics visualization
- Execution time statistics parsing improvements
- Daily aggregated metrics with charts

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-26 09:48:11 +08:00
Misaka_Company
18a81ae030 fix(ui): improve execution time extraction in report analysis dialog
Enhanced value extraction with multi-pattern regex approach to handle various markdown table formats. Improved parseDurationToSeconds error handling for edge cases. Added debug logging for failed extractions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-03-26 09:47:25 +08:00
google-labs-jules[bot]
5178a2425a feat(ui): add report analysis feature for admin
Added a new ReportAnalysisDialog component, accessible from the ReportViewerDialog, strictly for Admin users. It parses execution reports, extracts markdown metrics like processed orders, skipped materials, errors, and execution time, and presents them in an interactive recharts line chart aggregated by day.

Co-authored-by: luwamgere15-crypto <255338376+luwamgere15-crypto@users.noreply.github.com>
2026-03-25 10:47:32 +00:00
8 changed files with 1278 additions and 36 deletions

14
docs/releases/1.6.0.md Normal file
View File

@@ -0,0 +1,14 @@
# 1.6.0
## 核心功能
- 新增管理员报表分析功能,支持多维度数据统计和可视化。
- 提供按日期聚合和用户对比两种视图模式。
- 支持处理订单数、删除物料数、错误数量等 7 种指标分析。
- 提供每订单平均耗时等效率指标,帮助识别性能瓶颈。
## 体验优化
- 对比视图下自动限制指标单选,避免图表信息过载。
- 切换视图模式时智能保留已选指标,提升交互流畅度。
- 优化时间解析逻辑,准确提取执行耗时数据。

416
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "erpauto",
"version": "1.5.1",
"version": "1.6.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "erpauto",
"version": "1.5.1",
"version": "1.6.0",
"hasInstallScript": true,
"dependencies": {
"@aws-sdk/client-s3": "^3.929.0",
@@ -27,6 +27,7 @@
"playwright-core": "^1.58.2",
"react-focus-lock": "^2.13.7",
"react-markdown": "^10.1.0",
"recharts": "^3.8.0",
"reflect-metadata": "^0.2.2",
"rehype-autolink-headings": "^7.1.0",
"rehype-highlight": "^7.0.2",
@@ -969,7 +970,6 @@
"resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.10.1.tgz",
"integrity": "sha512-Nh5PhEOeY6PrnxNPsEHRr9eimxLwgLlpmguQaHKBinFYA/RU9+kOYVOQqOrTsCL+KSxrLLl1gD8Dk5BFW/7l/w==",
"license": "MIT",
"peer": true,
"dependencies": {
"@azure/abort-controller": "^2.1.2",
"@azure/core-auth": "^1.10.0",
@@ -1031,7 +1031,6 @@
"resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.22.2.tgz",
"integrity": "sha512-MzHym+wOi8CLUlKCQu12de0nwcq9k9Kuv43j4Wa++CsCpJwps2eeBQwD2Bu8snkxTtDKDx4GwjuR9E8yC8LNrg==",
"license": "MIT",
"peer": true,
"dependencies": {
"@azure/abort-controller": "^2.1.2",
"@azure/core-auth": "^1.10.0",
@@ -1223,7 +1222,6 @@
"integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@babel/code-frame": "^7.29.0",
"@babel/generator": "^7.29.0",
@@ -2001,6 +1999,7 @@
"dev": true,
"license": "BSD-2-Clause",
"optional": true,
"peer": true,
"dependencies": {
"cross-dirname": "^0.1.0",
"debug": "^4.3.4",
@@ -2022,6 +2021,7 @@
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
@@ -2038,6 +2038,7 @@
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"universalify": "^2.0.0"
},
@@ -2052,6 +2053,7 @@
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"engines": {
"node": ">= 10.0.0"
}
@@ -3307,6 +3309,42 @@
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
}
},
"node_modules/@reduxjs/toolkit": {
"version": "2.11.2",
"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.11.2.tgz",
"integrity": "sha512-Kd6kAHTA6/nUpp8mySPqj3en3dm0tdMIgbttnQ1xFMVpufoj+ADi8pXLBsd4xzTRHQa7t/Jv8W5UnCuW4kuWMQ==",
"license": "MIT",
"dependencies": {
"@standard-schema/spec": "^1.0.0",
"@standard-schema/utils": "^0.3.0",
"immer": "^11.0.0",
"redux": "^5.0.1",
"redux-thunk": "^3.1.0",
"reselect": "^5.1.0"
},
"peerDependencies": {
"react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
"react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
},
"peerDependenciesMeta": {
"react": {
"optional": true
},
"react-redux": {
"optional": true
}
}
},
"node_modules/@reduxjs/toolkit/node_modules/immer": {
"version": "11.1.4",
"resolved": "https://registry.npmjs.org/immer/-/immer-11.1.4.tgz",
"integrity": "sha512-XREFCPo6ksxVzP4E0ekD5aMdf8WMwmdNaz6vuvxgI40UaEiu6q3p8X52aU6GdyvLY3XXX/8R7JOTXStz/nBbRw==",
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/immer"
}
},
"node_modules/@rolldown/pluginutils": {
"version": "1.0.0-rc.3",
"resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz",
@@ -4404,7 +4442,12 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
"integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
"dev": true,
"license": "MIT"
},
"node_modules/@standard-schema/utils": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
"integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
"license": "MIT"
},
"node_modules/@swc/helpers": {
@@ -4786,6 +4829,69 @@
"assertion-error": "^2.0.1"
}
},
"node_modules/@types/d3-array": {
"version": "3.2.2",
"resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
"integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
"license": "MIT"
},
"node_modules/@types/d3-color": {
"version": "3.1.3",
"resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
"integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
"license": "MIT"
},
"node_modules/@types/d3-ease": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
"integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
"license": "MIT"
},
"node_modules/@types/d3-interpolate": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
"integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
"license": "MIT",
"dependencies": {
"@types/d3-color": "*"
}
},
"node_modules/@types/d3-path": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
"integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
"license": "MIT"
},
"node_modules/@types/d3-scale": {
"version": "4.0.9",
"resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
"integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
"license": "MIT",
"dependencies": {
"@types/d3-time": "*"
}
},
"node_modules/@types/d3-shape": {
"version": "3.1.8",
"resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz",
"integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==",
"license": "MIT",
"dependencies": {
"@types/d3-path": "*"
}
},
"node_modules/@types/d3-time": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
"integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
"license": "MIT"
},
"node_modules/@types/d3-timer": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
"integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
"license": "MIT"
},
"node_modules/@types/debug": {
"version": "4.1.12",
"resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
@@ -4896,7 +5002,6 @@
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.13.tgz",
"integrity": "sha512-akNQMv0wW5uyRpD2v2IEyRSZiR+BeGuoB6L310EgGObO44HSMNT8z1xzio28V8qOrgYaopIDNA18YgdXd+qTiw==",
"license": "MIT",
"peer": true,
"dependencies": {
"undici-types": "~6.21.0"
}
@@ -4918,7 +5023,6 @@
"resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz",
"integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
"license": "MIT",
"peer": true,
"dependencies": {
"csstype": "^3.2.2"
}
@@ -4963,6 +5067,12 @@
"integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
"license": "MIT"
},
"node_modules/@types/use-sync-external-store": {
"version": "0.0.6",
"resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
"integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
"license": "MIT"
},
"node_modules/@types/uuid": {
"version": "10.0.0",
"resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-10.0.0.tgz",
@@ -5033,7 +5143,6 @@
"integrity": "sha512-klQbnPAAiGYFyI02+znpBRLyjL4/BrBd0nyWkdC0s/6xFLkXYQ8OoRrSkqacS1ddVxf/LDyODIKbQ5TgKAf/Fg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@typescript-eslint/scope-manager": "8.56.1",
"@typescript-eslint/types": "8.56.1",
@@ -5473,7 +5582,6 @@
"integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"acorn": "bin/acorn"
},
@@ -5506,7 +5614,6 @@
"integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
"fast-json-stable-stringify": "^2.0.0",
@@ -6269,7 +6376,6 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"baseline-browser-mapping": "^2.9.0",
"caniuse-lite": "^1.0.30001759",
@@ -7065,7 +7171,8 @@
"integrity": "sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==",
"dev": true,
"license": "MIT",
"optional": true
"optional": true,
"peer": true
},
"node_modules/cross-spawn": {
"version": "7.0.6",
@@ -7108,6 +7215,127 @@
"integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
"license": "MIT"
},
"node_modules/d3-array": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
"integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
"license": "ISC",
"dependencies": {
"internmap": "1 - 2"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-color": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
"integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-ease": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
"integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
"license": "BSD-3-Clause",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-format": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz",
"integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-interpolate": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
"integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
"license": "ISC",
"dependencies": {
"d3-color": "1 - 3"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-path": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
"integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/d3-scale": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
"integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
"license": "ISC",
"dependencies": {
"d3-array": "2.10.0 - 3",
"d3-format": "1 - 3",
"d3-interpolate": "1.2.0 - 3",
"d3-time": "2.1.1 - 3",
"d3-time-format": "2 - 4"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-shape": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
"integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
"license": "ISC",
"dependencies": {
"d3-path": "^3.1.0"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-time": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
"integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
"license": "ISC",
"dependencies": {
"d3-array": "2 - 3"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-time-format": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
"integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
"license": "ISC",
"dependencies": {
"d3-time": "1 - 3"
},
"engines": {
"node": ">=12"
}
},
"node_modules/d3-timer": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
"integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/data-view-buffer": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
@@ -7195,6 +7423,12 @@
}
}
},
"node_modules/decimal.js-light": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
"integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
"license": "MIT"
},
"node_modules/decode-named-character-reference": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.3.0.tgz",
@@ -7471,7 +7705,6 @@
"integrity": "sha512-glMJgnTreo8CFINujtAhCgN96QAqApDMZ8Vl1r8f0QT8QprvC1UCltV4CcWj20YoIyLZx6IUskaJZ0NV8fokcg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"app-builder-lib": "26.8.1",
"builder-util": "26.8.1",
@@ -7686,7 +7919,6 @@
"integrity": "sha512-Rz5QvP1pTqoU1DPRrG3EeX2oWBtS3uRmd6Z/wzZsb2e/iIUsrT+XcBaAhFr4FW48gDc8uP2wYVyY5Aamha/5Zg==",
"hasInstallScript": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@electron/get": "^2.0.0",
"@types/node": "^22.7.7",
@@ -7875,6 +8107,7 @@
"dev": true,
"hasInstallScript": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@electron/asar": "^3.2.1",
"debug": "^4.1.1",
@@ -7895,6 +8128,7 @@
"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"graceful-fs": "^4.1.2",
"jsonfile": "^4.0.0",
@@ -8146,6 +8380,16 @@
"url": "https://github.com/sponsors/ljharb"
}
},
"node_modules/es-toolkit": {
"version": "1.45.1",
"resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.45.1.tgz",
"integrity": "sha512-/jhoOj/Fx+A+IIyDNOvO3TItGmlMKhtX8ISAHKE90c4b/k1tqaqEZ+uUqfpU8DMnW5cgNJv606zS55jGvza0Xw==",
"license": "MIT",
"workspaces": [
"docs",
"benchmarks"
]
},
"node_modules/es6-error": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
@@ -8223,7 +8467,6 @@
"integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.8.0",
"@eslint-community/regexpp": "^4.12.1",
@@ -8284,7 +8527,6 @@
"integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"eslint-config-prettier": "bin/cli.js"
},
@@ -8574,6 +8816,12 @@
"node": ">=6"
}
},
"node_modules/eventemitter3": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
"integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
"license": "MIT"
},
"node_modules/events": {
"version": "3.3.0",
"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -9752,6 +10000,16 @@
"integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==",
"license": "MIT"
},
"node_modules/immer": {
"version": "10.2.0",
"resolved": "https://registry.npmjs.org/immer/-/immer-10.2.0.tgz",
"integrity": "sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==",
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/immer"
}
},
"node_modules/import-fresh": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
@@ -9817,6 +10075,15 @@
"node": ">= 0.4"
}
},
"node_modules/internmap": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
"integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
"license": "ISC",
"engines": {
"node": ">=12"
}
},
"node_modules/ip-address": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz",
@@ -13247,7 +13514,6 @@
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=12"
},
@@ -13328,7 +13594,6 @@
}
],
"license": "MIT",
"peer": true,
"dependencies": {
"nanoid": "^3.3.11",
"picocolors": "^1.1.1",
@@ -13352,6 +13617,7 @@
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"dependencies": {
"commander": "^9.4.0"
},
@@ -13369,6 +13635,7 @@
"dev": true,
"license": "MIT",
"optional": true,
"peer": true,
"engines": {
"node": "^12.20.0 || >=14"
}
@@ -13389,7 +13656,6 @@
"integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==",
"dev": true,
"license": "MIT",
"peer": true,
"bin": {
"prettier": "bin/prettier.cjs"
},
@@ -13531,7 +13797,6 @@
"resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
"integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
"license": "MIT",
"peer": true,
"engines": {
"node": ">=0.10.0"
}
@@ -13553,7 +13818,6 @@
"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
"integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
"license": "MIT",
"peer": true,
"dependencies": {
"scheduler": "^0.27.0"
},
@@ -13617,6 +13881,29 @@
"react": ">=18"
}
},
"node_modules/react-redux": {
"version": "9.2.0",
"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
"integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
"license": "MIT",
"dependencies": {
"@types/use-sync-external-store": "^0.0.6",
"use-sync-external-store": "^1.4.0"
},
"peerDependencies": {
"@types/react": "^18.2.25 || ^19",
"react": "^18.0 || ^19",
"redux": "^5.0.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"redux": {
"optional": true
}
}
},
"node_modules/react-refresh": {
"version": "0.18.0",
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
@@ -13690,6 +13977,51 @@
"node": ">=10"
}
},
"node_modules/recharts": {
"version": "3.8.0",
"resolved": "https://registry.npmjs.org/recharts/-/recharts-3.8.0.tgz",
"integrity": "sha512-Z/m38DX3L73ExO4Tpc9/iZWHmHnlzWG4njQbxsF5aSjwqmHNDDIm0rdEBArkwsBvR8U6EirlEHiQNYWCVh9sGQ==",
"license": "MIT",
"workspaces": [
"www"
],
"dependencies": {
"@reduxjs/toolkit": "^1.9.0 || 2.x.x",
"clsx": "^2.1.1",
"decimal.js-light": "^2.5.1",
"es-toolkit": "^1.39.3",
"eventemitter3": "^5.0.1",
"immer": "^10.1.1",
"react-redux": "8.x.x || 9.x.x",
"reselect": "5.1.1",
"tiny-invariant": "^1.3.3",
"use-sync-external-store": "^1.2.2",
"victory-vendor": "^37.0.2"
},
"engines": {
"node": ">=18"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
"react-is": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
}
},
"node_modules/redux": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
"integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
"license": "MIT"
},
"node_modules/redux-thunk": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
"integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
"license": "MIT",
"peerDependencies": {
"redux": "^5.0.0"
}
},
"node_modules/reflect-metadata": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.2.2.tgz",
@@ -13885,6 +14217,12 @@
"url": "https://github.com/sponsors/jet2jet"
}
},
"node_modules/reselect": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
"integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
"license": "MIT"
},
"node_modules/resolve": {
"version": "2.0.0-next.6",
"resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.6.tgz",
@@ -15067,6 +15405,7 @@
"integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"mkdirp": "^0.5.1",
"rimraf": "~2.6.2"
@@ -15150,6 +15489,12 @@
"semver": "bin/semver"
}
},
"node_modules/tiny-invariant": {
"version": "1.3.3",
"resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
"integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
"license": "MIT"
},
"node_modules/tinybench": {
"version": "2.9.0",
"resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
@@ -16096,7 +16441,6 @@
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"dev": true,
"license": "Apache-2.0",
"peer": true,
"bin": {
"tsc": "bin/tsc",
"tsserver": "bin/tsserver"
@@ -16507,12 +16851,33 @@
"url": "https://opencollective.com/unified"
}
},
"node_modules/victory-vendor": {
"version": "37.3.6",
"resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.3.6.tgz",
"integrity": "sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==",
"license": "MIT AND ISC",
"dependencies": {
"@types/d3-array": "^3.0.3",
"@types/d3-ease": "^3.0.0",
"@types/d3-interpolate": "^3.0.1",
"@types/d3-scale": "^4.0.2",
"@types/d3-shape": "^3.1.0",
"@types/d3-time": "^3.0.0",
"@types/d3-timer": "^3.0.0",
"d3-array": "^3.1.6",
"d3-ease": "^3.0.1",
"d3-interpolate": "^3.0.1",
"d3-scale": "^4.0.2",
"d3-shape": "^3.1.0",
"d3-time": "^3.0.0",
"d3-timer": "^3.0.1"
}
},
"node_modules/vite": {
"version": "7.3.1",
"resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
"integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
"license": "MIT",
"peer": true,
"dependencies": {
"esbuild": "^0.27.0",
"fdir": "^6.5.0",
@@ -17059,7 +17424,6 @@
"integrity": "sha512-hOQuK7h0FGKgBAas7v0mSAsnvrIgAvWmRFjmzpJ7SwFHH3g1k2u37JtYwOwmEKhK6ZO3v9ggDBBm0La1LCK4uQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@vitest/expect": "4.0.18",
"@vitest/mocker": "4.0.18",
@@ -17268,7 +17632,6 @@
"resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz",
"integrity": "sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==",
"license": "MIT",
"peer": true,
"dependencies": {
"@colors/colors": "^1.6.0",
"@dabh/diagnostics": "^2.0.8",
@@ -17506,7 +17869,6 @@
"resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz",
"integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
"license": "MIT",
"peer": true,
"funding": {
"url": "https://github.com/sponsors/colinhacks"
}

View File

@@ -1,6 +1,6 @@
{
"name": "erpauto",
"version": "1.5.1",
"version": "1.6.0",
"description": "An Electron application with React and TypeScript",
"main": "./out/main/index.js",
"author": "example.com",
@@ -51,6 +51,7 @@
"playwright-core": "^1.58.2",
"react-focus-lock": "^2.13.7",
"react-markdown": "^10.1.0",
"recharts": "^3.8.0",
"reflect-metadata": "^0.2.2",
"rehype-autolink-headings": "^7.1.0",
"rehype-highlight": "^7.0.2",

View File

@@ -0,0 +1,823 @@
import React, { useCallback, useEffect, useState, useMemo } from 'react'
import { X, BarChart3, Loader2, AlertCircle } from 'lucide-react'
import {
XAxis,
YAxis,
CartesianGrid,
Tooltip,
Legend,
ResponsiveContainer,
Line,
ComposedChart
} from 'recharts'
interface ReportAnalysisDialogProps {
isOpen: boolean
onClose: () => void
isAdmin: boolean
}
// Extracted metrics from a single report
interface ReportMetrics {
date: string
user: string
processedOrders: number
deletedMaterials: number
skippedMaterials: number
errors: number
retriedOrders: number
successfulRetries: number
executionTimeSecs: number
timestamp: number
}
// Aggregated daily metrics
interface DailyMetrics {
date: string
processedOrders: number
deletedMaterials: number
skippedMaterials: number
errors: number
retriedOrders: number
successfulRetries: number
executionTimeSecs: number
avgExecutionTimeSecs: number
users: string[] // Unique users who ran reports on this day
reportCount: number
}
// User-specific daily metrics for comparison view
interface UserDailyMetrics {
date: string
user: string
processedOrders: number
deletedMaterials: number
skippedMaterials: number
errors: number
retriedOrders: number
successfulRetries: number
executionTimeSecs: number
reportCount: number
}
type MetricKey = keyof Omit<DailyMetrics, 'date' | 'users' | 'reportCount' | 'avgExecutionTimeSecs'>
const METRIC_LABELS: Record<MetricKey, string> = {
processedOrders: '处理订单数',
deletedMaterials: '删除物料数',
skippedMaterials: '跳过物料数',
errors: '错误数量',
retriedOrders: '重试订单数',
successfulRetries: '成功重试数',
executionTimeSecs: '每订单平均耗时(秒)'
}
const METRIC_COLORS: Record<MetricKey, string> = {
processedOrders: '#3b82f6', // blue-500
deletedMaterials: '#ef4444', // red-500
skippedMaterials: '#eab308', // yellow-500
errors: '#000000', // black
retriedOrders: '#8b5cf6', // violet-500
successfulRetries: '#10b981', // emerald-500
executionTimeSecs: '#f97316' // orange-500
}
// User colors for comparison view
const USER_COLORS = [
'#3b82f6', // blue-500
'#10b981', // emerald-500
'#f59e0b', // amber-500
'#ef4444', // red-500
'#8b5cf6', // violet-500
'#ec4899', // pink-500
'#06b6d4', // cyan-500
'#84cc16' // lime-500
]
const getUserColor = (user: string, users: string[]): string => {
const index = users.indexOf(user)
return USER_COLORS[index % USER_COLORS.length]
}
export const ReportAnalysisDialog: React.FC<ReportAnalysisDialogProps> = ({
isOpen,
onClose,
isAdmin
}) => {
const [isLoading, setIsLoading] = useState(false)
const [error, setError] = useState<string | null>(null)
const [reportData, setReportData] = useState<ReportMetrics[]>([])
// Selected metrics for the chart
const [selectedMetrics, setSelectedMetrics] = useState<Set<MetricKey>>(
new Set(['processedOrders', 'deletedMaterials', 'errors'])
)
// View mode: aggregated (by date) or comparison (by user)
const [viewMode, setViewMode] = useState<'aggregated' | 'comparison'>('aggregated')
// Selected users for comparison view
const [selectedUsers, setSelectedUsers] = useState<Set<string>>(new Set())
const parseDurationToSeconds = (durationStr: string): number => {
// Handle empty or zero case
if (!durationStr || durationStr === '0秒' || durationStr === '0分0秒') {
return 0
}
// Remove any remaining backticks
const cleanStr = durationStr.replace(/\`/g, '').trim()
let totalSeconds = 0
const minutesMatch = cleanStr.match(/(\d+)分/)
if (minutesMatch) {
totalSeconds += parseInt(minutesMatch[1], 10) * 60
}
const secondsMatch = cleanStr.match(/(\d+)秒/)
if (secondsMatch) {
totalSeconds += parseInt(secondsMatch[1], 10)
}
return totalSeconds
}
const loadAndAnalyzeReports = useCallback(async () => {
if (!isAdmin) return
setIsLoading(true)
setError(null)
try {
// 1. Fetch report list
const listResult = await window.electron.report.listAll()
if (!listResult.success || !listResult.data) {
throw new Error(listResult.error || '获取报告列表失败')
}
const reports = listResult.data
const metricsList: ReportMetrics[] = []
// 2. Fetch content for each report (in chunks to avoid memory/network issues if there are many)
const chunkSize = 10
for (let i = 0; i < reports.length; i += chunkSize) {
const chunk = reports.slice(i, i + chunkSize)
const contentPromises = chunk.map(async (report) => {
try {
const contentResult = await window.electron.report.download(report.key)
if (contentResult.success && contentResult.data) {
return { report, content: contentResult.data }
}
} catch (e) {
console.warn(`Failed to fetch content for report ${report.key}`, e)
}
return null
})
const chunkContents = await Promise.all(contentPromises)
// 3. Parse each report's markdown content
for (const item of chunkContents) {
if (!item) continue
const { report, content } = item
// Regex to extract values from the markdown table
const extractValue = (key: string): string | null => {
// Try multiple patterns in order of specificity
const patterns = [
// Pattern 1: Standard format with backticks
new RegExp(`\\|\\s*\\*\\*${key}\\*\\*\\s*\\|\\s*\`([^\`]+)\`\\s*\\|`),
// Pattern 2: Without backticks (fallback for older formats)
new RegExp(`\\|\\s*\\*\\*${key}\\*\\*\\s*\\|\\s*([^\\|\\s]+(?:\\s+[^\\|\\s]+)*)\\s*\\|`),
// Pattern 3: More relaxed - any content between pipes
new RegExp(`\\|\\s*\\*\\*${key}\\*\\*\\s*\\|\\s*(.+?)\\s*\\|`)
]
for (const pattern of patterns) {
const match = content.match(pattern)
if (match && match[1]) {
const value = match[1].trim()
// Remove backticks if they're still present
return value.replace(/\`/g, '')
}
}
return null
}
const execTimeStr = extractValue('执行时间')
const user = extractValue('操作用户') || report.username || 'unknown'
const processedOrders = parseInt(extractValue('处理订单数') || '0', 10)
const deletedMaterials = parseInt(extractValue('删除物料数') || '0', 10)
const skippedMaterials = parseInt(extractValue('跳过物料数') || '0', 10)
const errors = parseInt(extractValue('错误数量') || '0', 10)
const retriedOrders = parseInt(extractValue('重试订单数') || '0', 10)
const successfulRetries = parseInt(extractValue('成功重试数') || '0', 10)
const executionTimeStr = extractValue('执行耗时') || '0秒'
if (executionTimeStr === '0秒') {
console.warn('Failed to extract execution time from report:', report.key)
}
const executionTimeSecs = parseDurationToSeconds(executionTimeStr)
// Try to parse the date
let dateStr = '未知日期'
let timestamp = report.lastModified ? new Date(report.lastModified).getTime() : 0
if (execTimeStr) {
try {
const parsedDate = new Date(execTimeStr)
if (!isNaN(parsedDate.getTime())) {
dateStr = parsedDate
.toLocaleDateString('zh-CN', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
})
.replace(/\//g, '-')
timestamp = parsedDate.getTime()
}
} catch {
// Fallback to report lastModified
}
}
if (dateStr === '未知日期' && report.lastModified) {
const d = new Date(report.lastModified)
dateStr = d
.toLocaleDateString('zh-CN', {
year: 'numeric',
month: '2-digit',
day: '2-digit'
})
.replace(/\//g, '-')
}
metricsList.push({
date: dateStr,
user,
processedOrders,
deletedMaterials,
skippedMaterials,
errors,
retriedOrders,
successfulRetries,
executionTimeSecs,
timestamp
})
}
}
setReportData(metricsList)
} catch (err: any) {
setError(err.message || '分析报告时发生错误')
} finally {
setIsLoading(false)
}
}, [isAdmin])
useEffect(() => {
if (isOpen && isAdmin) {
void loadAndAnalyzeReports()
} else {
setReportData([])
setError(null)
}
}, [isOpen, isAdmin, loadAndAnalyzeReports])
// Aggregate data by date
const chartData = useMemo(() => {
if (!reportData.length) return []
const dailyMap = new Map<string, DailyMetrics>()
for (const data of reportData) {
const { date } = data
if (!dailyMap.has(date)) {
dailyMap.set(date, {
date,
processedOrders: 0,
deletedMaterials: 0,
skippedMaterials: 0,
errors: 0,
retriedOrders: 0,
successfulRetries: 0,
executionTimeSecs: 0,
avgExecutionTimeSecs: 0,
users: [],
reportCount: 0
})
}
const day = dailyMap.get(date)!
day.processedOrders += data.processedOrders
day.deletedMaterials += data.deletedMaterials
day.skippedMaterials += data.skippedMaterials
day.errors += data.errors
day.retriedOrders += data.retriedOrders
day.successfulRetries += data.successfulRetries
day.executionTimeSecs += data.executionTimeSecs
day.reportCount += 1
if (!day.users.includes(data.user)) {
day.users.push(data.user)
}
}
// Calculate average execution time per order for each day
// Formula: total execution time / total processed orders (efficiency metric)
for (const day of dailyMap.values()) {
day.avgExecutionTimeSecs = day.processedOrders > 0
? day.executionTimeSecs / day.processedOrders
: 0
// Replace executionTimeSecs with avgExecutionTimeSecs for chart display
day.executionTimeSecs = day.avgExecutionTimeSecs
}
// Convert map to array and sort by date
const sortedData = Array.from(dailyMap.values()).sort((a, b) => {
// Basic string comparison works for YYYY-MM-DD
return a.date.localeCompare(b.date)
})
return sortedData
}, [reportData])
// Extract all unique users from report data
const allUsers = useMemo(() => {
const userSet = new Set<string>()
reportData.forEach(data => userSet.add(data.user))
return Array.from(userSet).sort()
}, [reportData])
// Aggregate data by date AND user for comparison view
const comparisonData = useMemo(() => {
if (!reportData.length) return []
// Filter by selected users if any
const filteredData = selectedUsers.size > 0
? reportData.filter(data => selectedUsers.has(data.user))
: reportData
// Group by date + user
const keyMap = new Map<string, UserDailyMetrics>()
for (const data of filteredData) {
const key = `${data.date}|${data.user}`
if (!keyMap.has(key)) {
keyMap.set(key, {
date: data.date,
user: data.user,
processedOrders: 0,
deletedMaterials: 0,
skippedMaterials: 0,
errors: 0,
retriedOrders: 0,
successfulRetries: 0,
executionTimeSecs: 0,
reportCount: 0
})
}
const entry = keyMap.get(key)!
entry.processedOrders += data.processedOrders
entry.deletedMaterials += data.deletedMaterials
entry.skippedMaterials += data.skippedMaterials
entry.errors += data.errors
entry.retriedOrders += data.retriedOrders
entry.successfulRetries += data.successfulRetries
entry.executionTimeSecs += data.executionTimeSecs
entry.reportCount += 1
}
// Calculate average execution time per order for each entry
// Formula: total execution time / total processed orders (efficiency metric)
for (const entry of keyMap.values()) {
entry.executionTimeSecs = entry.processedOrders > 0
? entry.executionTimeSecs / entry.processedOrders
: 0
}
return Array.from(keyMap.values())
.sort((a, b) => {
const dateCompare = a.date.localeCompare(b.date)
if (dateCompare !== 0) return dateCompare
return a.user.localeCompare(b.user)
})
}, [reportData, selectedUsers])
// Format comparison data for chart rendering
const comparisonChartData = useMemo(() => {
if (!comparisonData.length) return []
const dates = [...new Set(comparisonData.map(d => d.date))].sort()
const users = [...new Set(comparisonData.map(d => d.user))]
.filter(user => selectedUsers.size === 0 || selectedUsers.has(user))
.sort()
const lookup = new Map<string, UserDailyMetrics>()
comparisonData.forEach(d => {
lookup.set(`${d.date}|${d.user}`, d)
})
return dates.map(date => {
const point: any = { date }
users.forEach(user => {
const key = `${date}|${user}`
const data = lookup.get(key)
Array.from(selectedMetrics).forEach(metric => {
const userKey = `${user}_${metric}` as any
point[userKey] = data ? (data as any)[metric] : 0
})
})
return point
})
}, [comparisonData, selectedMetrics, selectedUsers])
const handleMetricToggle = (metric: MetricKey) => {
// In comparison view, only allow single metric selection
if (viewMode === 'comparison') {
setSelectedMetrics(new Set([metric]))
} else {
// In aggregated view, allow multiple metric selection
const next = new Set(selectedMetrics)
if (next.has(metric)) {
if (next.size > 1) {
// Ensure at least one metric is selected
next.delete(metric)
}
} else {
next.add(metric)
}
setSelectedMetrics(next)
}
}
const handleViewModeChange = (newMode: 'aggregated' | 'comparison') => {
setViewMode(newMode)
// When switching to comparison view, keep only the first selected metric
if (newMode === 'comparison' && selectedMetrics.size > 1) {
const firstMetric = Array.from(selectedMetrics)[0]
setSelectedMetrics(new Set([firstMetric]))
}
}
// Custom Tooltip formatter
const CustomTooltip = ({ active, payload, label }: any) => {
if (active && payload && payload.length) {
// Find the original daily data
const dailyData = chartData.find((d) => d.date === label)
return (
<div className="bg-white p-4 border border-slate-200 shadow-lg rounded-lg max-w-sm">
<p className="font-semibold text-slate-800 mb-2 border-b border-slate-100 pb-2">
{label}
</p>
<div className="space-y-1.5 text-sm">
{payload.map((entry: any, index: number) => (
<div key={index} className="flex justify-between items-center gap-4">
<span className="flex items-center gap-1.5 text-slate-600">
<span
className="w-2.5 h-2.5 rounded-full"
style={{ backgroundColor: entry.color }}
></span>
{entry.name}:
</span>
<span className="font-medium text-slate-900">
{entry.value} {entry.dataKey === 'executionTimeSecs' ? '秒' : ''}
</span>
</div>
))}
</div>
{dailyData && (
<div className="mt-3 pt-2 border-t border-slate-100 text-xs text-slate-500">
<p>: {dailyData.users.join(', ')}</p>
<p className="mt-1">: {dailyData.reportCount}</p>
<p className="mt-1">: {dailyData.avgExecutionTimeSecs.toFixed(1)} </p>
</div>
)}
</div>
)
}
return null
}
// Comparison Tooltip for user-specific data
const ComparisonTooltip = ({ active, payload, label, users, selectedUsers }: any) => {
if (active && payload && payload.length) {
const displayUsers = selectedUsers.size === 0 ? users : Array.from(selectedUsers)
const firstMetric = Array.from(selectedMetrics)[0]
return (
<div className="bg-white p-4 border border-slate-200 shadow-lg rounded-lg max-w-sm">
<p className="font-semibold text-slate-800 mb-2 border-b border-slate-100 pb-2">{label}</p>
<div className="space-y-1.5 text-sm">
{displayUsers.map((user: string) => {
const userEntry = payload.find((p: any) => p.name === (user || '未分配'))
if (!userEntry) return null
return (
<div key={user} className="flex justify-between items-center gap-4">
<span className="flex items-center gap-1.5 text-slate-600">
<span className="w-2.5 h-2.5 rounded-full" style={{ backgroundColor: userEntry.color }} />
{user || '未分配'}:
</span>
<span className="font-medium text-slate-900">
{userEntry.value} {firstMetric === 'executionTimeSecs' ? '秒' : ''}
</span>
</div>
)
})}
</div>
</div>
)
}
return null
}
if (!isOpen) return null
if (!isAdmin) return null
return (
<div className="fixed inset-0 z-[110] flex items-center justify-center bg-slate-900/50 backdrop-blur-sm animate-in fade-in duration-200">
<div className="bg-white rounded-2xl shadow-2xl w-[1000px] max-w-[95vw] h-[85vh] flex flex-col border border-slate-200 overflow-hidden animate-in zoom-in-95 duration-200">
{/* Header */}
<div className="flex items-center justify-between px-6 py-4 border-b border-slate-200 bg-slate-50 flex-shrink-0">
<div className="flex items-center gap-2 text-slate-800">
<BarChart3 size={20} className="text-blue-600" />
<h2 className="text-lg font-semibold"></h2>
</div>
<button
onClick={onClose}
className="text-slate-400 hover:text-slate-600 hover:bg-slate-200/50 p-1.5 rounded-lg transition-colors"
>
<X size={20} />
</button>
</div>
{/* Content */}
<div className="flex-1 overflow-hidden flex flex-col bg-white">
{isLoading ? (
<div className="flex-1 flex flex-col items-center justify-center text-slate-500">
<Loader2 size={32} className="animate-spin text-blue-500 mb-4" />
<p>...</p>
</div>
) : error ? (
<div className="flex-1 flex flex-col items-center justify-center text-red-500 p-8 text-center">
<AlertCircle size={48} className="mb-4 opacity-80" />
<p className="text-lg font-medium mb-2"></p>
<p className="text-sm opacity-80">{error}</p>
<button
onClick={loadAndAnalyzeReports}
className="mt-6 px-4 py-2 bg-red-50 text-red-600 border border-red-200 rounded-lg hover:bg-red-100 transition-colors"
>
</button>
</div>
) : chartData.length === 0 ? (
<div className="flex-1 flex flex-col items-center justify-center text-slate-400">
<BarChart3 size={48} className="mb-4 opacity-50 text-slate-300" />
<p></p>
</div>
) : (
<div className="flex-1 flex flex-col p-6 overflow-y-auto">
{/* Controls */}
<div className="mb-8">
<h3 className="text-sm font-medium text-slate-700 mb-3">
({viewMode === 'comparison' ? '单选' : '多选'})
</h3>
<div className="flex flex-wrap gap-2">
{(Object.keys(METRIC_LABELS) as MetricKey[]).map((key) => {
const isSelected = selectedMetrics.has(key)
return (
<button
key={key}
onClick={() => handleMetricToggle(key)}
className={`
px-3 py-1.5 rounded-full text-xs font-medium border transition-colors flex items-center gap-1.5
${
isSelected
? 'bg-blue-50 border-blue-200 text-blue-700'
: 'bg-white border-slate-200 text-slate-600 hover:bg-slate-50'
}
`}
>
<div
className="w-2 h-2 rounded-full"
style={{ backgroundColor: isSelected ? METRIC_COLORS[key] : '#cbd5e1' }}
/>
{METRIC_LABELS[key]}
</button>
)
})}
</div>
</div>
{/* View Mode Toggle */}
<div className="mb-6">
<h3 className="text-sm font-medium text-slate-700 mb-3"></h3>
<div className="flex gap-2">
<button
onClick={() => handleViewModeChange('aggregated')}
className={`px-4 py-2 rounded-lg text-sm font-medium border transition-colors ${
viewMode === 'aggregated'
? 'bg-blue-50 border-blue-200 text-blue-700'
: 'bg-white border-slate-200 text-slate-600 hover:bg-slate-50'
}`}
>
</button>
<button
onClick={() => handleViewModeChange('comparison')}
className={`px-4 py-2 rounded-lg text-sm font-medium border transition-colors ${
viewMode === 'comparison'
? 'bg-blue-50 border-blue-200 text-blue-700'
: 'bg-white border-slate-200 text-slate-600 hover:bg-slate-50'
}`}
>
</button>
</div>
</div>
{/* User Filter Chips - Only in comparison mode */}
{viewMode === 'comparison' && (
<div className="mb-6">
<div className="flex items-center justify-between mb-3">
<h3 className="text-sm font-medium text-slate-700"></h3>
<div className="flex gap-2">
<button
onClick={() => setSelectedUsers(new Set(allUsers))}
className="text-xs text-blue-600 hover:underline"
>
</button>
<button
onClick={() => setSelectedUsers(new Set())}
className="text-xs text-slate-500 hover:underline"
>
</button>
</div>
</div>
<div className="flex flex-wrap gap-2">
{allUsers.map((user) => {
const isSelected = selectedUsers.has(user)
const color = getUserColor(user, allUsers)
return (
<button
key={user}
onClick={() => {
const next = new Set(selectedUsers)
if (next.has(user)) {
next.delete(user)
} else {
next.add(user)
}
setSelectedUsers(next)
}}
className={`px-3 py-1.5 rounded-full text-xs font-medium border transition-colors flex items-center gap-1.5 ${
isSelected
? 'bg-white border-current'
: 'bg-white border-slate-200 text-slate-600 hover:bg-slate-50'
}`}
style={isSelected ? { color, borderColor: color } : {}}
>
<div
className="w-2 h-2 rounded-full"
style={{ backgroundColor: isSelected ? color : '#cbd5e1' }}
/>
{user || '未分配'}
</button>
)
})}
</div>
{selectedUsers.size === 0 && (
<p className="text-xs text-slate-500 mt-2">
</p>
)}
</div>
)}
{/* Chart */}
<div className="flex-1 min-h-[400px]">
{viewMode === 'aggregated' ? (
<ResponsiveContainer width="100%" height="100%">
<ComposedChart
data={chartData}
margin={{ top: 20, right: 30, left: 20, bottom: 20 }}
>
<CartesianGrid strokeDasharray="3 3" vertical={false} stroke="#e2e8f0" />
<XAxis
dataKey="date"
axisLine={false}
tickLine={false}
tick={{ fill: '#64748b', fontSize: 12 }}
dy={10}
/>
<YAxis
axisLine={false}
tickLine={false}
tick={{ fill: '#64748b', fontSize: 12 }}
/>
<Tooltip content={<CustomTooltip />} />
<Legend wrapperStyle={{ paddingTop: '20px' }} iconType="circle" />
{Array.from(selectedMetrics).map((metric) => (
<Line
key={metric}
type="monotone"
dataKey={metric}
name={METRIC_LABELS[metric]}
stroke={METRIC_COLORS[metric]}
strokeWidth={2}
dot={{ r: 4, strokeWidth: 2 }}
activeDot={{ r: 6, strokeWidth: 0 }}
/>
))}
</ComposedChart>
</ResponsiveContainer>
) : (
<ResponsiveContainer width="100%" height="100%">
<ComposedChart
data={comparisonChartData}
margin={{ top: 20, right: 30, left: 20, bottom: 20 }}
>
<CartesianGrid strokeDasharray="3 3" vertical={false} stroke="#e2e8f0" />
<XAxis
dataKey="date"
axisLine={false}
tickLine={false}
tick={{ fill: '#64748b', fontSize: 12 }}
dy={10}
/>
<YAxis
axisLine={false}
tickLine={false}
tick={{ fill: '#64748b', fontSize: 12 }}
/>
<Tooltip content={<ComparisonTooltip users={allUsers} selectedUsers={selectedUsers} />} />
<Legend wrapperStyle={{ paddingTop: '20px' }} iconType="circle" />
{selectedUsers.size === 0 || selectedUsers.size > 1
? // Multiple users: show first metric for each user
allUsers.filter(user => selectedUsers.size === 0 || selectedUsers.has(user)).map((user) => (
<Line
key={user}
type="monotone"
dataKey={`${user}_${Array.from(selectedMetrics)[0]}`}
name={user || '未分配'}
stroke={getUserColor(user, allUsers)}
strokeWidth={2}
dot={{ r: 4, strokeWidth: 2 }}
activeDot={{ r: 6, strokeWidth: 0 }}
/>
))
: // Single user: show all metrics for that user
Array.from(selectedMetrics).map((metric) => {
const user = Array.from(selectedUsers)[0]
return (
<Line
key={metric}
type="monotone"
dataKey={`${user}_${metric}`}
name={METRIC_LABELS[metric]}
stroke={METRIC_COLORS[metric]}
strokeWidth={2}
dot={{ r: 4, strokeWidth: 2 }}
activeDot={{ r: 6, strokeWidth: 0 }}
/>
)
})
}
</ComposedChart>
</ResponsiveContainer>
)}
</div>
<div className="mt-4 text-center text-xs text-slate-400">
{viewMode === 'aggregated'
? '数据以天为单位进行聚合统计。展示的是选定时间段内的总量。'
: selectedUsers.size === 0
? '展示所有用户的数据对比。未选择用户时显示全部。'
: '展示选定用户的数据对比。'
}
</div>
</div>
)}
</div>
</div>
</div>
)
}
export default ReportAnalysisDialog

View File

@@ -1,5 +1,5 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react'
import { X, FileText, Loader2, ChevronDown } from 'lucide-react'
import { X, FileText, Loader2, ChevronDown, BarChart3 } from 'lucide-react'
import { Combobox, Transition } from '@headlessui/react'
import ReactMarkdown from 'react-markdown'
import remarkGfm from 'remark-gfm'
@@ -22,13 +22,15 @@ interface ReportViewerDialogProps {
onClose: () => void
isAdmin: boolean
currentUsername: string
onOpenAnalysis?: () => void
}
export const ReportViewerDialog: React.FC<ReportViewerDialogProps> = ({
isOpen,
onClose,
isAdmin,
currentUsername
currentUsername,
onOpenAnalysis
}) => {
const [reports, setReports] = useState<ReportMetadata[]>([])
const [selectedReport, setSelectedReport] = useState<ReportMetadata | null>(null)
@@ -130,12 +132,23 @@ export const ReportViewerDialog: React.FC<ReportViewerDialogProps> = ({
<FileText size={20} className="text-blue-600" />
<h2 className="text-lg font-semibold"></h2>
</div>
<button
onClick={onClose}
className="text-slate-400 hover:text-slate-600 hover:bg-slate-200/50 p-1.5 rounded-lg transition-colors"
>
<X size={20} />
</button>
<div className="flex items-center gap-3">
{isAdmin && onOpenAnalysis && (
<button
onClick={onOpenAnalysis}
className="text-xs bg-white border border-slate-300 text-slate-700 px-3 py-1.5 rounded shadow-sm hover:bg-slate-50 flex items-center gap-1.5 font-medium transition-colors"
>
<BarChart3 size={14} className="text-blue-600" />
</button>
)}
<button
onClick={onClose}
className="text-slate-400 hover:text-slate-600 hover:bg-slate-200/50 p-1.5 rounded-lg transition-colors"
>
<X size={20} />
</button>
</div>
</div>
{/* Controls */}

View File

@@ -11,6 +11,7 @@ const MaterialTypeManagementDialog = React.lazy(
)
const ExecutionReportDialog = React.lazy(() => import('../components/ExecutionReportDialog'))
const ReportViewerDialog = React.lazy(() => import('../components/ReportViewerDialog'))
const ReportAnalysisDialog = React.lazy(() => import('../components/ReportAnalysisDialog'))
const CleanerPage: React.FC = () => {
const typeManagementButtonRef = React.useRef<HTMLButtonElement>(null)
@@ -66,6 +67,7 @@ const CleanerPage: React.FC = () => {
} = useCleaner()
const [isReportViewerOpen, setIsReportViewerOpen] = React.useState(false)
const [isReportAnalysisOpen, setIsReportAnalysisOpen] = React.useState(false)
return (
<div className="h-full flex flex-col xl:flex-row gap-6 animate-in fade-in slide-in-from-bottom-4 duration-500">
@@ -169,6 +171,15 @@ const CleanerPage: React.FC = () => {
onClose={() => setIsReportViewerOpen(false)}
isAdmin={isAdmin}
currentUsername={currentUsername}
onOpenAnalysis={() => setIsReportAnalysisOpen(true)}
/>
</Suspense>
<Suspense fallback={null}>
<ReportAnalysisDialog
isOpen={isReportAnalysisOpen}
onClose={() => setIsReportAnalysisOpen(false)}
isAdmin={isAdmin}
/>
</Suspense>

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -0,0 +1,18 @@
const { _electron: electron } = require('playwright')
;(async () => {
const electronApp = await electron.launch({
args: ['.', '--no-sandbox', '--disable-gpu']
})
// Get the first window that the app opens
const window = await electronApp.firstWindow()
// Try to bypass auth and navigate to cleaner page if possible, but we don't know the exact DOM
await window.waitForTimeout(5000)
await window.screenshot({ path: 'tests/playwright/screenshot.png' })
console.log('Took screenshot')
await electronApp.close()
})()