Commit Graph

1839 Commits

Author SHA1 Message Date
zty cc20b723fa fix: edu.js train.vue 新增线下培训 2024-06-12 15:49:29 +08:00
shijing 6cb063e08b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-12 10:14:06 +08:00
shijing 99ac0298c7 index_enm_ly改动 2024-06-12 10:14:01 +08:00
zty d1844a2104 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web
fix: edu/train
2024-06-12 10:09:00 +08:00
zty 553b2c9980 fix: edu/train 2024-06-12 10:08:38 +08:00
caoqianming 34835be268 feat: 风险管理页面完成 2024-06-11 16:42:08 +08:00
caoqianming 90036784db fix: exam 进行中列表展示 2024-06-11 16:41:48 +08:00
caoqianming 8c5b926045 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-11 11:16:45 +08:00
caoqianming 69b7d92105 fix: base 字典页面刷新的bug 2024-06-11 11:16:42 +08:00
shijing 11ab06f162 fix:检验人查询条件修改 2024-06-11 10:15:17 +08:00
shijing 1b26a5d014 fix:检验人查询条件修改 2024-06-11 10:15:02 +08:00
caoqianming d2aba7d384 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-07 17:37:48 +08:00
caoqianming 4b71866a81 feat: 风险管控页面2 2024-06-07 17:37:45 +08:00
zty 1635262a18 fix: scTable getData err处理 2024-06-07 16:28:44 +08:00
caoqianming 6f0a3bf09b feat: base 升级了element-plus版本 2024-06-07 13:58:56 +08:00
caoqianming f2ce1e31da feat: 初步添加双控页面 2024-06-07 13:20:35 +08:00
caoqianming f392d49292 fix: question cate级联选择错误 2024-06-05 15:02:42 +08:00
caoqianming b4ffe30ca2 feat: edu页面基本完成 2024-06-05 08:37:48 +08:00
caoqianming 1e77723d6f feat: 添加Enum 2024-06-03 19:15:11 +08:00
caoqianming 239d8202ea feat: 回退至genTree 2024-06-03 18:03:03 +08:00
shijing 9538339d29 fix:table树数据处理 2024-06-03 17:28:21 +08:00
shijing e986d75419 fix:table树数据处理 2024-06-03 17:24:49 +08:00
caoqianming c69d47a98d feat: scTable 使用genTree 2024-06-03 14:35:01 +08:00
caoqianming 51e4d527d4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-03 14:08:29 +08:00
caoqianming 2a4a6e4924 feat: questioncat 页面 2024-06-03 14:08:26 +08:00
shijing caf5ddf0d1 fix:综合查询布局调整 2024-06-03 11:14:05 +08:00
shijing 4b55e431b5 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-03 10:14:28 +08:00
shijing a2b031ebf9 fix:综合查询模拟数据 2024-06-03 10:14:24 +08:00
caoqianming 210eef9e9d feat: 添加综合对比菜单及标识 2024-06-03 09:10:39 +08:00
shijing 14aac09779 fix:注释mock数据 2024-06-03 08:57:52 +08:00
shijing 7f257e1316 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-31 18:43:26 +08:00
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
caoqianming 2e04419846 fix: 修改权限标识 2024-05-31 17:07:56 +08:00
shijing 26a85861f8 fix:el-drawer缓存显示问题-其他出入库记录 2024-05-30 11:32:10 +08:00
shijing c7887fc5f2 fix:el-drawer缓存显示问题-订单管理 2024-05-30 10:35:33 +08:00
shijing 4843e7a6d1 fix:el-drawer缓存显示问题-采购计划 2024-05-30 09:53:17 +08:00
shijing c2034fc737 fix:el-drawer缓存显示问题-成品检验 2024-05-30 09:40:11 +08:00
shijing b768946738 fix:el-drawer缓存显示问题-库存 2024-05-30 09:23:00 +08:00
shijing 1e930db135 fix:el-drawer缓存显示问题 2024-05-29 10:27:41 +08:00
shijing 13eb12434f fix:库存统计查询更改 2024-05-28 14:56:44 +08:00
shijing 4dc039bef6 feat:添加综合查询 2024-05-24 17:45:21 +08:00
shijing 4643728a9f fix:查询字段更正 2024-05-24 17:44:47 +08:00
shijing 02475672d7 fix:库存统计只算仓库库存 2024-05-24 15:27:00 +08:00
shijing e01877ebd2 fix:coding#413采购和销售部分 2024-05-23 11:33:53 +08:00
shijing 86be993ba0 fix:coding#413生产执行模块 2024-05-23 09:56:52 +08:00
shijing f5d4fc1ced fix:router添加权限 2024-05-23 09:26:51 +08:00
shijing 4ab4bc7214 fix:coding#413库存模块 2024-05-22 17:36:06 +08:00
shijing 516319c53d fix:coding414不合格原因并集 2024-05-22 16:58:11 +08:00
shijing b28eb27d77 fix:#413---成品检验 2024-05-22 16:23:57 +08:00
shijing a777e06d4b fix:coding#412,弹窗标题和检验人员列表筛选 2024-05-22 14:58:07 +08:00
shijing ca0282595b fix:计算系数和交接班日志操作添加权限 2024-05-22 09:09:54 +08:00
shijing c4ff77c876 fix:计算系数和交接班日志操作添加权限 2024-05-22 09:09:37 +08:00
shijing aeb7259350 fix:添加两个电量报表里的table样式 2024-05-21 17:03:42 +08:00
shijing 6a18cae3bb fix:主要设备单位电耗变更(显示电耗报表里的所有设备) 2024-05-21 17:02:32 +08:00
shijing 7e50f935e3 fix:电耗报表动态合并 2024-05-21 13:41:35 +08:00
shijing b7fc2b8ded fix:菜单名称更改 2024-05-20 10:52:38 +08:00
shijing d866335c78 fix:电耗报表问题修改 2024-05-20 10:10:11 +08:00
shijing 348fac78f3 fix:电耗报表串行问题 2024-05-20 09:37:21 +08:00
shijing aa19ef2788 fix:回转窑更改计算测点值 2024-05-17 14:57:11 +08:00
shijing 0015e2c96d fix:回转窑更改计算测点值 2024-05-17 14:48:51 +08:00
shijing 08130abf6a fix:生产小时报告去掉常为0的项 2024-05-17 10:47:39 +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 771bcc2add fix:时间与数据错位 2024-05-15 15:48:18 +08:00
shijing 6999a172cd fix:主要设备单位产品电耗图标时间搜索 2024-05-15 14:33:49 +08:00
shijing bad6efb816 fix:tku中的power更改 2024-05-15 11:29:36 +08:00
shijing 245c2b6155 fix:power添加筛选条件 2024-05-15 11:17:24 +08:00
shijing b73f62b4d2 fix:报表合计行 2024-05-15 09:51:11 +08:00
shijing 224d4e37a8 fix:生产报告和主要设备单位电耗添加radios并居中 2024-05-14 15:54:09 +08:00
shijing ff62c9e636 fix:更改路由名称 2024-05-14 15:02:58 +08:00
shijing be3d63e526 fix:凌源生产报告统计图显示改动(添加radio) 2024-05-14 13:43:07 +08:00
shijing 1667f02408 fix:电量报表查询条件改动 2024-05-14 13:41:55 +08:00
shijing 2f0401534d fix:日志信息测点录入 2024-05-14 09:42:40 +08:00
shijing 85eb08dfb1 fix:单位产品电耗数据更新 2024-05-13 17:21:15 +08:00
shijing c55f516019 fix:生产报告小时数据查询条件 2024-05-13 11:01:45 +08:00
shijing 2e257bdcb1 feat:测点原始记录添加信号状态 2024-05-13 10:35:52 +08:00
shijing 0c1fb4b563 fix:电量消耗统计表 2024-05-13 09:36:51 +08:00
caoqianming 9e263abd38 feat: 增加enpfieldEnum 2024-05-11 15:51:17 +08:00
caoqianming d332a78ee2 feat: mpoint_form设备选择等 2024-05-11 15:49:22 +08:00
shijing c25c237cd6 fix:日志测点录入 2024-05-11 12:47:35 +08:00
shijing 3827d3ce86 fix:测点原始记录改动查询条件-半个小时 2024-05-11 10:54:00 +08:00
shijing 5ca9fb5332 fix:引入mpointstat删除接口 2024-05-11 10:35:53 +08:00
shijing 1a457fe49d feat:余热发电生产报告添加参数&生产报告完成率小数点保留两位 2024-05-11 10:34:56 +08:00
shijing 610c4ae52c fix:mpoint更改查询条件 2024-05-11 10:33:01 +08:00
shijing 3a5185ed58 fix:物料价格和工段成本添加权限 2024-05-10 15:06:23 +08:00
shijing c16743f9a5 fix:coding#410 2024-05-10 13:36:52 +08:00
shijing 5302c5a5fd fix:coding#411 2024-05-10 13:15:16 +08:00
shijing 1e20725bb7 fix:目标设置 2024-05-10 13:13:10 +08:00
shijing 3e334416a7 fix:全场能源电量消耗报表 2024-05-10 11:35:52 +08:00
shijing 5f727aea27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-10 09:10:50 +08:00
shijing 9da3a27fdb fix:coding#408 2024-05-10 09:10:48 +08:00
caoqianming 36000a2b1f fix: 熟料料耗系数 2024-05-09 17:37:22 +08:00
shijing 1ba5401b05 fix:光子大屏中引入congfig 2024-05-09 16:26:40 +08:00
shijing fb67075e19 fix:mopint筛选问题 2024-05-09 16:26:05 +08:00
shijing ce9fdf52b4 fix:日志详情添加停机时间,修正新增编辑的bug 2024-05-09 16:25:14 +08:00
shijing 979ad5870d fix:计算系数 2024-05-09 16:02:22 +08:00
shijing 77aa24c19e feat:mpoint新增测点原始记录 2024-05-09 13:46:23 +08:00
shijing 330a87bf7e fix:enm添加测点采集数据 2024-05-09 13:44:30 +08:00
shijing 0457605c07 fix:首页控制台 2024-05-09 09:41:51 +08:00
shijing fba62dc2c0 fix:更改计算系数 2024-05-08 16:11:45 +08:00
shijing b32511f35e fix:layout 2024-05-08 15:34:39 +08:00
shijing 054829996e fix:全厂能源电量消耗报表 2024-05-08 14:08:18 +08:00
caoqianming 4b52570a4d feat: mpoint_form表格结构调整 2024-05-08 13:04:28 +08:00
caoqianming 8911a27b6d feat: 移除mgroups_allocate字段2 2024-05-08 13:00:17 +08:00
caoqianming 218f35dd60 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-08 12:55:09 +08:00
caoqianming 02b8364a51 feat: 移除mgroups_allocate字段 2024-05-08 12:55:07 +08:00
shijing a788587df4 feat:凌源的能管大屏基础版 2024-05-07 15:59:05 +08:00
shijing 248b15440e fix:去掉重复的路由 2024-05-07 15:58:17 +08:00
shijing e166bd7950 fix:路由处理(父级严格大于子级) 2024-05-07 11:25:58 +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 44f3e3fc68 fix:设备分类增删改 2024-05-06 16:27:52 +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 72cab70f23 fix:em中计量物料取消类型筛选 2024-05-06 11:20:42 +08:00
shijing 9e4ac65994 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-05-06 10:02:40 +08:00
shijing b4a6e3d811 fix:生产报告report中图标颜色及数据对应 2024-05-06 10:02:37 +08:00
caoqianming baa46135fb feat: mpoint form添加关联环保字段2 2024-05-06 09:46:42 +08:00
caoqianming 97dd1431ea feat: mpoint form添加关联环保字段 2024-05-06 09:46:33 +08:00
caoqianming 52762117cc feat: mpoint form增加影响测点编号 2024-05-06 09:19:39 +08:00
shijing b881449d11 fix:生产报告中小时数据的获取更正 2024-04-30 16:52:47 +08:00
shijing 0135367fea fix:石灰石破碎中生产报告不要小时;余热发电中生产报告的产量单位更正 2024-04-30 16:16:25 +08:00
shijing 8b8ff3b48b fix:数据统计图数据日期对应修正 2024-04-30 13:52:00 +08:00
shijing bd3ae583fc fix:原料磨生产报告修改 2024-04-30 11:04:43 +08:00
shijing aee0427138 fix:水泥包装mgroup根据名称获取 2024-04-29 16:30:32 +08:00
shijing 74e65ba199 fix:石灰石破碎mgroup根据名称获取 2024-04-29 16:18:45 +08:00
shijing 4e8a3d486a fix:水泥磨mgroup根据名称获取 2024-04-29 16:11:57 +08:00
shijing 63737587e1 fix:物料添加时增加排序 2024-04-29 15:32:02 +08:00
shijing 25e2a1e9d6 fix:enm_kiln回转窑mgroup根据名称获取id 2024-04-29 15:10:39 +08:00
shijing d392d7f012 fix:enm_rm原料磨mgroup 根据名称获取id 2024-04-29 14:29:25 +08:00
shijing 4188ad2a8b fix:余热发电mgroup根据name获取 2024-04-29 13:49:37 +08:00
shijing 93f058997a fix:电石渣mgroup根据名称通过接口获取id 2024-04-29 11:12:25 +08:00
shijing 6e7e535cfc Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-28 17:05:27 +08:00
shijing 5b73a45e20 fix:日志异常改动,全场电量统计折线图 2024-04-28 17:05:25 +08:00
caoqianming e8bb37d87f feat: mpoint_form增加字段 2024-04-28 17:02:42 +08:00
caoqianming 12cb9a6bfb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-28 14:14:14 +08:00
caoqianming efdbc4fd94 feat: mpoint界面修改 2024-04-28 14:14:13 +08:00
shijing de77f4eaee Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-26 17:03:35 +08:00
shijing 0bff96af1c fix:异常添加 2024-04-26 17:03:00 +08:00
caoqianming 0460e2636f fix: enm mgroup 不预先筛选 2024-04-26 12:20:50 +08:00
shijing dbd019d0ef fix:煤磨mgroup接口获取 2024-04-26 10:41:11 +08:00
shijing ffc08a38de fix:煤磨mgroup通过名称获取 2024-04-26 10:28:08 +08:00
shijing 939129b5df fix:删除多余文件 2024-04-26 10:03:28 +08:00
caoqianming 0b3531131c fix: enum下拉不显示的bug需parseInt 2024-04-25 00:23:04 +08:00
caoqianming 4b8347185a fix: indicate_mgroup_running清空时设为null 2024-04-25 00:22:34 +08:00
caoqianming 3f331eec9f fix: 展示组合件信息的bug 2024-04-25 00:11:33 +08:00
shijing 838e71ad98 fix:更换凌源模型并适当调整 2024-04-24 16:52:20 +08:00
shijing f6c3cf410e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 16:04:41 +08:00
shijing 2312537af2 fix:设备历史检测图y隐藏axisLabel 2024-04-24 16:04:36 +08:00
caoqianming 6be5494f1a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 15:50:31 +08:00
caoqianming d051748cf0 feat: mgroup_form 排班规则可clear 2024-04-24 15:50:30 +08:00
shijing 241f14c324 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 15:42:46 +08:00
shijing 6fb1ff7b17 fix:采购入库检验放开撤回 2024-04-24 15:42:43 +08:00
caoqianming 6c0703eac1 feat: 完善productTypeEnum 2024-04-24 15:19:54 +08:00
caoqianming 12eff830f3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 15:08:15 +08:00
caoqianming 9ffdca6f68 feat: mpoint form添加can_manual 2024-04-24 15:08:14 +08:00
shijing 2cd956e123 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 14:31:16 +08:00
shijing ab4b0c030d fix:入库检验数据回显问题 2024-04-24 14:31:12 +08:00
caoqianming c827b50d62 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-24 09:53:25 +08:00
caoqianming 5300b425d7 feat: 设备管理页面优化 2024-04-24 09:53:24 +08:00
shijing 51c79f1d6f fix:table滚动条和设备分类选择框颜色 2024-04-23 16:05:25 +08:00
caoqianming 4cc204c594 feat: 设备管理添加一些字段及部分调整 2024-04-23 13:43:16 +08:00
caoqianming 841f2a27f8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-23 13:27:12 +08:00
caoqianming ebe61dfde4 feat: 相关方证书删除后刷新 2024-04-23 13:27:11 +08:00
shijing e02c11634d fix:光子添加库存检验撤回 2024-04-22 15:36:06 +08:00
caoqianming 02b03770c3 fix: 工段表单及相关文件表述修改 2024-04-18 14:46:18 +08:00
caoqianming 9286ad0d73 fix: 设备分类显示调整 2024-04-18 14:45:39 +08:00
caoqianming 36ebdd00f6 feat: enp调整viewer环境亮度 2024-04-17 15:34:21 +08:00
caoqianming dfe4f1d1c3 fix: 打包时使用服务器host获取厂区模型 2024-04-17 15:04:14 +08:00
caoqianming e1d846cd2d fix: 无用文件 2024-04-17 14:38:13 +08:00
caoqianming d2b82c290a fix: babylonjs加载material的引入包错误 2024-04-17 14:37:53 +08:00
caoqianming aa2a4c136c fix: enp 设备状态查询的优化 2024-04-17 11:02:41 +08:00
caoqianming 2ce50e7bac Revert "fix:排放系统登陆页面更改样式"
This reverts commit 89f05ee8e8.
2024-04-16 16:54:37 +08:00
caoqianming 373b461549 feat: mioitem成品库展示组合件信息 2024-04-13 11:29:48 +08:00
caoqianming fdd58501f2 fix: 7车间和10车间大屏修改 2024-04-13 10:46:04 +08:00
caoqianming e2eb647351 fix: 仓库执行人从库管中获取 2024-04-12 16:45:30 +08:00
shijing 20881c4e4e fix:格式化某一月 2024-04-12 15:21:13 +08:00
shijing 89f05ee8e8 fix:排放系统登陆页面更改样式 2024-04-12 14:37:16 +08:00
shijing 16bf29cd4f feat:凌源电量消耗报表 2024-04-12 13:30:45 +08:00
shijing ad3f90c293 fix:日志提交时班组默认 2024-04-11 17:31:56 +08:00
shijing 50ec90045a fix:mioitem_check 2024-04-11 17:03:04 +08:00
shijing d07bdb77d8 fix:更改监控设备端口号 2024-04-11 14:49:43 +08:00
shijing 1c4eb04604 fifix:更新jquery版本 2024-04-11 14:49:10 +08:00
shijing bbff16431d fix:添加material中的cate选项 2024-04-11 14:48:38 +08:00
shijing 43ecf55818 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-10 17:20:52 +08:00
shijing e31a3b527a feat:凌源新增原料磨、回转窑、煤磨模块 2024-04-10 17:20:47 +08:00
caoqianming cafe762fd4 feat: 添加mpoint相应功能页面 2024-04-10 10:40:32 +08:00
caoqianming c16c5fcd17 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-10 10:22:38 +08:00
caoqianming fcc4ac5aa4 feat: base 添加了valTypeEnum/boolEnum 2024-04-10 10:22:36 +08:00
shijing 95b7c45b18 fix:退火检验不合格数修正 2024-04-09 17:37:20 +08:00
shijing 3d53992bfb Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-04-09 16:39:15 +08:00
shijing 4cbf1c4c9f fix:成品检验详情列表 2024-04-09 16:39:12 +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
caoqianming 43e1dd40c3 feat: base scTable增加选择数量显示 2024-04-09 15:44:16 +08:00
shijing eba2759470 feat:新曾凌源原料磨模块 2024-04-09 15:43:49 +08:00