Commit Graph

1595 Commits

Author SHA1 Message Date
caoqianming c5185965b5 fix: 添加状态展示 2024-03-20 14:37:25 +08:00
caoqianming bccdaa16ca Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-20 13:10:17 +08:00
caoqianming 7cd9da49be feat: dataset名称列加长 2024-03-20 13:10:15 +08:00
shijing 69ed9b9d83 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-20 10:12:40 +08:00
shijing be9af90e12 甘特图数量显示问题 2024-03-20 10:12:33 +08:00
caoqianming af0f718565 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 17:35:32 +08:00
caoqianming 8dc5827c15 fix: dataset删除功能 2024-03-19 17:35:31 +08:00
shijing c0def9482e 混料统计导出 2024-03-19 17:32:52 +08:00
shijing b7cb025304 统计分析导出 2024-03-19 17:15:07 +08:00
shijing 5ea16bde8a 统计分析导出 2024-03-19 17:13:03 +08:00
caoqianming 51a6b6c10a feat: pass_num 添加任务数 2024-03-19 16:56:00 +08:00
caoqianming a828acbed5 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 15:10:36 +08:00
caoqianming e329cf86f0 feat: 混料统计页面 2024-03-19 15:10:34 +08:00
shijing b74e71b659 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 14:10:08 +08:00
shijing a4d490ec5b #79过程检验 2024-03-19 14:10:02 +08:00
caoqianming 7d69285bf0 feat: 绩效统计增加字段 2024-03-19 14:08:31 +08:00
caoqianming 07adf80056 feat: 绩效统计返回更多字段 2024-03-19 14:07:07 +08:00
caoqianming 2f122360c1 feat: 车间生产合格数返回更多字段 2024-03-19 14:06:24 +08:00
caoqianming 789f8da088 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-19 11:32:50 +08:00
caoqianming f397b53c0a feat: dataset 增加字段 2024-03-19 11:32:48 +08:00
shijing 8f20e298ca coding#140 2024-03-19 10:14:45 +08:00
shijing 9fa1e63438 地图位置调整 2024-03-18 11:43:23 +08:00
shijing 2b4ccc1e5e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-15 17:47:08 +08:00
shijing 9eb4058212 fix:会议 2024-03-15 17:47:03 +08:00
caoqianming c3898769e5 feat: base 添加celery和redis的状态信息 2024-03-15 17:00:56 +08:00
shijing b0a0529abd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-14 08:43:06 +08:00
shijing dc1130a5ee feat:大屏设备小类选择展示隐藏 2024-03-14 08:42:56 +08:00
caoqianming ca925eb0a6 fix: 环境和台账相关页面调整 2024-03-13 15:30:10 +08:00
caoqianming a2feea0b54 fix: base 退出时用location.reload重置路由 2024-03-13 14:17:00 +08:00
caoqianming 8311cb7d1b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-13 11:19:36 +08:00
caoqianming 4c401c805a fix: 无组织页面调整 2024-03-13 11:19:35 +08:00
shijing 2aae784b2b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-13 10:59:38 +08:00
shijing 3ffe89512e feat:大屏设备图标显及点击查看示(简易版) 2024-03-13 10:59:19 +08:00
caoqianming 6b9c0064c9 fix: 调整有组织排放界面 2024-03-13 09:52:03 +08:00
caoqianming 6fa74980ca feat: 增加enum.js 2024-03-13 09:51:37 +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
caoqianming 50148b4e3a fix: base 菜单删除进行刷新 2024-03-12 08:54:29 +08:00
shijing 994c625b0d 设备分类 2024-03-12 08:50:48 +08:00
shijing 47b34cf175 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web 2024-03-11 16:32:10 +08:00
shijing e19b401ae5 mars3d 2024-03-11 16:32:01 +08:00
caoqianming affb89e964 fix: worktask 获取退火炉列表修改完成 2024-03-11 15:57:00 +08:00
caoqianming 1a1aa3ebcb feat: 从localstorage中获取token 2024-03-11 13:34:32 +08:00
caoqianming 767e2d8048 feat: base 退出后可重定向 2024-03-11 13:34:09 +08:00
caoqianming efe3bb7777 feat: base 退出后登录可重定向rediect 2024-03-11 13:33:00 +08:00
caoqianming 052821526e feat: base 完善无感刷新 2024-03-11 13:32:12 +08:00
caoqianming ebf6e48d65 fix: worktask 获取退火炉列表修改2 2024-03-11 09:35:18 +08:00
caoqianming ec0b455d30 fix: worktask 获取退火炉列表修改 2024-03-11 09:19:44 +08:00
caoqianming c50cd6656d Merge branch 'master' of https://gitee.com/lolicode/scui 2024-03-11 08:49:19 +08:00
caoqianming d6430b17a6 feat: worktask 获取退火炉列表修改 2024-03-11 08:46:59 +08:00