Commit Graph

2860 Commits

Author SHA1 Message Date
shijing f4ecb03144 fix:车间库存领料时扫码问题修正 2025-02-07 16:59:09 +08:00
shijing f3aea5bf88 fix:扫码弹窗接收立即关闭参数 2025-02-07 16:58:31 +08:00
shijing 0fbd17810d fix:采购入库时默认数量为1 2025-02-07 16:11:03 +08:00
shijing 8c7b900af0 fix:领料不合格不显示 2025-02-07 15:19:32 +08:00
shijing 37eeb45242 fix:根据交接物料限制交接工段 2025-02-07 15:16:30 +08:00
shijing 9a9be3857e fix:wpm新增接口声明 2025-02-07 14:57:20 +08:00
shijing e8449383c8 fix:bwcheck优化 2025-02-07 10:12:13 +08:00
shijing 8eeb78199c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-02-07 10:09:15 +08:00
shijing 9b0d63bcd6 fix:routepack编辑按钮显示 2025-02-07 10:09:11 +08:00
caoqianming b53fd04088 feat: 证书状态查询 2025-02-06 11:54:04 +08:00
caoqianming f550b1391d feat: 在线考试详情页调整2 2025-02-06 09:03:57 +08:00
caoqianming 37f9c9fa3f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-02-05 17:54:39 +08:00
caoqianming 046d544872 feat: 在线考试详情页调整 2025-02-05 17:54:21 +08:00
shijing 423a390c4f fix:玻纤交接改版 2025-02-05 16:57:47 +08:00
shijing 7eac479d9c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-02-05 16:55:44 +08:00
shijing 5788b746cd fix:玻纤route中批次校验默认false 2025-02-05 16:55:40 +08:00
caoqianming 9a7dea317b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-02-05 15:50:22 +08:00
caoqianming 44db345ae7 feat: 证书管理增加状态展示 2025-02-05 15:50:10 +08:00
zty 5594b2c982 feat: tkx 修改质量报表 2025-01-26 11:26:22 +08:00
zty e7b4df54ce feat: tkx 修改质量 报表 2025-01-26 09:44:31 +08:00
zty 08b5c0550f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-24 17:17:09 +08:00
zty 1d837b9b0a feat: 修改质量报表 2025-01-24 17:17:04 +08:00
shijing 3d273844bc fix:排版添加跟随检验值 2025-01-24 16:32:00 +08:00
zty 2a75517a19 feat: fix 修改质量报表 2025-01-24 09:21:52 +08:00
zty 56334fc718 feat: 修改质量报表 2025-01-23 14:24:02 +08:00
shijing ae3e6aa1ec fix:曲阳更改ip地址 2025-01-23 09:54:58 +08:00
shijing e7c983001b fix:mlogb扫wpr码时,若以有该批次的使用数量显示更正 2025-01-22 16:46:15 +08:00
shijing 9399fd3b17 fix:交接批物料时修改 2025-01-22 16:33:18 +08:00
shijing c4b28f8d5e fix:打印接口 2025-01-22 14:34:35 +08:00
shijing af13ba23af fix:检验表中的检测项添加加入物料信息字段 2025-01-22 14:25:09 +08:00
shijing e8508bfc67 fix:mlogbw输出物料检验 2025-01-22 09:42:05 +08:00
shijing 14170dbc56 fix:任务mtask添加删除 2025-01-22 09:18:06 +08:00
shijing 94ec97c7ef fix:玻纤物料显示追踪方式 2025-01-21 15:34:08 +08:00
shijing 6efc502ccf fix:工单处理调整 2025-01-21 15:33:05 +08:00
shijing c5d6e6fcf7 fix:mlogbw样式调整 2025-01-21 11:07:06 +08:00
shijing dfdecc01bd fix:bug修复 2025-01-21 10:42:30 +08:00
shijing 24b4781f53 fix:mlogbw检测保存和编辑 2025-01-21 10:40:04 +08:00
shijing 397587bbeb fix:玻纤原料入库检验 2025-01-20 17:37:18 +08:00
shijing eff75a7c86 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-20 17:13:51 +08:00
shijing 53eb08d218 fix:缺陷项不合格分类去掉合格选择项 2025-01-20 17:13:48 +08:00
zty a97abd2f2c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-17 17:32:45 +08:00
zty 29f7d0ecc4 feat:修改 enm/report 2025-01-17 17:32:40 +08:00
shijing f16f649dc4 fix:库存交接时新增表单验证 2025-01-17 11:20:04 +08:00
shijing f83983578f fix:原料库添加类型和不合格标记 2025-01-17 11:02:02 +08:00
shijing 07e45047e4 fix:隐掉库存里的入库按钮 2025-01-17 09:36:37 +08:00
shijing caf2f09c00 fix:检验记录与检验按钮只在批次追踪物料显示 2025-01-17 09:31:34 +08:00
shijing ab987c0b8b fix:wpr显示不合格标记 2025-01-17 09:23:58 +08:00
shijing 5d58d0c8fc fix:日志详情里添加一个传参 2025-01-17 09:21:41 +08:00
shijing 3de4874cf4 fix:mlog中添加操作项 2025-01-17 09:20:19 +08:00
shijing 29c5eeb514 fix:车间库存领料时mioitem可删除 2025-01-17 09:13:30 +08:00
shijing c99e2c8d1b fix:交接记录可以更改批次号,以及解决扫码重复的情况 2025-01-17 09:12:23 +08:00
shijing d3db926789 fix:原料库添加物料类型 2025-01-17 09:08:31 +08:00
shijing 23570fd84b fix:日志中物料显示问题修正 2025-01-16 11:01:49 +08:00
shijing b6b92fc451 fix:半成品添加图纸 2025-01-16 11:00:40 +08:00
shijing ddcaae1bf9 fix:缺陷项去掉合格类型 2025-01-16 11:00:07 +08:00
shijing 8269c96159 fix:inmjs更新 2025-01-16 10:59:01 +08:00
shijing cf8cb6726b feat:添加操作项页面,操作项添加类型 2025-01-16 10:58:37 +08:00
shijing 29a9af5312 fix:车间库存检验记录 2025-01-15 15:52:51 +08:00
shijing 7831d87869 fix:mlogb中批次输入扫码(wm||wb) 2025-01-15 15:51:56 +08:00
shijing 6088b9c633 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-15 15:47:56 +08:00
shijing e32c12b2da fix:车间库存修改 2025-01-15 15:47:52 +08:00
zty efd82972af Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-14 16:28:19 +08:00
zty bf736966b6 feat: 修改 report 报表 2025-01-14 16:28:14 +08:00
shijing 88f1ea7af7 fix:玻纤日志改动 2025-01-14 14:16:36 +08:00
shijing ddb82670ad Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-14 10:31:36 +08:00
shijing 70ca59a680 fix:mlogb和handoverb扫码添加 2025-01-14 10:31:33 +08:00
zty 5f116bed5f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-13 18:03:05 +08:00
zty 8d22019fd4 feat:修改班组排名 2025-01-13 18:03:02 +08:00
shijing 2dc9099409 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-13 16:48:53 +08:00
shijing 80f36a0e6f fix:玻纤改动 2025-01-13 16:48:50 +08:00
zty b31ae9403c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-13 11:30:40 +08:00
zty b63b5c12db feat:enm/bug fix 2025-01-13 11:30:37 +08:00
shijing 2a5183defd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-13 09:12:14 +08:00
shijing fe4e537ef8 fix:交接时物料选项工序展示;库存添加动态物料展示 2025-01-13 09:12:11 +08:00
zty 64c738acd2 feat: 修改 enm 报表 2025-01-10 17:32:01 +08:00
shijing c1a4150080 fix:mlogb变动更新改动 2025-01-10 15:50:57 +08:00
shijing 49c3fdaae3 fix:bx日志相关改动 2025-01-10 15:23:17 +08:00
shijing f01b1a6c9d fix:mlogbw 2025-01-10 10:58:01 +08:00
shijing f1c363ed23 fix:光芯日志输出物料编辑 2025-01-10 10:43:08 +08:00
shijing 4765754890 fix:日志详情输入无聊去掉加工前不良 2025-01-09 13:41:52 +08:00
shijing 2a282c5b63 fix:mlobw编辑时传参调整以及生产领料时物料标签的打印 2025-01-09 13:29:26 +08:00
shijing faf6358eab fix:mlogbdefectjiekoushengming 2025-01-09 11:35:24 +08:00
shijing f93eb0fe89 fix:mlogbw提交 2025-01-09 10:52:11 +08:00
shijing 2dfc51b67d fix:日志改动 2025-01-07 17:16:12 +08:00
shijing 4b02b7c00f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-07 16:11:05 +08:00
shijing 0ffabc4438 fix:采购入库检验调整 2025-01-07 16:11:02 +08:00
zty 84c05428be Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2025-01-07 14:19:22 +08:00
zty 95bba723b0 feat:修改车间工序单耗查询问题 2025-01-07 14:19:16 +08:00
shijing 251a96d083 fix:mio必填项提示 2025-01-07 11:29:01 +08:00
shijing a42c674fcc fix:领料添加mb 2025-01-07 11:28:21 +08:00
shijing 46372aa7ca feat:接口声明(route中的辅料) 2025-01-07 11:03:25 +08:00
shijing 1fb2942e44 feat:route中添加辅料 2025-01-07 11:02:36 +08:00
shijing 295ed27bac fix:玻纤日志相关调整 2025-01-07 09:47:06 +08:00
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
caoqianming d36f8111d4 feat: 棒管查询条件起止 2024-12-26 09:05:31 +08:00
shijing 34728670da Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-26 08:47:58 +08:00
shijing bfb3693a3f fix:移动端formitem样式调整 2024-12-26 08:47:55 +08:00
caoqianming 3bbe08f6d0 fix: 棒统计的时间选择错误 2024-12-25 18:16:16 +08:00
caoqianming eeebe57fa4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-25 18:08:26 +08:00
caoqianming 4ff97bc377 feat: 车间单耗分析说明添加完毕 2024-12-25 18:08:23 +08:00
shijing 40f35c5049 fix:能源流向更换背景图,添加测点类型图标 2024-12-25 17:48:21 +08:00
shijing cd3039865f Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-25 17:20:34 +08:00
shijing 047b75344b fix:能源流向更换背景图,添加测点类型图标 2024-12-25 17:20:30 +08:00
zty a0b1659f10 feat: 修改主要报表 2024-12-25 16:55:17 +08:00
caoqianming e2595bf3c9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-25 15:24:49 +08:00
caoqianming bc343c6a96 feat: 计算系数的相关页面 2024-12-25 15:24:47 +08:00
shijing 0fb47feb55 fix:光芯减薄车间看板静态页面 2024-12-25 15:15:17 +08:00
shijing dc65cf0a1b fix:defect不合格项添加备注 2024-12-25 15:14:12 +08:00
shijing 5ef4d80a59 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-25 15:04:06 +08:00
shijing bfba9b2e7c fix:coding#732 2024-12-25 15:04:03 +08:00
caoqianming 654da126d4 feat: 增加计算系数 2024-12-25 14:55:25 +08:00
shijing 6fd9f94271 fix:岗位放开描述字段 2024-12-24 15:08:48 +08:00
shijing 5c43ebba31 fix:scEcharts组件完善 2024-12-24 14:41:29 +08:00
shijing 4d414f1fcf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-24 14:10:28 +08:00
shijing 60d8ea8508 fix:qctDetail修正 2024-12-24 14:09:53 +08:00
zty 91fad99f5b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-24 09:30:50 +08:00
zty 1d9645fa45 feat:修改循环风机无数据 2024-12-24 09:30:47 +08:00
caoqianming ec90ec5ecd feat: 按托克逊要求修改页面 2024-12-23 14:40:36 +08:00
shijing f3015f58bf fix:一些小改动 2024-12-23 09:25:19 +08:00
shijing 93d207b7d4 fix:testitem添加字段 2024-12-20 16:51:10 +08:00
shijing a9117da584 fix:testitem_form中去掉cate获取 2024-12-20 11:24:22 +08:00
shijing f51f7affaf fix:enum.js新增数据 2024-12-20 11:08:53 +08:00
shijing 6dac98b2a3 fix:scformtable添加序号隐藏 2024-12-20 10:47:15 +08:00
shijing e825947de7 fix:检验表功能完善 2024-12-20 10:45:59 +08:00
shijing 94bd41c4f1 fix:qm检测表相关接口声明 2024-12-19 16:08:41 +08:00
shijing 0deb3a653c fix:检测项列表展示修正 2024-12-19 16:07:44 +08:00
shijing 8664db52b7 fix:检验项修正 2024-12-19 15:55:13 +08:00
shijing 9018800f4f fix:玻纤生产执行页面变更 2024-12-18 17:42:18 +08:00
shijing d2821d5e98 fix:玻纤物料添加追踪方式 2024-12-18 15:09:43 +08:00
shijing 9bee6af2b1 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-18 13:44:51 +08:00
shijing 4afa8e8361 fix:工艺路线添加切分数量 2024-12-18 13:43:59 +08:00
zty 0a20102060 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-18 13:29:41 +08:00
zty f3d84d165e feat: 修改生成日报的运转率和运转时间 2024-12-18 13:29:37 +08:00
shijing 8b25da6bad fix:能源流向图片地址纠正 2024-12-18 11:32:48 +08:00
shijing c3eaa07d73 feat:添加不合格项#coding720 2024-12-18 11:25:23 +08:00
caoqianming f231b2dc25 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-17 17:33:10 +08:00
caoqianming 299258925c feat: process添加字段 2024-12-17 17:32:53 +08:00
zty 376b65364f feat: 增加压缩空气报表 2024-12-17 17:21:07 +08:00
shijing af45254d43 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-12-17 17:07:45 +08:00
shijing 368d106143 fix:能源流向图添加工业水,去掉图标 2024-12-17 17:07:42 +08:00
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