Commit Graph

1480 Commits

Author SHA1 Message Date
shijing 0ef2c8ba18 入场检验列表 2024-03-01 16:49:07 +08:00
shijing 2d86e13808 过程检验 2024-03-01 16:13:38 +08:00
shijing bb9bae23fd enp大屏 2024-03-01 15:52:12 +08:00
shijing b2ef0ed3e5 检验管理 2024-03-01 15:49:23 +08:00
shijing 4247366f7a 周四会议部分更改 2024-03-01 14:57:07 +08:00
shijing 4da1c33c33 小微站设备数据 2024-02-28 17:37:03 +08:00
shijing 69570c44f3 大屏改动 2024-02-28 16:42:18 +08:00
shijing 6ca6565791 智能管理表头 2024-02-28 16:02:08 +08:00
shijing beac9f3733 3dtiles依赖换线上地址 2024-02-28 13:40:12 +08:00
shijing 281db61506 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-28 13:16:19 +08:00
shijing a1f1f8af63 3dtiles 2024-02-28 13:16:09 +08:00
caoqianming 908dab5634 fix: 不同项目切换的打包适配 2024-02-28 11:51:14 +08:00
shijing 3f1f78f625 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-28 10:43:34 +08:00
shijing f5f7ec2e54 性能检验添加编辑 2024-02-28 10:43:32 +08:00
caoqianming b5c5507564 fix: 多页面样式调整 2024-02-27 18:21:54 +08:00
caoqianming 7eff5872f6 fix: 智能治理结构优化 2024-02-27 16:04:11 +08:00
caoqianming ce5562a20f Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-27 15:20:17 +08:00
caoqianming f0b16b601c fix: rpj_show选择证书不显示的bug 2024-02-27 15:20:15 +08:00
shijing 3e7cacb061 style 2024-02-27 14:32:20 +08:00
shijing 3c0b221c13 页面标题 2024-02-27 14:28:47 +08:00
shijing 33eb880002 pollutant2 2024-02-27 14:24:50 +08:00
shijing dc74f69cc3 页面标题样式统一 2024-02-27 14:22:45 +08:00
shijing 762f648d23 页面标题样式统一 2024-02-27 14:20:08 +08:00
caoqianming 6e7b2a9f57 fix: 污染源界面样式调整 2024-02-27 14:04:37 +08:00
caoqianming 9715aace46 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-27 13:55:09 +08:00
caoqianming 051319c883 fix: 排口清单样式调整 2024-02-27 13:55:08 +08:00
shijing dc7d7f1ec0 dapingshujutiaoshi 2024-02-27 13:49:19 +08:00
shijing bc4b944272 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-27 13:48:39 +08:00
shijing 488e74ccf0 enp新增接口 2024-02-27 13:48:36 +08:00
caoqianming 2ae64eef2a Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-27 13:44:19 +08:00
caoqianming dbdc20b42b fix: 有组织排放内容调整 2024-02-27 13:44:17 +08:00
shijing a914d61e8a 视频显示 2024-02-27 09:01:07 +08:00
caoqianming 8629e1bf61 fix: 根据项目code个性化定制的bug 2024-02-26 18:46:18 +08:00
caoqianming 4918d99218 fix: 登录后顶栏名称错误 2024-02-26 17:23:53 +08:00
shijing b0452cfb96 菜单更改 2024-02-26 14:45:10 +08:00
shijing a1f2c86055 页面更新 2024-02-23 17:01:02 +08:00
shijing a7616c4d60 接口添加 2024-02-23 11:20:29 +08:00
shijing f26cd3f2f6 洗车记录 2024-02-23 11:20:10 +08:00
shijing 1a3f77a6a9 小问题修改 2024-02-22 14:29:53 +08:00
shijing a57fa2f750 工序合格数统计 2024-02-22 11:03:45 +08:00
shijing fa87c5fdce 生产检验统计表加名称规格型号列 2024-02-22 10:05:21 +08:00
shijing 6c795c0127 任务进度添加规格和开工完工时间 2024-02-22 09:56:37 +08:00
shijing 78f9b40a1b 生产线表格中炉号变动 2024-02-22 09:49:19 +08:00
shijing 2a4fdf1573 滚动table中新增设备状态 2024-02-22 09:46:39 +08:00
shijing 6beafdc9f2 成品检验表格宽度修改 2024-02-22 09:40:06 +08:00
shijing 136eff089f 10车间车间看板全年生产统计柱状图标注更改颜色和位置 2024-02-22 09:11:10 +08:00
shijing 688b3b82fe 首页库存、生产进度更改 2024-02-22 09:10:00 +08:00
shijing 5401d07003 shouye 2024-02-21 09:46:54 +08:00
shijing bbb096e67c 光子首件检验人员筛选 2024-02-21 09:13:44 +08:00
shijing 06f87adc45 添加事件批量删除按钮与前方的间隔 2024-02-20 10:02:55 +08:00
shijing 65a4795721 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-20 10:01:51 +08:00
shijing bd0f46d7e9 事件相关接口的变动 2024-02-20 10:01:48 +08:00
caoqianming 2597e63aeb Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-20 10:01:29 +08:00
caoqianming 0f33197bb0 feat: 添加治理设备和监控设备界面 2024-02-20 10:01:27 +08:00
shijing 594a217af2 事件批量删除 2024-02-19 17:08:05 +08:00
shijing a2e91fa968 报警事件批量删除 2024-02-19 16:57:42 +08:00
shijing 6244d0d49f 菜单变动 2024-02-19 10:58:47 +08:00
shijing 68416ae7a9 菜单变动 2024-02-19 10:55:51 +08:00
caoqianming 3240f66f8a fix: 处理合并冲突 2024-02-19 10:52:17 +08:00
caoqianming da3136ecc6 feat: 智能治理页面 2024-02-19 10:48:00 +08:00
shijing e60973b274 运输页面 2024-02-05 17:02:41 +08:00
shijing 3cf1e45762 样式更改 2024-02-04 17:36:43 +08:00
caoqianming e1817e611f feat: cems2,cemsExport导出 2024-02-04 14:28:05 +08:00
caoqianming 26b055ab6f feat: 调整cmes界面 2024-02-04 14:16:59 +08:00
caoqianming 4dc0136368 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-04 10:07:40 +08:00
caoqianming 08290605e2 feat: 新增pollutant页面 2024-02-04 10:07:38 +08:00
shijing 64bad78780 背景图片丢失修改 2024-02-04 09:03:57 +08:00
shijing cf3cfeba90 pfkecharts 2024-02-01 18:13:50 +08:00
shijing d51041cd20 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-01 17:59:29 +08:00
shijing 41137027c0 pfkecharts 2024-02-01 17:59:24 +08:00
caoqianming b895165e99 merge: 合并更改 2024-02-01 17:57:52 +08:00
caoqianming 6e3e7c4e8e feat: 新增污染源清单 2024-02-01 17:56:47 +08:00
caoqianming 72f7bc4a38 feat: 界面调整 2024-02-01 17:56:29 +08:00
shijing 5c87111b7c zhutisexiala 2024-02-01 15:17:57 +08:00
shijing d9e61258a3 zhutisexiala 2024-02-01 15:17:15 +08:00
shijing 807294d364 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-02-01 15:09:28 +08:00
shijing 17b9e166f0 pfk 2024-02-01 15:09:22 +08:00
caoqianming eeeadd9b98 feat: cems导出接口完善 2024-02-01 14:15:59 +08:00
caoqianming 868a7e7f51 fix: cems.vue筛选条件 2024-02-01 14:02:29 +08:00
caoqianming 1873f17e4c feat: 添加cems导出界面 2024-02-01 09:32:28 +08:00
shijing 1923d9ca2e Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-31 16:22:38 +08:00
shijing 755d02fa85 wry 2024-01-31 16:22:34 +08:00
caoqianming 24876dcf38 feat: cems2监测预警页面 2024-01-31 16:19:50 +08:00
shijing 187005d361 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-31 14:00:40 +08:00
shijing 55c36acaec wry 2024-01-31 14:00:36 +08:00
caoqianming 99325eb5cf fix: cems样式调整 2024-01-31 13:57:08 +08:00
caoqianming 721030420a Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-31 13:20:19 +08:00
caoqianming 60e6e154f7 feat: 添加cems监测清单页及相应的接口 2024-01-31 13:20:18 +08:00
shijing 58e7ea29ad 退火时车间库存的筛选 2024-01-31 13:19:14 +08:00
shijing 57daa1bc19 退火日志撤回 2024-01-31 10:07:25 +08:00
shijing 29b64b9a2a 退火提交 2024-01-31 09:29:55 +08:00
caoqianming e2015236e7 feat: 调整scTable默认配置 2024-01-30 16:14:37 +08:00
shijing d2f39536af enpTable中hover状态背景色 2024-01-30 15:29:34 +08:00
shijing dd4529bd3b enpTable中hover状态背景色 2024-01-30 15:29:05 +08:00
shijing 27ed58bf5c Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-30 14:44:08 +08:00
shijing 6c20c1180a 超低排放 2024-01-30 14:43:54 +08:00
caoqianming 9afbeaa891 feat: 增加物料复制功能 2024-01-29 18:41:46 +08:00
caoqianming 5c7a61089b feat: 简化mlogb逻辑 2024-01-28 00:21:32 +08:00
caoqianming 4855ab4028 fix: 10车间mlog编辑 2024-01-27 22:50:15 +08:00
caoqianming 6cb3e526aa fix: 退火先去除不必要的表单项目 2024-01-25 13:23:24 +08:00
caoqianming 729dd9b38d feat: 出入库记录增加执行车间 2024-01-25 10:17:27 +08:00
caoqianming f855f65d25 fix: mioitem batch选择时可显示数量 2024-01-25 10:13:18 +08:00
caoqianming 0a12e323f9 fix: 性能检验列表展示用户名 2024-01-25 10:05:25 +08:00
caoqianming 5c5a0bafc0 fix: 出入库记录按物料类型筛选 2024-01-24 11:56:48 +08:00
caoqianming 9a9ddcfe5d feat: 出入库记录按物料类型筛选 2024-01-24 11:26:37 +08:00
caoqianming 8458dc765e feat: 隐去加工工具和辅助工装 2024-01-24 11:26:10 +08:00
caoqianming 72875e5b0b Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-24 09:32:00 +08:00
caoqianming 98581e7d51 fix: mioitem_form车间批次号获取 2024-01-24 09:31:57 +08:00
shijing 5ed9cd6d72 batch跟随mtask日期 2024-01-24 09:02:29 +08:00
shijing 0a273bbfca 获取项目code 2024-01-23 17:07:33 +08:00
shijing ee580fdb27 托克逊大屏文案更改 2024-01-23 16:59:47 +08:00
shijing 376a0900e1 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-23 11:19:14 +08:00
shijing fa600610d9 materialList展示 2024-01-23 11:19:09 +08:00
caoqianming 9ea6c53725 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-23 10:54:49 +08:00
caoqianming 47d11d82db 能管模拟数据 2024-01-23 10:54:47 +08:00
shijing e0dcddfec6 数据看板今日任务改动 2024-01-23 09:08:08 +08:00
shijing c2d09a0fe1 7车间数据 2024-01-22 17:54:35 +08:00
shijing 410a55b411 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-22 17:07:13 +08:00
caoqianming 29b073759d fix: 7车间设备查询使用升降式退火炉 2024-01-22 17:07:11 +08:00
shijing 0f15a76945 6车间看板数据调整 2024-01-22 17:07:04 +08:00
caoqianming 7e5d95a0a3 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-22 17:05:26 +08:00
caoqianming 98f10a3182 fix: 交接单时保留2位数的bug 2024-01-22 17:05:24 +08:00
shijing 5538f8354c Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-22 13:45:17 +08:00
shijing f916b09ec6 数据大屏多次请求问题 2024-01-22 13:45:09 +08:00
caoqianming 96921a938e fix: material_form选择时使用full_name 2024-01-22 09:12:35 +08:00
shijing 940c1b6337 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2024-01-22 08:50:53 +08:00
shijing 348bd899d5 数据大屏为昨日周所在数据 2024-01-22 08:50:49 +08:00
caoqianming 1d896185a2 fix: 6车间炸纹未纳入count_ok统计 2024-01-20 22:50:02 +08:00
caoqianming 03698ba109 fix: count_n_w改为count_n_wq 2024-01-20 22:39:54 +08:00
caoqianming d9cf2d8b72 fix: 路线选择返回item需要使用value-key 2024-01-20 22:31:36 +08:00
caoqianming 0a47b93517 feat: 退火显示完整物料名称 2024-01-20 22:30:48 +08:00
caoqianming f1a65e94d0 feat: 混料显示完整物料名称 2024-01-20 22:29:52 +08:00
shijing a85dca660f 生产检验统计 2024-01-19 17:40:06 +08:00
shijing 3162c5948a 统计分析-合格数统计 2024-01-19 16:52:54 +08:00
shijing 4b533d4e94 6车间看板昨日改为本周工序进度 2024-01-19 16:06:40 +08:00
shijing 8ba7a12c88 AVG日志记录 2024-01-19 15:12:28 +08:00
shijing b2343d5438 gantt悬浮时间显示 2024-01-19 11:17:50 +08:00
shijing 3a3d89d127 成品检验&0119的问题 2024-01-19 11:11:07 +08:00
shijing b3edf33de9 混料小数点&#117 2024-01-18 14:58:57 +08:00
shijing 1212162a7e 批次号自动生成10车间 2024-01-18 14:26:22 +08:00
shijing f9d146240a 批次号自动生成 2024-01-18 14:22:05 +08:00
shijing 4e468abfd5 成品检验未完成 2024-01-18 14:13:07 +08:00
shijing 82c300d25c 首件检验 2024-01-17 17:48:46 +08:00
shijing 4fe31bb4c8 #116 2024-01-17 15:49:26 +08:00
shijing 6c73fda22e #113&6车间合格率小数位问题 2024-01-17 15:04:37 +08:00
shijing 10376bbbdf 获取检验项查询条件 2024-01-16 18:15:16 +08:00
shijing 7ef9042a0d #115 2024-01-16 17:47:43 +08:00
shijing 88fcbe4518 enp 2024-01-16 15:41:08 +08:00
shijing 5e1990c1a0 picture 2024-01-15 16:10:49 +08:00
shijing 2b148dbd91 mtask提交 2024-01-10 16:06:26 +08:00
shijing 6172ca5a80 交付参数更改 2024-01-10 14:25:12 +08:00
shijing 355159e49a 系统基本信息获取 2024-01-10 13:42:55 +08:00
shijing ac79990bbf 生产入库、采购入库记录检验 2024-01-10 09:44:54 +08:00
shijing 5109a85764 物料统计 2024-01-09 17:02:38 +08:00
shijing ef2612f2b7 销售统计查询条件更改 2024-01-09 09:35:10 +08:00
shijing 890d41dfa4 rukujianyan 2024-01-09 09:13:55 +08:00
shijing b9e1fe491c 销售统计 2024-01-05 17:54:27 +08:00
shijing 6472e9adcb 性能检验 2024-01-05 17:50:20 +08:00
shijing d741746c7f 生产统计数据调试 2024-01-04 19:09:24 +08:00
shijing 8e5fca3daf utask终止 2024-01-04 13:27:19 +08:00
shijing 4b3e3bf1a4 mlog中shift问题 2024-01-03 16:42:35 +08:00
shijing 060c15c314 混料去除四舍五入 2024-01-02 16:37:25 +08:00
shijing 4d122d9ad7 报错更改error Handler.js#109 2024-01-02 10:28:39 +08:00
shijing d4fb4ca081 rowclick冒泡 2023-12-28 17:55:24 +08:00
shijing 484618d842 BABYLON引用依赖本地化 2023-12-28 15:14:40 +08:00
shijing 6674e0e123 首页柱状图tip文案显示,进度条文案,以及GATT改动 2023-12-28 10:25:54 +08:00
shijing cabb27a41d 首页柱状图tip文案显示,进度条文案,以及GATT改动 2023-12-28 10:23:37 +08:00
caoqianming 0e06b13501 fix: 大屏getDeptDetail错误 2023-12-27 18:32:16 +08:00
shijing 417a583c7a #设备查询 2023-12-27 13:25:30 +08:00
shijing 4bd9b311cf #986车间日志填写的不合格原因错误 2023-12-27 09:35:26 +08:00
shijing 598e461d0d # 2023-12-26 18:01:45 +08:00
shijing de3e9e6532 #10410车间车间看板累计合格 2023-12-26 17:46:44 +08:00
shijing 3904743f49 #106车间今日任务显示utask 2023-12-26 16:21:56 +08:00
shijing 9ddc0f2555 车间名称改成门牌名称&不合格统计自动切换 2023-12-26 16:06:45 +08:00
shijing 5e056b56a7 #105车间看板合格率小数位保留整数 2023-12-26 14:26:14 +08:00
shijing 6e99ddf001 #108混料每桶kg可以有两位小数 2023-12-26 14:07:57 +08:00
shijing 12b25518c3 出入库记录mioitem新增时选项限制 2023-12-26 14:03:33 +08:00
shijing 95d2b1ca42 #9210车间配粉料数编辑隐去 2023-12-26 09:42:11 +08:00
shijing 80c2676551 #90到岗记录第二次新建回携带数据有显示问题 2023-12-26 09:31:43 +08:00
shijing e2b980a6d0 登录页logo大小调整 2023-12-26 09:20:53 +08:00
shijing 8c835fe715 数据大屏数据同步 2023-12-25 17:30:11 +08:00
shijing b11e2aaeb4 数据大屏数据同步 2023-12-25 16:57:55 +08:00
shijing d7d215fbd7 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-25 13:51:10 +08:00
shijing 64b6b7b3dc 6车间看板 2023-12-25 13:51:06 +08:00
caoqianming 02162eb83e fix: 车间库存显示count__gte 2023-12-25 13:09:19 +08:00
caoqianming eee2fb8372 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-25 12:48:10 +08:00
caoqianming e355fcedc7 fix: 6车间任务执行筛选及相关调整 2023-12-25 12:48:09 +08:00
shijing 495955c495 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-25 11:03:21 +08:00
shijing 5e26baf75f 6车间看板 2023-12-25 11:03:15 +08:00
caoqianming 29bd6ac6a2 fix: 进入某些出入库记录时不用做限制以及部分优化 2023-12-25 10:46:48 +08:00
caoqianming 611255a2d0 fix: 仓库查看按钮先去除 2023-12-25 10:08:35 +08:00
caoqianming 6a212139d2 fix: 10车间日志展示调宽 2023-12-25 09:18:53 +08:00
caoqianming b379532a9e 修改10车间显示物料全名及不合格数 2023-12-24 19:00:11 +08:00
caoqianming 99413a3fef fix: 切换账号时菜单不变化 2023-12-24 18:49:12 +08:00
caoqianming 7591e3c34c fix: 移动端logo和name从config获取 2023-12-24 18:35:27 +08:00
caoqianming a24eece353 feat: 去除不必要的超管判断 2023-12-23 17:31:25 +08:00
caoqianming e4658ea882 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-23 17:30:46 +08:00
caoqianming 795044c841 fix: worktask_form放出班次 2023-12-23 17:30:43 +08:00
shijing 0ecd78bf40 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2 2023-12-22 17:46:14 +08:00
shijing e8ae54f706 车间看板 2023-12-22 17:46:09 +08:00