Commit Graph

979 Commits (a3ca79dd4d9e03897cb64132e4246da82dbaff66)

Author SHA1 Message Date
黄伟杰 25954461e3 feat:模具组页面重构 1 month ago
黄伟杰 4c98bb463a Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 1 month ago
黄伟杰 057df9cdb9 style:产品BOM模块-产品下拉框添加产品筛选 1 month ago
黄伟杰 f887843d41 feat:产品物料信息-添加产品/物料类型分类 1 month ago
liutao 1f0a8387b1 解决冲突 1 month ago
黄伟杰 e8d0130a17 feat:产品物料分类-添加产品/物料类型 1 month ago
liutao 0829d8551d Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/views/mes/criticalComponent/CriticalComponentForm.vue
#	src/views/mes/criticalComponent/index.vue
1 month ago
liutao e35779413c update 1 month ago
黄伟杰 9f44955c5f style:设备管理-维修单添加故障等级 1 month ago
黄伟杰 7a435e1d2f feat:设备台账-去除型号、生产日期字段,新增SN、品牌、出厂日期字段 1 month ago
黄伟杰 ca007733bf feat:角色管理添加app端 1 month ago
黄伟杰 f180d30cbb feat:维修单模块修改 1 month ago
黄伟杰 28c7322d71 style:设备管理-维修项目-是否启用字段回显 1 month ago
黄伟杰 02a8a7225e Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 1 month ago
黄伟杰 7e5252d990 feat:菜单管理-app端菜单添加终端类型 1 month ago
黄伟杰 8333b589d8 feat:设备台账-左侧树状结构添加产线分类 1 month ago
liutao b37c5220d0 Merge remote-tracking branch 'origin/main' 2 months ago
liutao d3d668c7f2 设备采集汇总 2 months ago
黄伟杰 86c68adf72 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 2 months ago
黄伟杰 9d700a6ece feat:模板管理-报表模板添加工具栏 2 months ago
liutao 06e27720c8 Merge remote-tracking branch 'origin/main' 2 months ago
liutao 0aaa3b35a0 分类增加导入功能 2 months ago
黄伟杰 0d75fe9994 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 2 months ago
黄伟杰 f66c4afd29 feat:菜单管理-添加web端/app端tab栏 2 months ago
liutao 3745ef5bbc 能源概览 2 months ago
黄伟杰 ae6ef128ee feat:模具管理-二维码模板回显 2 months ago
黄伟杰 4f6ee86798 feat:设备关键件-二维码模板回显 2 months ago
黄伟杰 5ff4d7e41a feat:设备台账-二维码模板回显 2 months ago
黄伟杰 288d10f3c7 feat:产品物料信息-二维码模板回显 2 months ago
黄伟杰 f3be54dd9f feat:添加打印模板管理模块 2 months ago
liutao 1418015844 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/api/iot/deviceOperationOverview/index.ts
2 months ago
liutao a28acd5991 补充文件 2 months ago
黄伟杰 985e92ee2b feat:产能报表-添加报工产能弹框 2 months ago
黄伟杰 2a6b73e566 fix:修复runoverview api文件缺失问题 2 months ago
黄伟杰 152a906c16 feat:添加产能报表页面 2 months ago
黄伟杰 3d42371613 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web
# Conflicts:
#	src/locales/en.ts
2 months ago
liutao 57bbd4b4ad 设备管理调整 2 months ago
liutao 4121523db9 历史分析界面优化 2 months ago
黄伟杰 8a0c72e6eb feat:仓库信息-添加详情弹框 3 months ago
黄伟杰 efaf527d80 feat:库区信息/库位信息-新增页面 3 months ago
liutao 91c2ef7e80 记录分析 3 months ago
liutao c09cb6fe14 实时监控数据调整 3 months ago
liutao 88874df91e 厂区结构增加设备弹窗 3 months ago
黄伟杰 20dee1da73 feat:添加生产报表页面 3 months ago
黄伟杰 1966a2c10e style:厂区结构-新增/编辑-关联采集设备选项接口更换 3 months ago
黄伟杰 a99abc9e01 feat:添加报工记录页面 3 months ago
liutao b4367cea76 设备管理调整 3 months ago
黄伟杰 d0b6a5942e Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 3 months ago
liutao a5e321bdb5 样式优化 3 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
3 months ago
黄伟杰 2fb7265888 feat:新增甘特图页面 3 months ago
liutao f356485d74 上传文件及弹出框Form 3 months ago
黄伟杰 f7a7f529d9 style:任务单排产-甘特图保存字段调整 3 months ago
黄伟杰 e21b5e3246 feat:任务单排产-列表表头调整、排产弹框对接 3 months ago
liutao dd64b05572 增加图片上传 3 months ago
黄伟杰 24e2a156a4 feat:任务制单-添加是否急单字段 3 months ago
黄伟杰 4863831a0c feat:产品管理-产品物料信息-产品分类时添加关联设备、关联模具字段 3 months ago
黄伟杰 b8dc35bc23 feat:设备台账-添加是否排产、额定产能字段;状态改成switch切换 3 months ago
liutao 47c8d2e0c6 Merge branch 'liutao_branch'
# Conflicts:
#	src/views/mes/deviceledger/index.vue
3 months ago
黄伟杰 bbee7c8cd2 feat:设备台账、关键件、备件、物料、模具添加二维码功能 3 months ago
liutao 6ce08fb7e3 配方库新增页面 3 months ago
黄伟杰 3708e99cf8 style:编码规则-新增/编辑弹框添加码类型字段 3 months ago
黄伟杰 887495f8b2 style:编码规则添加码类型列 3 months ago
黄伟杰 28123d2457 Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 4 months ago
黄伟杰 4f667a56f3 feat:模具台账-详情添加二维码展示 4 months ago
liutao 559c341ee1 esop文件管理 4 months ago
liutao 2f5055f67e Merge branch 'liutao_branch' 4 months ago
liutao ca44adf3bb 节假日设置功能代码 4 months ago
黄伟杰 8f8f3b26dc style:班组管理-工序字段删除 4 months ago
黄伟杰 56532d415f feat:添加字典配置英文标签选项 4 months ago
黄伟杰 13d157fa72 style:历史记录查询-点位筛选传参修改 4 months ago
黄伟杰 bb096c0c6b style:配方库-添加采集时间/录入时间字段 4 months ago
黄伟杰 f4d3a4de82 style:大屏-“今日开机率/稼动率”模块对接接口 4 months ago
黄伟杰 84916bbded style:配方库-手动录入参数可以补录 4 months ago
黄伟杰 252a3b532e style:配方配置-手动录入参数-编辑接口改为put,单位映射 4 months ago
黄伟杰 71c7f5406c style:生产计划-试产-检验明细列表接口修改,添加审核功能 4 months ago
黄伟杰 d00ab08299 style:设备管理-设备关键件添加数量字段 4 months ago
黄伟杰 30e2b7671c style:采集设备-设备属性-导出接口修改/点位类型传id 4 months ago
黄伟杰 059f9fa3c7 style:设备运行报表-添加开机率列 4 months ago
黄伟杰 f7ce6117d6 style:配方配置-新增/编辑添加关联产品分类 4 months ago
黄伟杰 f7dc112b15 feat:设备/模具/质量管理-添加输入值输入框 4 months ago
黄伟杰 ed2eae1afa feat:菜单名称添加英文适配/大屏管理-设备下拉框 5 months ago
kkk-ops 3c844c5fd4 组织-采集设备 5 months ago
kkk-ops 59552f1b3c merge 5 months ago
kkk-ops 25174b415e 模具 5 months ago
黄伟杰 755978994f style:配方库-若当前子列表有数据,则读取弹框添加覆盖提示 5 months ago
黄伟杰 b1d91ffc19 style:采集设备-是或否列改成switch组件切换/设备设置弹框添加订阅主题输入框 5 months ago
kkk-ops 314126d6df Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 5 months ago
kkk-ops 87f5543b0b 设备运行报表 5 months ago
黄伟杰 fe6a11009b style:配方管理-配方配置修改新增/编辑参数 5 months ago
kkk-ops 9327f284dd Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web 5 months ago
kkk-ops 08de236dd5 bug 5 months ago
黄伟杰 c2d05ed928 feat:备件信息-添加导入按钮 5 months ago
黄伟杰 63e5eda1d8 feat:设备管理-设备关键件添加导入按钮 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
kkk-ops 799aedbfdf 新增模具页面 5 months ago
黄伟杰 108b94fd67 feat:模具管理-上下模-新增/编辑弹框新增下模模具,支持多选 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