Commit Graph

1792 Commits

Author SHA1 Message Date
caoqianming 97141ac3b5 fix: 更新babylonjs版本号 2024-06-18 16:43:21 +08:00
caoqianming 487ad11b07 feat: 大屏3dpanel优化样式2 2024-06-18 16:25:33 +08:00
caoqianming b6c8cd2259 feat: 大屏3dpanel优化样式 2024-06-18 10:54:50 +08:00
caoqianming 1bf7d47aba Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-17 14:39:19 +08:00
caoqianming fbc5573703 fix: 修改get_host_url 2024-06-17 14:35:32 +08:00
zty 54524ce17e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-12 15:49:32 +08:00
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 8294f8df5b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-06-07 13:20:38 +08:00
caoqianming f2ce1e31da feat: 初步添加双控页面 2024-06-07 13:20:35 +08:00
zty e8a6e17c70 fix:修改node版本过高的bug 2024-06-05 16:37:57 +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