Commit Graph

287 Commits

Author SHA1 Message Date
shijing ae19b4ac21 feat:光子添加综合查询 2024-05-31 18:43:22 +08:00
caoqianming 0958c62f06 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-31 17:09:35 +08:00
caoqianming 1c65ea0308 feat: 添加培训考试页面路由 2024-05-31 17:08:30 +08:00
shijing 4dc039bef6 feat:添加综合查询 2024-05-24 17:45:21 +08:00
shijing f5d4fc1ced fix:router添加权限 2024-05-23 09:26:51 +08:00
shijing c4ff77c876 fix:计算系数和交接班日志操作添加权限 2024-05-22 09:09:37 +08:00
shijing b7fc2b8ded fix:菜单名称更改 2024-05-20 10:52:38 +08:00
caoqianming bbb24409a5 feat: 路由中煤磨调换位置 2024-05-16 18:30:19 +08:00
shijing 1d4023493c feat:添加排放口和孰料产量 2024-05-16 11:51:15 +08:00
shijing ff62c9e636 fix:更改路由名称 2024-05-14 15:02:58 +08:00
shijing 3a5185ed58 fix:物料价格和工段成本添加权限 2024-05-10 15:06:23 +08:00
shijing 979ad5870d fix:计算系数 2024-05-09 16:02:22 +08:00
shijing 248b15440e fix:去掉重复的路由 2024-05-07 15:58:17 +08:00
shijing cc5bff2c27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-07 11:24:18 +08:00
shijing d67ed6ce74 fix:路由变动,将日志详情提到enm_base中 2024-05-07 11:19:08 +08:00
shijing 09e83c9fc0 fix:回转窑交接班日志 2024-05-07 10:01:38 +08:00
shijing 267cfe4733 fix:增加计算公式页面 2024-05-06 17:10:48 +08:00
shijing 56b2d8de89 fix:日志报错修改 2024-05-06 14:48:03 +08:00
shijing bf8812452f fix:大屏标题更改 2024-05-06 14:46:47 +08:00
shijing 93f058997a fix:电石渣mgroup根据名称通过接口获取id 2024-04-29 11:12:25 +08:00
caoqianming 02b03770c3 fix: 工段表单及相关文件表述修改 2024-04-18 14:46:18 +08:00
shijing e31a3b527a feat:凌源新增原料磨、回转窑、煤磨模块 2024-04-10 17:20:47 +08:00
caoqianming b0ada60169 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-09 15:46:30 +08:00
caoqianming 0928b39e40 fix: 修改设备路由显示perm 2024-04-09 15:45:22 +08:00
shijing eba2759470 feat:新曾凌源原料磨模块 2024-04-09 15:43:49 +08:00
shijing 75ea25baa2 feat:新增石灰石破碎和余热发电 2024-04-03 10:56:34 +08:00
shijing 3e63263ec9 feat:添加库存检验记录 2024-03-22 15:01:43 +08:00
shijing 466c8270b4 隐藏库存检验统计 2024-03-22 14:14:51 +08:00
shijing 365439d05b gannt修改#138 2024-03-21 11:04:44 +08:00
shijing 1bce64dbbd 库存统计、采购统计、库存检验统计 2024-03-21 09:41:23 +08:00
shijing b7cb025304 统计分析导出 2024-03-19 17:15:07 +08:00
shijing 5ea16bde8a 统计分析导出 2024-03-19 17:13:03 +08:00
caoqianming e329cf86f0 feat: 混料统计页面 2024-03-19 15:10:34 +08:00
caoqianming 9479de2460 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-13 09:51:22 +08:00
caoqianming 6228ba367a feat: 添加设备分类页面及相应修改 2024-03-13 09:50:39 +08:00
shijing 994c625b0d 设备分类 2024-03-12 08:50:48 +08:00
shijing b45d946d4e 批量巡检&巡检记录 2024-03-04 09:48:13 +08:00
caoqianming 908dab5634 fix: 不同项目切换的打包适配 2024-02-28 11:51:14 +08:00
caoqianming 8629e1bf61 fix: 根据项目code个性化定制的bug 2024-02-26 18:46:18 +08:00
caoqianming 0f33197bb0 feat: 添加治理设备和监控设备界面 2024-02-20 10:01:27 +08:00
shijing 6c20c1180a 超低排放 2024-01-30 14:43:54 +08:00
shijing 3a3d89d127 成品检验&0119的问题 2024-01-19 11:11:07 +08:00
shijing 88fcbe4518 enp 2024-01-16 15:41:08 +08:00
shijing 5e1990c1a0 picture 2024-01-15 16:10:49 +08:00
caoqianming a3670056ae fix: 到岗记录获取部门错误 2023-12-21 14:08:53 +08:00
caoqianming e1563f70bb Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-19 17:03:22 +08:00
caoqianming 94dbdc4d86 fix: 路由表完善 2023-12-19 17:03:20 +08:00
shijing bd24a20f3b 菜单权限配置 2023-12-19 16:55:41 +08:00
shijing 1a45a24d7c 菜单更改 2023-12-19 15:23:24 +08:00
shijing 4424ce7030 绩效考核初始页面 2023-12-16 13:01:21 +08:00
shijing 3aa3bec7de 统计2 2023-12-15 15:15:32 +08:00
shijing c07fd76ed5 统计2 2023-12-15 15:13:43 +08:00
shijing b924fb5af6 统计 2023-12-13 11:27:33 +08:00
shijing ba2d621214 库存改动 2023-12-11 13:41:47 +08:00
caoqianming 5ce7ce250f feat: 添加很多新页面 2023-12-01 16:15:25 +08:00
caoqianming 2ddcb49616 fix: 一些修改 2023-11-28 08:03:13 +08:00
caoqianming c62188eaa7 fix: mtask页面的bug修改 2023-11-28 00:40:28 +08:00
caoqianming 98d2b3d20f feat: wpm添加了其他日志用于录入avg 2023-11-27 13:52:27 +08:00
shijing dd2fc9a455 更改菜单栏 2023-11-23 11:29:51 +08:00
shijing 5d125d0875 daogangjilu 2023-11-21 09:25:43 +08:00
shijing df9bdab0a6 新增查询规范 2023-11-20 13:46:29 +08:00
shijing 22cf49a6b3 到岗 2023-11-17 19:20:29 +08:00
caoqianming 5d5ea3e1c3 feat: bidataset修改数据 2023-11-14 10:26:36 +08:00
shijing dfc84e220b shujukanban 2023-11-07 14:21:02 +08:00
caoqianming f3ece1dd0e feat: 增加了车间看板 2023-11-06 15:53:22 +08:00
shijing c5b6eb4f58 部分检验 2023-11-03 19:24:34 +08:00
shijing 9fb27aa062 10.26日要修改内容以及检验页面 2023-10-27 17:15:36 +08:00
shijing e246e6f33b 1026修改 2023-10-26 14:49:50 +08:00
caoqianming 9557074627 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-25 17:44:46 +08:00
caoqianming c456086901 feat: 出入库页面基本完成 2023-10-25 17:33:39 +08:00
shijing 8837579a5d mtask日志提交 2023-10-25 14:02:08 +08:00
shijing e5f3d24205 worktask 2023-10-24 14:55:11 +08:00
shijing ce1e98df96 worktask 2023-10-20 18:03:04 +08:00
caoqianming 84adac4680 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-19 14:12:53 +08:00
caoqianming b65b83dc20 fix: 订单/采购订单相关页面修改 2023-10-19 14:08:31 +08:00
shijing 584b22fbbd 页面调整 2023-10-18 17:12:23 +08:00
caoqianming 848182e6a4 feat: 物料/工段/工艺路线页面及排产部分逻辑 2023-10-18 16:31:52 +08:00
shijing 355dfc5250 生产执行页面 2023-10-17 09:04:17 +08:00
shijing 6bae3795da Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-10-13 08:55:21 +08:00
shijing 19d1a3a847 1013 2023-10-13 08:55:15 +08:00
caoqianming 2f30d9c2ee feat: 门禁权限完成 2023-10-10 12:12:39 +08:00
caoqianming 7fa43de6c7 feat: 门禁权限查看与删除 2023-10-09 15:51:25 +08:00
shijing c40364a1f7 光子基础模块 2023-10-09 12:46:15 +08:00
shijing 2d2e9c9f74 fix:0915会议123456 2023-09-15 17:07:16 +08:00
shijing 984dc6d7b7 fix:曲阳更改文案 2023-09-07 09:45:53 +08:00
shijing b871efc464 fix:计量设备 2023-09-06 15:48:15 +08:00
shijing db8e04276e 计量器具台账 2023-09-05 17:05:54 +08:00
shijing 00e3fde1d4 添加电量小时、日、月统计报表 2023-08-24 16:31:35 +08:00
shijing e1cadf9a74 密码强度设置 2023-08-24 08:58:27 +08:00
shijing fda89dde11 fixed:部分修改 2023-08-22 09:25:32 +08:00
shijing f4bd009948 fixed:工段报表导出以及宽度变小时的表单拖动问题 2023-08-18 10:18:11 +08:00
caoqianming 55beb660cb fix: 修改route perm先 2023-08-17 09:33:30 +08:00
caoqianming be7bd541fd feat: 大屏优化 2023-08-17 09:16:26 +08:00
caoqianming 10656c643a fix: enm screen css调整 2023-08-16 16:05:24 +08:00
shijing fafe94dc91 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-15 14:13:03 +08:00
shijing 9c6fa00272 fixd:提交8.10问题修改(还差最后一条) 2023-08-15 14:12:59 +08:00
caoqianming 5ae4238b20 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-08-15 12:39:23 +08:00
caoqianming 5eeecdef14 feat: 添加大屏数据 2023-08-15 12:39:16 +08:00
shijing ce43a1165f fixd:工段图标 2023-08-11 17:15:19 +08:00
shijing 6078fb329f 工段菜单 2023-07-24 11:30:08 +08:00
shijing c3a656fc5d 登陆后首页 2023-07-19 16:13:55 +08:00
shijing f95918bda3 feat:统计 2023-07-14 17:03:27 +08:00
shijing f14ee6bb95 报表 2023-07-07 17:05:48 +08:00
shijing 89323113d6 fim 2023-07-05 15:23:01 +08:00
shijing d9181d1905 设备添加、产品添加 2023-06-30 17:25:14 +08:00
shijing 8bc055bf06 提醒配置文案更改,访客选项更改、添加拉送货车辆图片 2023-06-30 16:10:01 +08:00
shijing 12e533fac9 设备、测点、测点集、班组页面 2023-06-30 08:56:51 +08:00
shijing 2e1411ce04 feat: 能管接口等 2023-06-21 17:52:07 +08:00
shijing 1d55dc3c19 权限控制及原料磨页面 2023-06-20 10:04:21 +08:00
shijing aea01b7df0 config&配置&原料磨 2023-06-16 16:55:41 +08:00
shijing fe48ad17dd 视频自动播放以及部门下监控设备的查看 2023-06-09 10:12:59 +08:00
caoqianming f2e1f450ef feat: 测试报表功能 2023-05-31 15:36:18 +08:00
caoqianming 4a48e69248 feat: 增加相关方黑名单功能 2023-04-07 15:07:06 +08:00
shijing 61f533ef9b 0206 2023-02-06 09:16:01 +08:00
shijing 7d7b8aa76f 0203 2023-02-03 15:33:35 +08:00
shijing 0d533ea8fb 0203 2023-02-03 14:51:54 +08:00
shijing e28f557d45 0203 2023-02-03 14:20:44 +08:00
shijing facd1c081c 0203 2023-02-03 11:36:28 +08:00
shijing 8fc3563a45 0203 2023-02-03 11:14:15 +08:00
shijing 6b28a6c2c5 0203 2023-02-03 10:52:04 +08:00
shijing 1c616d3b3d xinbiaoqian 2023-02-03 10:25:07 +08:00
shijing c3954c8f8a xinbiaoqian 2023-02-03 09:56:26 +08:00
shijing 00e7b1464f xinbiaoqian 2023-02-03 09:19:36 +08:00
shijing e287df2393 xinbiaoqian 2023-02-03 09:01:23 +08:00
caoqianming 8427ea66f1 添加普通作业许可 2022-11-01 16:27:15 +08:00
曹前明 6de65e3d78 路由页面修改 2022-10-26 22:34:32 +08:00
曹前明 cdf60807fa 导出excel 2022-10-20 09:32:57 +08:00
shijing a87f529fe8 route 2022-09-05 11:19:39 +08:00
shijing 4f05f6f460 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-31 14:58:46 +07:00
shijing 4c49964283 Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-08-31 14:55:00 +07:00
曹前明 44d836cc79 router修改 2022-08-31 14:55:43 +08:00
曹前明 f81f1c17d3 工单界面修改包括工单日志等 2022-08-31 14:54:44 +08:00
shijing 2d3b9fa8fe weizhibiaoji 2022-08-26 17:21:29 +07:00
曹前明 c57921f340 算法布设修改 2022-08-12 11:20:33 +08:00
曹前明 8e18267da6 增加打卡记录页 2022-08-11 09:44:02 +08:00
曹前明 f79b37eae7 apk上传 2022-08-08 08:50:12 +08:00
曹前明 8ef71cf24e rpm vm 等模块的界面优化 2022-08-03 12:25:27 +08:00
曹前明 f40bee35be 前端页面优化 2022-07-23 19:19:58 +08:00
曹前明 50f025455a fix conflict 2022-07-22 14:24:25 +08:00
曹前明 48e83cc4fa 事件页面美化调整 2022-07-22 14:22:42 +08:00
2309368887@qq.com 117617a026 anniuquanxian 2022-07-22 09:00:37 +08:00
2309368887@qq.com 0d114bf349 tijiao 2022-07-21 16:40:28 +08:00
2309368887@qq.com 23ec1dfc38 anniuquanxain 2022-07-21 16:05:09 +08:00
曹前明 9f2f00f98e 首页样式调整 2022-07-21 00:33:21 +08:00
2309368887@qq.com b3c432c35d 员工岗位修改 2022-07-18 09:59:46 +08:00
2309368887@qq.com 4e3da40fdb caidanquanxian 2022-07-18 09:24:05 +08:00
2309368887@qq.com 72b64fcddd caidanpeiquan 2022-07-18 08:57:58 +08:00
曹前明 5d492ff497 页面效果调整 2022-07-18 01:19:44 +08:00
shijing 90f9fcc2ca Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs 2022-07-15 17:16:14 +08:00
shijing 14ef127744 rpjdetail 2022-07-15 17:16:08 +08:00