Commit Graph

2561 Commits

Author SHA1 Message Date
shijing f2cfde2355 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-03 15:22:38 +08:00
shijing 96b6e63d03 fix:检验表单中设备列表获取修正 2024-12-03 15:22:34 +08:00
zty f677082480 feat: tkx 检验设备临期提醒 2024-12-03 15:21:21 +08:00
zty c667ac0994 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-03 11:44:53 +08:00
zty 4db4a87d99 feat: tkx 增加柱状图 2024-12-03 11:44:50 +08:00
shijing 148584b8aa fix:日志中工段问题修改 2024-12-03 09:45:01 +08:00
shijing 048a8976db fix:批次统计数据接口声明 2024-12-02 15:31:12 +08:00
shijing 2d52ae26c5 fix:棒管统计页面 2024-11-29 17:45:25 +08:00
shijing 3e3c34e49f fix:coding#656form表单 2024-11-29 17:43:00 +08:00
shijing 5b676f7c4b fix:coding#656 2024-11-29 17:42:37 +08:00
shijing 13d0d7d5f7 fix:coding#604 2024-11-29 14:16:50 +08:00
shijing 721ddd7b17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-28 16:43:33 +08:00
shijing 0d9afd42e0 fix:fmlog改动,以及大屏改动 2024-11-28 16:43:30 +08:00
zty 6cb44c71ec Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-28 16:13:59 +08:00
zty 8c5e3498ab feat:home/event 修改tkx 能源报警事件 2024-11-28 16:13:56 +08:00
shijing ffc95890fa fix:coding#594 2024-11-28 09:59:57 +08:00
shijing 96820cbb4f fix:检验合格B类 2024-11-28 08:55:59 +08:00
shijing fe312b455c fix:coding#628 2024-11-27 17:14:08 +08:00
shijing f079ad9144 fix:coding#608 2024-11-27 14:29:26 +08:00
shijing 208c0aee5c fix:coding#560二、1性能检验改动 2024-11-27 14:28:27 +08:00
zty 52aa3b167b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-27 09:51:58 +08:00
zty cdf271877d feat:tkx 页面修改 2024-11-27 09:51:34 +08:00
shijing 29597f1348 #502coding:13、添加批次序号 预备用 2024-11-27 09:28:24 +08:00
shijing cc1bc5c129 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-27 09:22:38 +08:00
shijing cea727a691 fix:大屏动态获取公告 2024-11-27 09:22:35 +08:00
caoqianming 3b7458d683 feat: 外协和磨抛一次抛2 2024-11-26 22:31:27 +08:00
caoqianming ae365ee383 feat: 外协和磨抛一次抛 2024-11-26 22:23:04 +08:00
caoqianming 03780360ac feat: 设备取消是否删除的筛选 2024-11-26 17:51:03 +08:00
caoqianming 17dc188e25 fix: 车间入库时depts查询报错 2024-11-26 16:58:52 +08:00
zty a9cb7c918b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-25 18:33:11 +08:00
zty 893f7a6cd7 fix : 修改 tkx 工序内容 2024-11-25 18:32:52 +08:00
shijing 63c7929ea3 feat:新增返工统计页面,车间库存检验统计 2024-11-25 17:24:10 +08:00
shijing a4eeb13b2f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-25 10:25:08 +08:00
shijing 78d82b6f3f fix:字段更正 2024-11-25 10:25:05 +08:00
caoqianming eabdabcf3a feat: mlog不再进行审计 2024-11-24 17:42:32 +08:00
caoqianming 4c003251c1 feat: base 修改xtui名称 2024-11-24 17:41:22 +08:00
shijing 61c03414c0 fix:article中form清空与复现 2024-11-22 17:24:32 +08:00
shijing 34d3099ed6 feat:添加公告视频列表页面 2024-11-22 15:46:41 +08:00
shijing 5c0f9acf2f fix:gx获取工段用name查询 2024-11-22 11:32:47 +08:00
shijing 37eacdadfe fix:光芯大屏更新 2024-11-22 11:21:17 +08:00
shijing 4e1a6901fd fix:tool中修改格式化日期方法 2024-11-22 10:00:29 +08:00
shijing b92937fb9b fix:交接记录手动添加时多选物料 2024-11-22 09:59:32 +08:00
shijing 6a7975e6ce fix:大屏更改 2024-11-21 13:28:28 +08:00
shijing 0752000f24 fix:coding交接变动 2024-11-21 13:27:54 +08:00
shijing 4d8bf81be3 fix:成品检验车间库存放开检验 2024-11-21 13:27:18 +08:00
shijing 6a50019343 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-21 13:24:42 +08:00
shijing 431fcf4bd8 fix:尺寸外观(成品)检验添加检验设备和备注 2024-11-21 13:24:38 +08:00
caoqianming 78053dac34 fix: 标记位置加载js报错的问题 2024-11-20 17:39:05 +08:00
caoqianming fed5c23a28 fix: user处element升级导致的switch颜色处理 2024-11-20 15:52:10 +08:00
caoqianming 014da8f587 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-11-20 15:49:31 +08:00