Commit Graph

  • 553d19db89 修改bug ‘937886381’ 2023-12-19 16:32:12 +08:00
  • f0536c9cf9 Merge pull request 'projects/mesxc-lb' (#153) from projects/mesxc-lb into projects/mesxc-test g7hoo 2023-12-19 14:10:49 +08:00
  • c91be221dc Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2023-12-19 14:10:16 +08:00
  • 069b28eeae update login lb 2023-12-19 14:09:37 +08:00
  • 84cc6dfde7 Merge pull request 'projects/mesxc-zjl' (#152) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-19 10:15:53 +08:00
  • 1d61f056b8 merge test juzi 2023-12-19 10:15:15 +08:00
  • eda63ee8c8 Merge pull request 'projects/mesxc-lb' (#151) from projects/mesxc-lb into projects/mesxc-test g7hoo 2023-12-19 09:55:21 +08:00
  • 78e8401029 Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2023-12-19 09:54:47 +08:00
  • 5ad93105b3 update login lb 2023-12-19 09:31:38 +08:00
  • 97612a13ac Merge pull request 'projects/mesxc-lb' (#150) from projects/mesxc-lb into projects/mesxc-test g7hoo 2023-12-19 09:09:59 +08:00
  • d06756c6ff Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2023-12-19 09:07:55 +08:00
  • 5ac17b15e1 update merge lb 2023-12-19 09:07:19 +08:00
  • 4e064e4b01 Merge pull request 'projects/mesxc-lb' (#149) from projects/mesxc-lb into projects/mesxc-test g7hoo 2023-12-19 09:02:24 +08:00
  • f280a92145 merge test lb 2023-12-19 09:01:13 +08:00
  • aaa131cb1f update 巡检记录 lb 2023-12-18 17:00:47 +08:00
  • f6af441030 update 巡检配置 lb 2023-12-18 16:32:16 +08:00
  • cb9132abc1 update lb 2023-12-18 15:47:54 +08:00
  • 5886875770 update 维修 lb 2023-12-18 15:39:18 +08:00
  • ccb2808e60 logo juzi 2023-12-18 15:12:17 +08:00
  • a766318e20 Merge pull request '成本bug' (#148) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2023-12-18 14:34:04 +08:00
  • 41cef952ac Merge branch 'projects/mesxc-test' into projects/mesxc-zwq 朱文强 2023-12-18 14:33:59 +08:00
  • ef4b31fe2b 成本bug zwq 2023-12-18 14:33:31 +08:00
  • c8219bd7ee Merge pull request '修改成本bug' (#147) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2023-12-18 14:26:46 +08:00
  • 20f5a0d4c7 修改成本bug zwq 2023-12-18 14:26:23 +08:00
  • fd4b0088dc update 特殊设备保养 lb 2023-12-18 14:25:08 +08:00
  • e039a3992d Merge pull request 'projects/mesxc-zhp' (#146) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2023-12-15 16:29:57 +08:00
  • c8d55ff625 解决冲突 ‘937886381’ 2023-12-15 16:28:37 +08:00
  • 83fc835c51 质量管理 ‘937886381’ 2023-12-15 16:27:30 +08:00
  • 165a833088 update 保养记录 lb 2023-12-14 16:58:33 +08:00
  • 8d5623bb24 '1' gtz 2023-12-14 16:07:21 +08:00
  • 4fa49c46ff Merge pull request 'projects/mesxc-zjl' (#145) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-14 15:55:28 +08:00
  • ae251fc428 merge test juzi 2023-12-14 15:54:46 +08:00
  • a2c61b86ca Merge pull request 'projects/mesxc-dy' (#144) from projects/mesxc-dy into projects/mesxc-test 高天泽 2023-12-14 15:52:47 +08:00
  • 503e3442a0 merge test juzi 2023-12-14 15:51:26 +08:00
  • 69a65b32ea 12.14测试bug juzi 2023-12-14 15:48:35 +08:00
  • 5ac0782b36 update 设备保养监控 lb 2023-12-14 15:33:38 +08:00
  • 3aec5ee86c merge helloDy 2023-12-14 14:03:53 +08:00
  • 79274aa8c8 定制化报表,基础核心 helloDy 2023-12-14 14:01:19 +08:00
  • 29ea06e5be Merge pull request 'projects/mesxc-zhp' (#143) from projects/mesxc-zhp into projects/mesxc-test 高天泽 2023-12-13 17:08:40 +08:00
  • f5bb5f27b4 修改 ‘937886381’ 2023-12-13 16:55:39 +08:00
  • fbe8e5c023 新增报表 ‘937886381’ 2023-12-13 16:50:55 +08:00
  • 46dd33cb05 update 特种设备保养 lb 2023-12-13 10:57:02 +08:00
  • 68898ea67f '1' gtz 2023-12-13 09:49:02 +08:00
  • 1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test gtz 2023-12-13 09:48:44 +08:00
  • 0f4bddc6d1 Merge pull request '更新成本和仓库' (#141) from projects/mesxc-zwq into projects/mesxc-test 朱文强 2023-12-13 09:19:00 +08:00
  • 91d269e1ce 更新成本和仓库 zwq 2023-12-13 09:18:36 +08:00
  • 4e26d49ff5 Merge pull request '首页' (#140) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-13 09:16:28 +08:00
  • 63b19d84e4 首页 juzi 2023-12-13 09:12:52 +08:00
  • 5f47cb131f add 添加消防设备 lb 2023-12-12 16:50:18 +08:00
  • ea21f3d4bc add 安全设备,特种设备 lb 2023-12-12 16:27:37 +08:00
  • bdda6c9985 add 特殊设备 lb 2023-12-12 13:57:02 +08:00
  • ae83da6eb9 almost done lb 2023-12-12 11:11:10 +08:00
  • 6c7390f61e Merge pull request 'projects/mesxc-zjl' (#139) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-12 10:57:12 +08:00
  • 1661615af4 环保 juzi 2023-12-12 10:56:25 +08:00
  • b62d0e4096 add israchart lb 2023-12-12 10:53:00 +08:00
  • 1c123fa22d Merge branch 'projects/mesxc-test' into projects/mesxc-lb lb 2023-12-11 10:22:51 +08:00
  • 6b3619514d update 驾驶舱 lb 2023-12-11 10:21:45 +08:00
  • dee9f7ce8b update lb 2023-12-11 09:47:58 +08:00
  • b4d2b69004 update lb 2023-12-11 09:11:51 +08:00
  • 8fdaa3e968 环保管理 juzi 2023-12-08 17:03:01 +08:00
  • 54953f7bc6 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test gtz 2023-12-07 10:06:18 +08:00
  • f99e979d14 '1' gtz 2023-12-07 10:06:14 +08:00
  • 4f64c255af update lb 2023-12-06 15:29:11 +08:00
  • cc0d3d8b75 add 烟气处理 lb 2023-12-06 10:38:56 +08:00
  • f5233001e7 add Energy&Header lb 2023-12-06 10:18:12 +08:00
  • f2e38b5e67 Merge pull request 'projects/mesxc-zjl' (#138) from projects/mesxc-zjl into projects/mesxc-test juzi 2023-12-06 10:09:07 +08:00
  • fe0c84bc3a 能源&bug juzi 2023-12-06 10:06:26 +08:00
  • 7cb88fab88 add 用量统计&风机频率 lb 2023-12-06 09:47:06 +08:00
  • e7263302a7 update line lb 2023-12-05 17:00:55 +08:00
  • b26e1d5a7f update switcher lb 2023-12-05 15:44:22 +08:00
  • 86bdabf358 update lb 2023-12-05 15:24:20 +08:00
  • 4069e71477 update kiln databoard lb 2023-12-05 15:08:07 +08:00
  • 0a53bcb57e merge test juzi 2023-12-05 14:40:02 +08:00
  • 1ce61f13b7 原模块修改能源 juzi 2023-12-05 14:30:32 +08:00
  • 6c661bedd3 add databoard lb 2023-12-04 17:00:40 +08:00
  • 4e48eae2a7 修改ui ‘937886381’ 2023-12-04 14:14:34 +08:00
  • a2ed9ed54b fix 添加参数 lb 2023-12-04 09:10:56 +08:00
  • 49d002142f Merge pull request 'projects/mesxc-dy' (#137) from projects/mesxc-dy into projects/mesxc-test 高天泽 2023-12-01 15:34:28 +08:00
  • 8399081a6f Merge branch 'projects/mesxc-test' into projects/mesxc-dy helloDy 2023-12-01 15:27:02 +08:00
  • cc6c4772d3 ui helloDy 2023-12-01 15:25:46 +08:00
  • ba7dad7fce Merge pull request 'projects/mesxc-dy' (#136) from projects/mesxc-dy into projects/mesxc-test 高天泽 2023-11-30 16:01:21 +08:00
  • 8e7e31f918 Merge branch 'projects/mes-dy' into projects/mesxc-dy helloDy 2023-11-30 15:53:40 +08:00
  • 5e4df4d849 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-30 15:06:20 +08:00
  • 1d3372ed69 ui helloDy 2023-11-30 15:04:17 +08:00
  • 86f246eb94 Merge pull request 'projects/mes-lb' (#134) from projects/mes-lb into projects/mes-test g7hoo 2023-11-30 14:24:09 +08:00
  • e2a16332be Merge branch 'projects/mes-test' into projects/mes-lb lb 2023-11-30 14:22:56 +08:00
  • 69b6942f35 fix bugs lb 2023-11-30 14:19:13 +08:00
  • e28cd67e20 Merge pull request 'projects/mes-test' (#133) from projects/mes-test into projects/mes projects/mes 高天泽 2023-11-30 09:11:32 +08:00
  • be430ebbff Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test projects/mesxc-gtz projects/mesxc gtz 2023-11-30 09:08:59 +08:00
  • eb063779b4 Merge pull request 'projects/mes-dy' (#129) from projects/mes-dy into projects/mes-test 高天泽 2023-11-30 08:58:32 +08:00
  • a2672c1742 Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-30 08:57:43 +08:00
  • 4e97989ede Merge pull request 'projects/mes-zhp' (#131) from projects/mes-zhp into projects/mes-test 高天泽 2023-11-30 08:54:28 +08:00
  • 67200710c9 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-30 08:52:23 +08:00
  • 7e2b75aaa5 Merge pull request 'projects/mes-zjl' (#130) from projects/mes-zjl into projects/mes-test juzi 2023-11-29 17:00:45 +08:00
  • 8ad9b9d717 merge test juzi 2023-11-29 17:00:00 +08:00
  • 3bf2757e42 班组跳转 juzi 2023-11-29 16:58:08 +08:00
  • 2267444b4a Merge branch 'projects/mes-test' into projects/mes-dy helloDy 2023-11-29 16:54:30 +08:00
  • fa5a303c08 bug ui helloDy 2023-11-29 16:53:51 +08:00
  • 37586a31c5 Merge branch 'projects/mes-test' into projects/mes-zhp ‘937886381’ 2023-11-29 15:06:55 +08:00
  • 40b023cd8d 修改bug ‘937886381’ 2023-11-29 15:06:27 +08:00