Commit Graph

2421 Commits

Author SHA1 Message Date
zty 1246966c58 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-17 16:22:33 +08:00
zty fbda02f549 feat: 修改大屏内容和报表 2024-12-17 16:22:29 +08:00
shijing e0a02ba014 fix:客户端可修改大屏标题 2024-12-17 15:43:37 +08:00
shijing bb95b5228e feat:白片抛检验审批 2024-12-17 14:30:38 +08:00
shijing 5c139f0b7c fix:光芯生产执行恢复 2024-12-17 10:39:01 +08:00
shijing ce57e0c5e1 fix:光芯生产执行恢复 2024-12-17 10:28:41 +08:00
shijing b435f9ed10 fix:玻纤生产执行分离 2024-12-17 10:27:19 +08:00
shijing 25a2427138 fix:动态路由 2024-12-16 17:38:43 +08:00
shijing 82ee266d51 fix:menu 2024-12-16 15:57:26 +08:00
zty 421ae76ac6 feat:修改设备编号 2024-12-16 14:54:35 +08:00
shijing da53ce0411 fix:10车间日志提交更新 2024-12-16 13:37:30 +08:00
shijing 139c24c9bc Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-16 11:31:46 +08:00
shijing ba3ce6e30e fix:system添加接口声明 2024-12-16 11:31:42 +08:00
caoqianming 1a6d53a685 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-13 18:14:57 +08:00
caoqianming b3ca98680d feat: 电石渣工序车间单耗异常填写 2024-12-13 18:14:37 +08:00
Li xia bbc0603bdf route生产二部权限替换 2024-12-13 17:41:16 +08:00
shijing c43e670eb1 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-13 17:01:57 +08:00
shijing 9b4bdd2f96 fix:全场报表生产日报表、生产月报表表格改动 2024-12-13 17:01:53 +08:00
caoqianming d14faabc46 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-13 16:13:48 +08:00
caoqianming 733d1bebb1 feat: base 优化menu展示 2024-12-13 16:13:23 +08:00
shijing 55f99058cf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-13 15:42:30 +08:00
shijing ece48faede fix:厂级单耗 2024-12-13 15:42:26 +08:00
zty 5606d90eca Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-13 15:29:56 +08:00
zty c336a6ef1e feat:修改电量报表 按时间段查询 2024-12-13 15:29:53 +08:00
shijing 064860ed92 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-13 14:55:16 +08:00
shijing 8055fe7968 fix:pad端样式调整 2024-12-13 14:55:13 +08:00
caoqianming fa475e8568 feat: base 功能管理页面调整以支持后端路由2 2024-12-13 13:43:46 +08:00
caoqianming b0ad4e1a06 feat: base 功能管理页面调整以支持后端路由 2024-12-13 13:39:45 +08:00
shijing 42baf79b76 fix:工序type 2024-12-13 09:35:56 +08:00
shijing 1750e89138 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-12 17:36:30 +08:00
shijing 516085fa30 base:bx主题颜色变更 2024-12-12 17:36:26 +08:00
zty a56d5cbf82 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-12 17:16:27 +08:00
zty 1f33764782 feat:能源流向图增加单位 2024-12-12 17:16:24 +08:00
shijing fa9dea32ef fix:清除移动端菜单边距 2024-12-12 17:15:00 +08:00
shijing 45f5166d95 fix:工序添加type 2024-12-12 16:40:39 +08:00
shijing fd79baf73a fix:检验项和检验表静态页面 2024-12-12 15:47:46 +08:00
shijing 24252a4995 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-12 15:47:14 +08:00
shijing 010298dd89 feat:废品库出库 2024-12-12 15:47:11 +08:00
zty 0c910a1783 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-12 14:56:12 +08:00
zty 1de408c64d feat: 能源流向增加单位 和修改大屏 2024-12-12 14:56:09 +08:00
shijing 653f5b0282 fix:添加检验项、检验表页面路由 2024-12-12 14:05:36 +08:00
shijing da221bbee4 fix:添加检验项、检验表页面路由 2024-12-12 13:46:17 +08:00
shijing 0cb85ee6dd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-12 13:44:33 +08:00
shijing 256e2b5009 fix:bx放出排版规则 2024-12-12 13:44:30 +08:00
caoqianming 5d94b20320 feat: 优化测点表 2024-12-11 17:48:42 +08:00
caoqianming a50794c2b7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-11 17:47:04 +08:00
caoqianming c8bde428a8 fix: team 编辑后未刷新 2024-12-11 17:46:37 +08:00
shijing bb314a30a2 fix:物料清单成品添加图纸和图纸编号 2024-12-11 15:53:18 +08:00
shijing 69307c7590 fix:玻纤生产执行 2024-12-11 14:58:10 +08:00
shijing e32d444e57 fix:玻纤工序变动 2024-12-11 14:56:50 +08:00
shijing 8bf82762bc fix:玻纤工序变动 2024-12-11 14:56:28 +08:00
shijing cce2c8e395 fix:玻纤工序变动 2024-12-11 10:12:25 +08:00
shijing e03198aa43 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-11 10:09:38 +08:00
shijing ba39e85698 fix:玻纤工段变动 2024-12-11 10:08:39 +08:00
zty a4fa774ce2 feat: tkx 修改大屏增加电量报表和物料氨水消耗 2024-12-10 15:30:14 +08:00
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 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