Commit Graph

47 Commits

Author SHA1 Message Date
sheng
eb31da72e0 迁移设备监控模块
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
- 新增计划与生产设备监控 V2 页面

- 新增设备监控接口、路由和中英文文案

- 更新迁移任务列表中的设备监控状态
2026-06-22 15:50:19 +08:00
sheng
b942d24f2c 迁移预警中心模块
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
- 新增计划与生产预警中心 V2 页面

- 新增预警中心接口、路由和中英文文案

- 更新迁移任务列表中的预警中心状态
2026-06-22 15:24:59 +08:00
sheng
8ef087676f feat: migrate process execution module
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
- add V2 process execution page for planning production monitoring

- add process execution API, route, and i18n entries

- update migration task list status for process execution
2026-06-22 15:07:38 +08:00
sheng
45c2ea6e63 feat: migrate tray management module
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
- add V2 tray management page for planning production monitoring

- add tray management API, route, and i18n entries

- update migration task list status for tray management
2026-06-22 14:58:04 +08:00
sheng
b44e031e74 feat: migrate planning batch management modules
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
- migrate batch list, tray tracking, and batch defect report pages to V2

- add planning production APIs, workerman helper, routes, and i18n entries

- add markdown migration task list generated from the Webman function matrix
2026-06-22 14:13:01 +08:00
sheng
3f546564cc feat(production-master-data): 新增工艺流程管理完整模块
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
- 添加工艺流程、流程卡工序的全套CRUD及复制接口
- 新增工艺流程列表页与流程卡详情页的路由和页面组件
- 补充产品、工序分类、工序子类的全量查询接口
- 优化弹窗表单组件,支持字段禁用与focus/blur/change事件回调
- 修复工序单元页面的国际化调用和权限配置问题
- 补充中英文多语言国际化文案
- 新增该模块的功能测试文档
2026-06-04 17:07:15 +08:00
b6c362d906 Merge branch 'master' of http://119.91.43.128:3001/sheng/mes-ui-d2
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
2026-06-02 16:00:24 +08:00
76b480ece5 feat(production-master-data): add SPC采集配置功能
实现SPC数据采集配置页面,包含路由配置、API接口、多语言文案以及完整的增删改查功能,附带功能测试文档
2026-06-02 15:59:58 +08:00
sheng
76f9657fe9 style: 调整函数声明的空格格式,统一代码风格
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
对所有函数声明添加前后空格,保持代码排版一致性,提升可读性
2026-06-02 15:17:51 +08:00
sheng
8b587163df chore: 配置项目开发环境并重构接口路由前缀
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
1.  添加 .node-version 和 .npmrc 配置文件,使用 Volta 锁定 Node.js 18.16.0 版本,强制使用 pnpm 作为包管理器
2.  更新 package.json,添加 packageManager 和 engines 字段限制依赖安装版本,替换 npm 脚本为 pnpm
3.  重构设备管理模块的接口 BASE 路径和路由路径,统一命名为 device_model/device_category
4.  完善 README.md,新增环境要求、安装启动流程、常用命令和目录结构说明
2026-06-02 14:26:17 +08:00
sheng
f1e73f3319 Merge branch 'master' of http://119.91.43.128:3001/sheng/mes-ui-d2 2026-06-02 14:05:32 +08:00
sheng
ddc715e17c feat(production-master-data): add 异常不良管理功能
1. 新增设备类别API接口封装
2. 新增异常不良管理的CRUD、导入导出API
3. 添加异常不良管理页面路由与多语言配置
4. 新增文件工具类支持Excel读写下载
5. 实现完整的异常不良管理页面与导入弹窗
6. 新增功能测试流程文档
7. 安装xlsx依赖支持Excel操作
2026-06-02 14:05:15 +08:00
hui
87edf1c76f Merge branch 'master' of http://119.91.43.128:3001/sheng/mes-ui-d2
Some checks failed
Release pipeline / Always run job (push) Has been cancelled
Release pipeline / publish (push) Has been cancelled
2026-06-02 13:56:00 +08:00
hui
9100f65325 feat(设备类别管理功能模块): 2026-06-02 13:54:55 +08:00
sheng
a0192d9567 feat(production-master-data): 新增生产主数据模块下物料与工序相关功能
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
1. 新增物料单位、物料类别、物料信息管理的API与页面
2. 新增工序单元管理的API、页面与弹窗组件
3. 新增可选参数管理组件与相关API
4. 补充对应国际化多语言配置
5. 新增生产主数据模块路由配置
6. 新增计量单位功能测试流程文档
2026-06-02 11:25:26 +08:00
sheng
99b9bc8a5b feat(production-master-data): 新增产线、工艺流程类别、产品管理模块
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
1. 新增工厂区域全量查询API
2. 新增产线管理API、页面、路由与多语言配置
3. 新增工艺流程类别管理API、页面、路由与多语言配置
4. 新增产品管理API、页面、路由与多语言配置
5. 修复MenuTree组件slot-scope语法兼容问题
6. 追加对应功能的测试文档与版本记录
2026-06-01 17:35:20 +08:00
sheng
c9498c444b fix(api): 完善401错误处理逻辑
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
统一处理登录态过期场景,清除token并跳转登录页
2026-06-01 11:02:59 +08:00
sheng
20a821ba32 feat: 完成系统管理模块功能迭代
新增用户、菜单、日志、问题帮助等业务模块,优化角色权限分配功能,新增依赖包与全局组件
2026-05-29 18:12:54 +08:00
sheng
a61036e5dc feat: 新增角色管理模块,优化API与交互体验
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
1.  新增角色管理后台页面、路由与国际化文案
2.  重构API请求错误处理逻辑,统一拦截业务与HTTP错误
3.  新增确认弹窗组合式函数,区分取消与请求错误场景
4.  完善表格按钮权限与显示控制逻辑
5.  更新API参数规范与文档说明
6.  修复部分页面分页数据解析问题
2026-05-28 19:16:05 +08:00
sheng
48cfebd008 refactor: 移除组件内置i18n翻译,改为调用方自行处理
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
1. 调整菜单路由路径与API基础路径匹配生产配置更名
2. 优化page-table和page-dialog-form组件,移除内置的$t翻译逻辑,由调用方传入已翻译的文本
3. 为无menu_id的菜单项生成默认空路径
2026-05-27 18:37:37 +08:00
sheng
2cc8329695 refactor: remove old demo pages and static menu logic
1. 删除大量旧的示例页面、组件示例和静态菜单配置
2. 新增菜单扁平数组转树形结构工具函数
3. 重构菜单加载逻辑,改为从后端动态获取并格式化
4. 新增全局权限检查方法和自定义权限指令
5. 优化侧边栏菜单路由跳转逻辑,自动跳转第一个有权限的子页面
6. 移除路由中对旧demo模块的引用
2026-05-27 18:07:48 +08:00
sheng
000b87eb92 feat: 新增登录注销功能,调整接口与配置
1.  新增项目logo文件
2.  调整API基础地址与开发代理配置
3.  添加多语言登录相关文案
4.  新增登录注销API接口
5.  重构请求与账号登录注销逻辑
6.  更新文档与菜单store状态
2026-05-27 16:42:03 +08:00
sheng
3eaea3116d feat: 新增工厂区域管理页面,修复Sass废弃警告
Some checks failed
Release pipeline / publish (push) Has been cancelled
Release pipeline / Always run job (push) Has been cancelled
1. 新增生产配置-工厂模型-工厂区域完整CRUD页面
2. 新增通用表格、弹窗表单、i18n工具组件
3. 升级sass-loader并修复Sass废弃警告
4. 添加文档记录Sass迁移修复细节
2026-05-26 18:32:57 +08:00
FairyEver
57534be3fb fix: remove never used code 2022-08-23 21:55:34 +08:00
FairyEver
37f63bf20c fix: merge replaced Object.assign
https://github.com/d2-projects/d2-admin/issues/342
2021-07-23 11:17:33 +08:00
FairyEver
e02f4909d0 feat: 更改 api 引入的方法更合理化 2020-12-28 14:06:04 +08:00
FairyEver
136e6cd040 fix: 📦 lodash-es to lodash (lowdb存在导致lodash无法移除) 2020-11-30 14:51:31 +08:00
FairyEver
bf7ed65e23 feat: 调整 createRequest 中 params 处理顺序 2020-11-21 12:08:15 +08:00
FairyEver
886a4a8638 feat(api): 完善 service 代码,request 现在会根据需要自动序列化参数 2020-11-17 14:33:07 +08:00
FairyEver
f53927121e feat: 📦 lodash to lodash-es 2020-11-17 08:32:46 +08:00
FairyEver
cb9828605f feat: api 配置文件新增 .api.js 命名规则 2020-09-01 17:20:05 +08:00
FairyEver
bb8ece7d25 feat: 在扫描 src/api/modules 下的接口配置时 支持多级文件夹下的文件 2020-08-28 09:46:20 +08:00
FairyEver
079fd1c280 feat: 移除对 error 的无用判断
Variable 'error' is null checked here, but afterwards at line 68 , it is passed as the first parameter of 'errorLog()' without null check. Note that the parameter's property is accessed in the function body at line 72 of src/api/tools.js.
2020-06-08 15:48:21 +08:00
FairyEver
b1ea3e81a6 feat: 🎨 解决关于 error 信息的检查遗漏提示
Variable 'error' is null checked here, but afterwards at line 67 , it is passed as the first parameter of 'errorLog()' without null check. Note that the parameter's property is accessed in the function body at line 72 of src/api/tools.js.
2020-06-08 15:01:06 +08:00
FairyEver
1983506e46 fix: 🐛 修复静态资源请求错误
#280
2020-05-19 22:39:25 +08:00
FairyEver
d6704dad5c feat: 💡 分离用于真实网络请求和模拟请求的 service 2020-05-19 09:15:57 +08:00
FairyEver
ac9b1ea26d feat: 使用 axios 扩展的方式实现 mock 数据 2020-05-07 23:02:12 +08:00
FairyEver
28acfdbb04 feat: 优化接口配置设计,注册的网络请求会自动注册到 vue 原型 $api 上,修改了一些旧的接口调用方式 2020-05-07 15:49:28 +08:00
FairyEver
98eaba77df style: 移除 store 中无用的 Promise 声明以及优化代码格式 增强部分健壮性 2020-04-22 11:03:48 +08:00
liyang
d3318af158 增加 ajax 错误的捕捉示例
Former-commit-id: ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly ff8cda0e301b59db9ed6ebae34acac7b03e890ba [formerly dbf242544733fb012f7539d174519b6ba1c19d3e [formerly 2a164f6c59e772be2699ea07d9a41b84cdaf97ff]]]]]
Former-commit-id: 40e977135b0c8bfbd51e87b534eefbb6f6d386ea
Former-commit-id: 68e6984ade3df1b6102792f11d3530ff06691261
Former-commit-id: b8fc000ad260dcf9ab15304df1fabd8ec45dbd51 [formerly eb154d14e358458e6dc1aa8d11b71a9dd77f693b]
Former-commit-id: 28aa0b81492e52f381255159bde81f9a79c00f00
Former-commit-id: 8e5a82c22f0db8e4d758254c8622b96ec83aa33b
Former-commit-id: 6eb4f8c3bc381e3180f7ee22eaa5766fc2fcf12c
Former-commit-id: 652a133e3a31b44af5e2e4aa2d4a71730e5470c1
Former-commit-id: 2dde2e26c765600d57e31f31b445baff7628c581
2019-04-07 10:34:06 +08:00
liyang
a2a2931af1 issue演示页面使用mock数据加载list
Former-commit-id: 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly 08b187b2764b92959111ef8c728f0bd7a5d501f2 [formerly d59731e1bb8d0baa4b90d8e9c73f44c7f8ac4441 [formerly fc1e18dc44bd90924c6c02e4669197fd8502d18d]]]]]
Former-commit-id: 91557cbbc0e34412d129706b10375676a22562c2
Former-commit-id: 0905517334520418154b45a950ffaefb71171dbf
Former-commit-id: e71ba11d0f8ad3418af5d3b2c464b9a3a1042598 [formerly 8a7a02d1fd02f1b7828cdd0b63455aa7e51d408a]
Former-commit-id: 75e9f65dd0f5a99d6d9581b72f25d8429ebcee31
Former-commit-id: c63405062ebccba334a6ac9e1135364d297bdd0b
Former-commit-id: 3ddcada8fe0fb48e897c03c2e0f72da63bc17107
Former-commit-id: de1a37a99bb6b3f594b042bab01bb3ba5778cee2
Former-commit-id: bf4b3f3e405a31d9542c59f18784a8e080a9e31b
2018-12-14 10:42:43 +08:00
liyang
56223d9195 更新 mock 设置
Former-commit-id: 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly 91e149862bc5c5994005c16b8921d293347c935e [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4] [formerly cc5c1b4e89e4c0bd2a86ced9e4dd4ac30cf69ad4 [formerly a995dd4aa6a5745242d449c1114d41592437d318 [formerly 84ceaffec1514357a65944b2b2af6ad55eed82cd]]]]]
Former-commit-id: 7fff6c3cca28a5b09ebbdb395fb250487bee6da3
Former-commit-id: ed647717531cb8a8d9ccb276c01986b5f8af7653
Former-commit-id: 7afd7c7718a1302fe0adc74bd06a1af0992fc305 [formerly fe10b57a2e3e9738867df9c88ec22d51d271891a]
Former-commit-id: 8ad7dd5c5e2ecf759e0ffd82e296658b5d735dd1
Former-commit-id: 289a192ca0d76c1e99dc1a9786a71580f705a1bd
Former-commit-id: 06de0f519d511e893333553a3a25d4388308e1b0
Former-commit-id: 0f21f9ff42abc15714f0622b0de1770509e19052
Former-commit-id: bbef35694d434bab48f2fcf49d7ae459fe7bff2b
2018-12-13 10:29:56 +08:00
liyang
3e9adc118d flat folder
Former-commit-id: 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 8f00e0f6b39cbc1e2a9333e2635eed6d3ac4909e [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5] [formerly 45b4c97d64e06aa89188acc5f05b8eaaa049fcf5 [formerly dddeab643660d9536ccca28a7b131064862a0956 [formerly a60252b4bb0f8e4357c8fb5d96baa92b34348fd2]]]]]
Former-commit-id: 95c2b6d11f3fca5c35355f6e4462fc48bd75b837
Former-commit-id: 859b43e95cd2d96a6fbccadef42b5ccf030aec0b
Former-commit-id: e095e2d838b165bae833f949655dcd0616dd36a8 [formerly 4457c0c04c4c7dc570cc2fdc8b6c1d9ab63d4e7b]
Former-commit-id: 268d04b33f65537fed5e70f86a765e9d65569458
Former-commit-id: 6895dc7270ebceb21c77c2663ab3ad912b26a02c
Former-commit-id: bb41e9fc1a708ff94371c4c2a7cc14bd6ed40049
Former-commit-id: 5170da37ca33777f225f5ce6e2387ed6d0b1741d
Former-commit-id: c617fbc5781e40482af82fa6bb8ea5105c3e5d9c
2018-12-11 08:48:38 +08:00
liyang
947475bdc1 复现了问题 等待结局
Former-commit-id: 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly 9f39432718832530f47b6a9faee92afe1b9ac86d [formerly ecb763d008a589ee3b83854517804b1468ca7a09 [formerly b18b87cc41e0c54a93a2f5021fe6022a6fa2c5fb]]]]]
Former-commit-id: 51a327f9f3d7a018f099f72ad564d6604aa5e9d7
Former-commit-id: 81c578d9cef74d8513c8a3c65107cfdfd3c6dfb7
Former-commit-id: caad4b29ff03d5878996ce52ff20252336128d97 [formerly 42d8aa2c0c3332d2c07057d6f4cdf21388c08fb9]
Former-commit-id: a81ea126d2fa05ae5555f872669792a08f9f2ff0
Former-commit-id: d27d0e66ed023c621d2cd2711664f498a21bb8ad
Former-commit-id: 61e0719ea25d0c67c1c38ded8cf41be50c17d7b5
Former-commit-id: 17291fab193dcf38a91f44137fa271d8f2d4ee56
Former-commit-id: 5218d72d35fb2d088198c37187d662eca768bd7b
2018-11-28 16:49:46 +08:00
liyang
7b9d46655d 删除请求新版本相关的代码
Former-commit-id: c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly 2ef73ea49b3405be63a1552eaa45649af7d559df [formerly e8792780e531de7b81bec704953a57fb05c3255e]]]]]
Former-commit-id: 80c8177590bbadb58158ea371d1aa67f05de60f5
Former-commit-id: ef3cdcd6a5eed24569fa9a0c38ead6903d8f84b0
Former-commit-id: 9874c1f8f43c8beda5404b222d53697774f808bb [formerly 810d6baa2283c6310dd8ae35fa99b810331cd7f3]
Former-commit-id: cd5531c1a53a55fa62d897a8ffa27b30b0d5be50
Former-commit-id: 79be8e7248a71c1b608c009d4b200c6cf04572ca
Former-commit-id: 0d797ed715b7091e9b9a3748dd85152a7c86549e
Former-commit-id: c175d6cb3db552a3b8749fa51c0cb6375fcfc0a7
Former-commit-id: 6c2d3338e77a6f3ca12fee92621d23ea795f7a3d
2018-10-23 19:05:33 +08:00
rongxingsun
1f2d17a7ec axios fix
Former-commit-id: 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly 4e67b101d7613dc5a908a9710a298ab452e3a73e [formerly e18674e079add9386877561fd5ff11e26d8a444d [formerly 9eea4ceea3d3b77eab71336bd5a35f3865865a7a]]]]]
Former-commit-id: 309a390168260b7182beb6cefb1d3fce25f41ad7
Former-commit-id: 2357580897c1c29d440ef3df6f59ccf8ecf6c898
Former-commit-id: 4dec8fba40d4f2d2c38e214281019b42cb937d0f [formerly d5986fb5b1d943e920a5e9f298bcfe2f39db84a6]
Former-commit-id: 2f5e3bf693e575217a377d633480e214609a257b
Former-commit-id: 67a233f1a96a698c8a303437bd350eef012f426a
Former-commit-id: 3529a8cb845e843a7971eaa2ae108e8c4abd7859
Former-commit-id: 75fdfbf8e6258c417b6f187dc4d5a4be1090aa56
Former-commit-id: b089d7b7d80123e876bf9b03d5bf9593fd79f780
2018-08-26 10:28:26 +08:00
rongxingsun
bc2027da0d axios封装
axios封装


Former-commit-id: 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly 4dc0646a8509fe9cb6c5218e9dfc864b0af59143 [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f] [formerly eaee9b788f359a10ad0b8b199dcdd8c82765855f [formerly 0dad01580037e9ada6f7f9201eab7e28bafbadd4 [formerly 97a660059b807afdf8c0c518d4f40be4ce7eceec]]]]]
Former-commit-id: 95e753d1626ce41c1465bac635687ce5989877a5
Former-commit-id: 2e567e9e2bb7d07e9cf52dbfe29b140c24c76b48
Former-commit-id: 37e5cef6e554af37fc7d55785552160ff086c03d [formerly 14edcd31bc67642337f8eddf2ec7cbdec23ecc2c]
Former-commit-id: 08a71cba6653878d9accae5a7ecfcf1122d3515a
Former-commit-id: a1731726720512ae8a5a7fd5973f4c90a62ac448
Former-commit-id: 3838dfd576136f0ac217d9a97d631f9a88191d31
Former-commit-id: fa2416a4c270dce89a33e0486569374c5c7b6a63
Former-commit-id: b03e226c26ea5495e1d7d6a2206b89c8f4e17815
2018-08-24 17:05:32 +08:00