Commit Graph

1444 Commits

Author SHA1 Message Date
shijing d51041cd20 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-01 17:59:29 +08:00
shijing 41137027c0 pfkecharts 2024-02-01 17:59:24 +08:00
caoqianming b895165e99 merge: 合并更改 2024-02-01 17:57:52 +08:00
caoqianming 6e3e7c4e8e feat: 新增污染源清单 2024-02-01 17:56:47 +08:00
caoqianming 72f7bc4a38 feat: 界面调整 2024-02-01 17:56:29 +08:00
shijing 5c87111b7c zhutisexiala 2024-02-01 15:17:57 +08:00
shijing d9e61258a3 zhutisexiala 2024-02-01 15:17:15 +08:00
shijing 807294d364 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-01 15:09:28 +08:00
shijing 17b9e166f0 pfk 2024-02-01 15:09:22 +08:00
caoqianming eeeadd9b98 feat: cems导出接口完善 2024-02-01 14:15:59 +08:00
caoqianming 868a7e7f51 fix: cems.vue筛选条件 2024-02-01 14:02:29 +08:00
caoqianming 1873f17e4c feat: 添加cems导出界面 2024-02-01 09:32:28 +08:00
shijing 1923d9ca2e Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-31 16:22:38 +08:00
shijing 755d02fa85 wry 2024-01-31 16:22:34 +08:00
caoqianming 24876dcf38 feat: cems2监测预警页面 2024-01-31 16:19:50 +08:00
shijing 187005d361 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-31 14:00:40 +08:00
shijing 55c36acaec wry 2024-01-31 14:00:36 +08:00
caoqianming 99325eb5cf fix: cems样式调整 2024-01-31 13:57:08 +08:00
caoqianming 721030420a Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-31 13:20:19 +08:00
caoqianming 60e6e154f7 feat: 添加cems监测清单页及相应的接口 2024-01-31 13:20:18 +08:00
shijing 58e7ea29ad 退火时车间库存的筛选 2024-01-31 13:19:14 +08:00
shijing 57daa1bc19 退火日志撤回 2024-01-31 10:07:25 +08:00
shijing 29b64b9a2a 退火提交 2024-01-31 09:29:55 +08:00
caoqianming e2015236e7 feat: 调整scTable默认配置 2024-01-30 16:14:37 +08:00
shijing d2f39536af enpTable中hover状态背景色 2024-01-30 15:29:34 +08:00
shijing dd4529bd3b enpTable中hover状态背景色 2024-01-30 15:29:05 +08:00
shijing 27ed58bf5c Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-30 14:44:08 +08:00
shijing 6c20c1180a 超低排放 2024-01-30 14:43:54 +08:00
caoqianming 9afbeaa891 feat: 增加物料复制功能 2024-01-29 18:41:46 +08:00
caoqianming 5c7a61089b feat: 简化mlogb逻辑 2024-01-28 00:21:32 +08:00
caoqianming 4855ab4028 fix: 10车间mlog编辑 2024-01-27 22:50:15 +08:00
caoqianming 6cb3e526aa fix: 退火先去除不必要的表单项目 2024-01-25 13:23:24 +08:00
caoqianming 729dd9b38d feat: 出入库记录增加执行车间 2024-01-25 10:17:27 +08:00
caoqianming f855f65d25 fix: mioitem batch选择时可显示数量 2024-01-25 10:13:18 +08:00
caoqianming 0a12e323f9 fix: 性能检验列表展示用户名 2024-01-25 10:05:25 +08:00
caoqianming 5c5a0bafc0 fix: 出入库记录按物料类型筛选 2024-01-24 11:56:48 +08:00
caoqianming 9a9ddcfe5d feat: 出入库记录按物料类型筛选 2024-01-24 11:26:37 +08:00
caoqianming 8458dc765e feat: 隐去加工工具和辅助工装 2024-01-24 11:26:10 +08:00
caoqianming 72875e5b0b Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-24 09:32:00 +08:00
caoqianming 98581e7d51 fix: mioitem_form车间批次号获取 2024-01-24 09:31:57 +08:00
shijing 5ed9cd6d72 batch跟随mtask日期 2024-01-24 09:02:29 +08:00
shijing 0a273bbfca 获取项目code 2024-01-23 17:07:33 +08:00
shijing ee580fdb27 托克逊大屏文案更改 2024-01-23 16:59:47 +08:00
shijing 376a0900e1 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-23 11:19:14 +08:00
shijing fa600610d9 materialList展示 2024-01-23 11:19:09 +08:00
caoqianming 9ea6c53725 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-23 10:54:49 +08:00
caoqianming 47d11d82db 能管模拟数据 2024-01-23 10:54:47 +08:00
shijing e0dcddfec6 数据看板今日任务改动 2024-01-23 09:08:08 +08:00
shijing c2d09a0fe1 7车间数据 2024-01-22 17:54:35 +08:00
shijing 410a55b411 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-22 17:07:13 +08:00