Commit Graph

2567 Commits

Author SHA1 Message Date
shijing 36a7c029b0 fix:mlogbw.js改动声明 2025-01-07 09:42:23 +08:00
shijing 81cf3eda13 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-07 09:40:58 +08:00
shijing 08872064c5 fix:bx交接页面调整 2025-01-07 09:40:54 +08:00
zty 97af55e294 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-06 17:39:20 +08:00
zty b84d64b2f4 feat: 修改大屏内容和生产报告查询 2025-01-06 17:39:17 +08:00
shijing d1215b6b05 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-06 14:58:04 +08:00
shijing e75dfe67be fix:交接记录查看时总计错误纠正 2025-01-06 14:58:00 +08:00
zty fd770c2562 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-06 10:28:31 +08:00
zty 7fd709b7a6 feat: tkx/enm 修改班组 和 生产日报报表增加 目标值等功能 2025-01-06 10:28:28 +08:00
shijing 0877bd03d3 fix:动态产品接口声明 2025-01-06 09:10:41 +08:00
shijing 75f2906cf7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-03 13:51:20 +08:00
shijing 400dfb27dd fix:coding737 2025-01-03 13:51:17 +08:00
zty 553f2761bb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-02 18:04:35 +08:00
zty 6584c82499 feat:修改班组得分 2025-01-02 18:04:30 +08:00
shijing e3acce3f09 fix:mlogbw 2025-01-02 17:45:32 +08:00
shijing eb025fbeb2 fix:库存交接记录检验改动 2025-01-02 17:21:52 +08:00
shijing 3f90ddf8f0 fix:玻纤日志改动物料标签改动 2025-01-02 17:17:04 +08:00
shijing 6824494817 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-02 17:15:26 +08:00
shijing 6102c682f9 fix:mlogbw接口声明 2025-01-02 17:15:23 +08:00
zty ce9e15f83d feat: 修改班组对比bug 和新增 生料工序 2025-01-02 16:22:00 +08:00
shijing 20328ab6ae fix:bx日志详情及过程检验 2024-12-31 16:27:49 +08:00
shijing ac7f5d7471 feat:添加bx入库检验 2024-12-31 16:26:51 +08:00
shijing 81889ef149 fix:inm添加接口声明 2024-12-31 16:25:41 +08:00
shijing 780a088642 fix:bx页面方法变动 2024-12-31 09:20:39 +08:00
shijing beb6343180 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-31 09:18:54 +08:00
shijing ec021374ca fix:bx页面方法变动 2024-12-31 09:18:50 +08:00
zty 4bca9e4179 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 17:53:01 +08:00
zty 8f5c6d3c31 feat:修改生产报告内容 2024-12-30 17:52:56 +08:00
shijing 75b09a9ce1 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 16:11:58 +08:00
shijing 08a1d50c08 fix:coding737 3、合同金额字段加单位 (元) 2024-12-30 16:11:13 +08:00
zty d34b781d9f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 15:20:41 +08:00
zty fedbe82bbf feat: 修改各个工段的里的 电量 分布电耗等名称 2024-12-30 15:19:47 +08:00
caoqianming 3df65b5a2b feat:添加通过给定时间获取班年月日接口 2024-12-30 15:08:06 +08:00
caoqianming d0b79ab921 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 15:04:44 +08:00
caoqianming 022d95e3d8 feat: 主要设备单号查询条件处理 2024-12-30 15:04:18 +08:00
zty 44fef5170d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 14:07:06 +08:00
zty 574431ccb5 feat:修改水 压缩空气,电量的 时间范围选择 2024-12-30 14:07:03 +08:00
caoqianming a55b5612a4 feat: 退出大屏 2024-12-30 14:05:39 +08:00
caoqianming e0e043398f feat: 生产报告图表优化 2024-12-30 13:55:59 +08:00
shijing 589d30de9b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 13:32:03 +08:00
shijing 2d4e3998a4 fix:coding#765 2024-12-30 13:31:59 +08:00
zty f75d122ada 峰谷平增加时间段选择 2024-12-30 13:08:19 +08:00
zty d734aab11f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 13:07:33 +08:00
zty 00fb81d95e feat: 峰谷平增加时间段选择 2024-12-30 13:07:31 +08:00
shijing 620d0345f1 fixcoding764 水泥包装 2024-12-30 11:03:33 +08:00
zty 2c58eec472 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-30 10:59:59 +08:00
zty e79c1b3519 feat: 修改水泥包装 和生料辅料生产报告配色 2024-12-30 10:59:56 +08:00
shijing 52d5b5e8ea fix:coding图5修改生料辅料主要设备表单标题 2024-12-30 10:58:35 +08:00
shijing 70375a27ee fix:coding752生料辅料工序班组月度对比删除成本列 2024-12-30 10:48:54 +08:00
shijing d1b3aa901c fix:coding763 2024-12-30 10:38:56 +08:00
shijing 6ea4eb4149 fix:修改提交错误 2024-12-30 10:12:24 +08:00
shijing f1a031bcd7 1230 2024-12-30 10:07:31 +08:00
shijing 11d38f5508 fix:tkx电石渣工序班组月度对比修改 2024-12-30 09:59:16 +08:00
zty 59a991c49a feat:大屏增加单位 2024-12-30 09:19:07 +08:00
zty c9168a5b61 feat: 修改大屏 本月能源消耗改为本日 2024-12-30 09:14:43 +08:00
caoqianming e8eb624661 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-28 23:52:12 +08:00
caoqianming 22fa90accf feat: 目标配置列表显示年份 2024-12-28 23:52:09 +08:00
caoqianming 07b336e0c6 feat: 煤磨获取目标值错误 2024-12-28 12:43:08 +08:00
caoqianming 24e3a51c1f feat: kwh更改 2024-12-28 11:55:21 +08:00
caoqianming 03c4e1f8da feat: kwh修改 2024-12-28 10:28:31 +08:00
caoqianming f84876d2e5 feat: 生料辅料工序本日数据添加上 2024-12-28 09:51:43 +08:00
caoqianming 6404fd33f1 feat: 样式调整 2024-12-27 20:15:55 +08:00
caoqianming 1747bc6a91 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 19:19:39 +08:00
caoqianming 03d41fc239 feat: report 报表的数据 2024-12-27 19:19:18 +08:00
zty 89bb16149f feat: 修改能源流向图 2024-12-27 19:19:14 +08:00
caoqianming 2384a1ea71 feat: 计量设备添加工段运行 2024-12-27 18:32:28 +08:00
caoqianming cd479c65e6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 18:05:36 +08:00
caoqianming 7fd3fa27fc feat: mgroup 增加code展示 2024-12-27 18:05:14 +08:00
shijing 4bad854f10 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 18:04:23 +08:00
shijing ac1bb62f81 fix:电石渣工序主要设备单耗计算公式初版 2024-12-27 18:04:19 +08:00
zty 7400a6d02c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 17:21:25 +08:00
zty e006cf1855 feat:新增生料工序模块 2024-12-27 17:21:21 +08:00
shijing a0a76308d4 fix: 2024-12-27 16:43:37 +08:00
shijing c34846f3af fix:tkx水泥包装工序生产报告页面调整 2024-12-27 16:41:37 +08:00
shijing cdeff7a3f9 fix:tkx趋势图调整匹配六个工序 2024-12-27 16:40:44 +08:00
shijing f862714b7b fix:tkx水泥粉磨工序生产报告趋势图修正及页面调整 2024-12-27 15:28:16 +08:00
shijing b437c645c6 fix:托克逊烧成工序生产报告趋势图修正及页面调整 2024-12-27 15:22:17 +08:00
shijing d5fcdf20cd fix:煤磨工序生产报告页面调整 2024-12-27 15:05:24 +08:00
zty 0fee5cf088 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 14:57:48 +08:00
zty ffa8d11b67 feat: 增加 生料辅料工序 2024-12-27 14:57:45 +08:00
shijing 863795c285 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 14:55:20 +08:00
shijing c68eeee2f8 fix:电石渣生产报告页面修改 2024-12-27 14:55:17 +08:00
zty 3ce895f9e5 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 14:00:21 +08:00
zty 4c39b66614 feat : 增加曲线图 2024-12-27 14:00:19 +08:00
shijing dc42c40973 fix:托克逊生产报告图表坐标轴调整 2024-12-27 13:58:25 +08:00
zty bd414e41ad Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 13:44:58 +08:00
zty c7d5c96de9 feat: 修改 report 2024-12-27 13:44:54 +08:00
shijing 9e1b4e63c6 feat:计算中心添加大屏数据 2024-12-27 13:36:17 +08:00
shijing b0ffdf0b18 fix:tkx大屏能源消耗图标颜色修改,本月能源数据可修改 2024-12-27 11:24:52 +08:00
zty 3b492e35b6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-27 09:15:18 +08:00
zty 3d2591e904 feat:水泥包装 增加昨日展示 2024-12-27 09:14:19 +08:00
shijing 8432b41a82 fix:检测表中的项目添加编辑 2024-12-26 17:10:12 +08:00
shijing a8c948775e fix:coding#741&&生产报告图表纠正 2024-12-26 16:25:35 +08:00
shijing a2320580c1 fix:coding373、376 2024-12-26 13:30:40 +08:00
shijing e133dc7cf8 fix:bx日志相关改动 2024-12-26 09:39:19 +08:00
shijing 2956be3702 fix:bx日志相关改动 2024-12-26 09:38:58 +08:00
shijing 9eeb26a8fd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-26 09:36:20 +08:00
shijing 82af87ce9b fix:能源流向图,展示所有类型测点值 2024-12-26 09:36:17 +08:00
caoqianming 4d708e7895 fix: 交接班日志时间查询修改 2024-12-26 09:24:52 +08:00
caoqianming dff4b354e2 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-26 09:05:33 +08:00