Commit Graph

2567 Commits

Author SHA1 Message Date
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