Commit Graph

142 Commits (e4439acc7a2f41befa9ec69a141d4d43b4381106)

Author SHA1 Message Date
黄伟杰 3dbe0bf81b Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 2 months ago
liutao 4bd0065f8a 检验模板调整 2 months ago
黄伟杰 9198c8c345 style:任务单排产-关联设备保存后刷新列表 2 months ago
黄伟杰 972bf17c56 feat:生产计划-添加已开工tabs 2 months ago
liutao b4367cea76 设备管理调整 2 months ago
黄伟杰 d0b6a5942e Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 2 months ago
liutao a5e321bdb5 样式优化 2 months ago
黄伟杰 41c328bc09 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web
# Conflicts:
#	src/views/mes/deviceledger/DeviceLedgerForm.vue
#	src/views/mes/deviceledger/index.vue
2 months ago
liutao f356485d74 上传文件及弹出框Form 2 months ago
黄伟杰 93f84dd379 style:任务单排产字段调整 2 months ago
liutao dd64b05572 增加图片上传 2 months ago
liutao 7b26f5c34a 新增页面增加字段 2 months ago
黄伟杰 7137ca46df Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 3 months ago
黄伟杰 6bbcf3b0b8 style:任务单排产-列表添加“是否完成排产”列 3 months ago
黄伟杰 24e2a156a4 feat:任务制单-添加是否急单字段 3 months ago
liutao b3d07e3c89 Merge remote-tracking branch 'origin/main' 3 months ago
liutao 4ec226416b 采集设备九宫格增加弹出框 3 months ago
黄伟杰 b8dc35bc23 feat:设备台账-添加是否排产、额定产能字段;状态改成switch切换 3 months ago
黄伟杰 513b6030b7 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web
# Conflicts:
#	src/views/mes/deviceledger/index.vue
3 months ago
黄伟杰 7baec6c279 feat:接入vue-plugin-hiprint打印组件、二维码预览打印组件封装 3 months ago
liutao 47c8d2e0c6 Merge branch 'liutao_branch'
# Conflicts:
#	src/views/mes/deviceledger/index.vue
3 months ago
liutao 3d79f40c91 采集设备样式调整 3 months ago
黄伟杰 bbee7c8cd2 feat:设备台账、关键件、备件、物料、模具添加二维码功能 3 months ago
黄伟杰 3708e99cf8 style:编码规则-新增/编辑弹框添加码类型字段 3 months ago
黄伟杰 887495f8b2 style:编码规则添加码类型列 3 months ago
liutao f91a450420 首页中英文切换及增加字段 3 months ago
liutao 559c341ee1 esop文件管理 3 months ago
黄伟杰 56532d415f feat:添加字典配置英文标签选项 3 months ago
黄伟杰 f6b8d38a19 style:数据采集模块添加部分字段排序 3 months ago
黄伟杰 50862cbfac Revert "style:dashBoard1数据大屏适配中英文"
This reverts commit 39bfd8a2e9.
3 months ago
黄伟杰 39bfd8a2e9 style:dashBoard1数据大屏适配中英文 3 months ago
黄伟杰 7c08bb7154 style:Dashboard1数据大屏适配中英文 3 months ago
黄伟杰 cf117ea396 style:Dashboard8数据大屏页面中英文适配 3 months ago
黄伟杰 e366b2915b style:生产投料-添加实际/计划投料时间 3 months ago
黄伟杰 10c8f0d1b0 style:生产投料-添加生产计划列 3 months ago
黄伟杰 66340db212 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web
# Conflicts:
#	src/views/mes/energydevicecheck/index.vue
3 months ago
黄伟杰 d00ab08299 style:设备管理-设备关键件添加数量字段 3 months ago
kkk-ops a416899349 隐藏文档 4 months ago
黄伟杰 059f9fa3c7 style:设备运行报表-添加开机率列 4 months ago
黄伟杰 f7ce6117d6 style:配方配置-新增/编辑添加关联产品分类 4 months ago
黄伟杰 ed2eae1afa feat:菜单名称添加英文适配/大屏管理-设备下拉框 4 months ago
黄伟杰 87cda49904 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 4 months ago
黄伟杰 44a2e5f804 style:采集设备-数据类型字段必填 4 months ago
kkk-ops 3c844c5fd4 组织-采集设备 4 months ago
黄伟杰 8dbf3003ad style:采集设备删除采集周期、连接字段 4 months ago
黄伟杰 755978994f style:配方库-若当前子列表有数据,则读取弹框添加覆盖提示 4 months ago
黄伟杰 b1d91ffc19 style:采集设备-是或否列改成switch组件切换/设备设置弹框添加订阅主题输入框 4 months ago
kkk-ops 87f5543b0b 设备运行报表 4 months ago
黄伟杰 9dd9687184 style:能耗管理中英文适配 5 months ago
黄伟杰 99511a6acb style:设备运行报表-屏蔽告警时间字段/默认筛选前一天日期 5 months ago
黄伟杰 fb5f085432 style:采集设备-设备告警历史数据弹框-添加分页、告警时间筛选框 5 months ago
黄伟杰 e957e51735 style:仓储管理模块适配中英文 5 months ago
黄伟杰 d2aee54a94 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web
# Conflicts:
#	src/views/erp/stock/in/StockInForm.vue
#	src/views/erp/stock/in/index.vue
#	src/views/erp/stock/out/index.vue
#	src/views/erp/stock/warehouse/index.vue
5 months ago
黄伟杰 108b94fd67 feat:模具管理-上下模-新增/编辑弹框新增下模模具,支持多选 5 months ago
黄伟杰 56478433ae style:仓储管理中英文 5 months ago
黄伟杰 a7331d5154 style:数据采集添加多语言适配 5 months ago
kkk-ops 2323bca448 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 5 months ago
kkk-ops a7efb1eaaf 出入库bug 5 months ago
黄伟杰 2ac4f4a1e8 feat:设备/模具/质量-检验任务-取消任务添加原因、详情添加原因回显 5 months ago
黄伟杰 5d663e1c54 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 5 months ago
黄伟杰 d9964c9a9a feat:生产计划模块适配中英文 5 months ago
黄伟杰 4175f72a46 feat:模具管理-维修单添加结果列 5 months ago
kkk-ops bceb6d7379 配方保存bug 5 months ago
kkk-ops 8263c44c0a merge 5 months ago
kkk-ops dfac1ae41b 组织关联设备台账 5 months ago
黄伟杰 d4668912f8 feat:工厂建模添加多语言 5 months ago
黄伟杰 6fc9ff2997 style:系统管理模块适配多语言 5 months ago
黄伟杰 bc41f47898 feat:配方管理适配国际化 5 months ago
黄伟杰 7a1ba32ae3 style:质量管理模块适配国际化 5 months ago
黄伟杰 dd7d73fbdc style:国际化调整筛选框label宽度 5 months ago
黄伟杰 c1516c2afb style:模具管理-适配国际化 5 months ago
黄伟杰 ff04961d4c style:备件模块适配中英文 5 months ago
黄伟杰 cc87581110 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web
# Conflicts:
#	src/views/mes/deviceledger/index.vue
5 months ago
黄伟杰 242d760d22 style:设备管理模块支持国际化显示 5 months ago
kkk-ops 06779b0ab8 首页 5 months ago
kkk-ops 8cda4ce13a bug 5 months ago
kkk-ops 14891f8ddb 报工 5 months ago
chenyuan 5a93b48c90 fix base 2 years ago
sunshine a35128d235 登录页背景图修改,快捷入口路由跳转 2 years ago
chenshuichuan 93ee24b7ce fix bug 2 years ago
YunaiV f8580fdf2a 2023-05-10:feat: 新增锁屏功能 2 years ago
YunaiV 1744c6ec6f websocket 重新封装 3 years ago
dhb52 4d77d7e136 feat: 社交平台登录 3 years ago
YunaiV 276e82c5a8 REVIEW 单点登录界面 3 years ago
puhui999 d679a7a3be Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/config/axios/service.ts
#	src/types/auto-components.d.ts
3 years ago
puhui999 2d019f1bf9 增加SSO单点登录 3 years ago
YunaiV 4404554cfc 1. 统一化代码
2. 增加 DocAlert 关联文档
3 years ago
YunaiV 76c5c7c1de REVIEW 代码生成 3 years ago
dlarmor f33935868d Vue3 重构:基础设施 -> 代码生成 3 years ago
dlarmor f1313b1f1c 重构:基础设施 -> 文件管理 文件列表 3 years ago
YunaiV d985ef194e 优化 post 岗位的逻辑实现代码 3 years ago
YunaiV 56f3017baa 初始化项目,自 v1.7.1 版本开始 3 years ago