Commit Graph

2573 Commits

Author SHA1 Message Date
shijing d30376cd17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-09 11:07:30 +08:00
shijing 5b3fa16bec fix:光子综合查询库存修正 2024-12-09 11:05:13 +08:00
caoqianming 5b1f9db6d8 feat: mpoint添加筛选 2024-12-06 19:27:11 +08:00
caoqianming 8c5f6b6cec feat: 停机日志页面调整 2024-12-06 19:23:48 +08:00
caoqianming d0d41b6f59 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 19:22:22 +08:00
caoqianming 79debc4242 feat: 计算中心页面调整 2024-12-06 19:22:19 +08:00
shijing 8c070442c6 fix:流向图调整 2024-12-06 17:54:41 +08:00
shijing 9f2d1b9bf1 fix:流向图调整 2024-12-06 17:54:05 +08:00
shijing d073270dbb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 16:10:04 +08:00
shijing 02364cba7d fix:流向图图片地址 2024-12-06 16:10:01 +08:00
caoqianming 9292cfe61d feat: enstatvue 小调整 2024-12-06 15:37:08 +08:00
caoqianming d7d1ab60de Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 15:36:37 +08:00
caoqianming 8443916320 feat: base query可替换order 2024-12-06 15:36:33 +08:00
shijing 856cd3dad1 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 15:34:06 +08:00
shijing 8f35a7f6b5 fix:coding#674页面数据 2024-12-06 15:34:03 +08:00
caoqianming 1c47d546b7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 15:14:04 +08:00
caoqianming 497c57a186 feat: 增加计算聚合页面 2024-12-06 15:13:59 +08:00
zty eca678139b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 15:06:41 +08:00
zty bf581b872d feat: 修改峰谷平的报表 2024-12-06 15:06:38 +08:00
shijing 3a59765b26 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 14:53:39 +08:00
shijing 09b5f89a0a fix:coding#674页面数据 2024-12-06 14:53:36 +08:00
zty 2427752b2a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 14:27:07 +08:00
zty 47b225d7ab feat: 增加峰谷平和 水报表 2024-12-06 14:25:27 +08:00
caoqianming 9398cab8b6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 13:50:57 +08:00
caoqianming 20b52d4c3b feat: 计算中心添加工段计算页面 2024-12-06 13:50:54 +08:00
shijing 53b892317a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 13:01:24 +08:00
shijing cde58ee08f fix:coding#674页面 2024-12-06 13:01:20 +08:00
caoqianming 2dd4661f44 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 11:53:59 +08:00
caoqianming 9b53a3428b feat: 能管控制台设备提醒查询条件 2024-12-06 11:53:55 +08:00
shijing 3049f491a8 fix:报警事件页面以及处理改动 2024-12-06 11:16:15 +08:00
shijing 4e8f85f63a fix:coding#673综合对比 2024-12-06 09:53:35 +08:00
shijing b54b1733b9 fix:coding#673全厂报表 2024-12-06 09:48:42 +08:00
shijing 15292ee455 fix:coding#673能源报表 2024-12-06 09:39:09 +08:00
shijing 9c59ebbfc5 fix:coding#673水泥包装工序 2024-12-06 09:36:17 +08:00
shijing 5f58446d6d fix:coding#673水泥粉磨工序 2024-12-06 09:34:56 +08:00
shijing 488ab287d4 fix:coding#673烧成工序 2024-12-06 09:22:23 +08:00
shijing 607546ba7d fix:coding#673煤磨工序 2024-12-06 09:20:42 +08:00
shijing d1ea1e49ac fix:coding#673生料工序 2024-12-06 09:19:28 +08:00
shijing b79a1ef671 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-06 09:15:03 +08:00
shijing 6598a4f845 fix:coding#673电石渣工序 2024-12-06 09:14:59 +08:00
caoqianming a17263b07a fix: overlay error 2024-12-05 18:18:19 +08:00
caoqianming a019b681ee Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-05 18:18:04 +08:00
caoqianming 5cb13722a4 feat: 排班规则页面 2024-12-05 18:17:59 +08:00
shijing 520004edb9 fix:coding#658能源监察报表填数 2024-12-05 17:48:31 +08:00
shijing 4909cadf77 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-05 17:19:17 +08:00
shijing 619e1ea535 fix:coding#658能源监察报表 2024-12-05 17:19:13 +08:00
caoqianming 345c73cf09 feat: 计算结果页面优化 2024-12-05 15:26:20 +08:00
caoqianming 5ec953ff2e feat: base xtselect emit change 2024-12-05 15:21:56 +08:00
shijing bc583ecb8d fix:托克逊事件跳转 2024-12-05 11:23:43 +08:00
shijing b429dbc6ea fix:删除大文件 2024-12-05 10:35:52 +08:00