Commit Graph

922 Commits

Author SHA1 Message Date
lb
5ac0782b36 update 设备保养监控 2023-12-14 15:33:38 +08:00
helloDy
3aec5ee86c merge 2023-12-14 14:03:53 +08:00
helloDy
79274aa8c8 定制化报表,基础核心 2023-12-14 14:01:19 +08:00
29ea06e5be Merge pull request 'projects/mesxc-zhp' (#143) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #143
2023-12-13 17:08:40 +08:00
‘937886381’
f5bb5f27b4 修改 2023-12-13 16:55:39 +08:00
‘937886381’
fbe8e5c023 新增报表 2023-12-13 16:50:55 +08:00
lb
46dd33cb05 update 特种设备保养 2023-12-13 10:57:02 +08:00
gtz
68898ea67f '1' 2023-12-13 09:49:02 +08:00
gtz
1299d72404 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-13 09:48:44 +08:00
0f4bddc6d1 Merge pull request '更新成本和仓库' (#141) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #141
2023-12-13 09:19:00 +08:00
zwq
91d269e1ce 更新成本和仓库 2023-12-13 09:18:36 +08:00
4e26d49ff5 Merge pull request '首页' (#140) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #140
2023-12-13 09:16:28 +08:00
63b19d84e4 首页 2023-12-13 09:12:52 +08:00
lb
5f47cb131f add 添加消防设备 2023-12-12 16:50:18 +08:00
lb
ea21f3d4bc add 安全设备,特种设备 2023-12-12 16:27:37 +08:00
lb
bdda6c9985 add 特殊设备 2023-12-12 13:57:02 +08:00
lb
ae83da6eb9 almost done 2023-12-12 11:29:56 +08:00
6c7390f61e Merge pull request 'projects/mesxc-zjl' (#139) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #139
2023-12-12 10:57:12 +08:00
1661615af4 环保 2023-12-12 10:56:25 +08:00
lb
b62d0e4096 add israchart 2023-12-12 10:53:00 +08:00
lb
1c123fa22d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2023-12-11 10:22:51 +08:00
lb
6b3619514d update 驾驶舱 2023-12-11 10:21:45 +08:00
lb
dee9f7ce8b update 2023-12-11 09:47:58 +08:00
lb
b4d2b69004 update 2023-12-11 09:11:51 +08:00
8fdaa3e968 环保管理 2023-12-08 17:03:01 +08:00
gtz
54953f7bc6 Merge branch 'projects/mesxc-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mesxc-test 2023-12-07 10:06:18 +08:00
gtz
f99e979d14 '1' 2023-12-07 10:06:14 +08:00
lb
4f64c255af update 2023-12-06 15:29:11 +08:00
lb
cc0d3d8b75 add 烟气处理 2023-12-06 10:38:56 +08:00
lb
f5233001e7 add Energy&Header 2023-12-06 10:18:12 +08:00
f2e38b5e67 Merge pull request 'projects/mesxc-zjl' (#138) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #138
2023-12-06 10:09:07 +08:00
fe0c84bc3a 能源&bug 2023-12-06 10:06:26 +08:00
lb
7cb88fab88 add 用量统计&风机频率 2023-12-06 09:49:38 +08:00
lb
e7263302a7 update line 2023-12-05 17:00:55 +08:00
lb
b26e1d5a7f update switcher 2023-12-05 15:44:22 +08:00
lb
86bdabf358 update 2023-12-05 15:24:20 +08:00
lb
4069e71477 update kiln databoard 2023-12-05 15:08:07 +08:00
0a53bcb57e merge test 2023-12-05 14:40:02 +08:00
1ce61f13b7 原模块修改能源 2023-12-05 14:30:32 +08:00
lb
6c661bedd3 add databoard 2023-12-04 17:00:40 +08:00
‘937886381’
4e48eae2a7 修改ui 2023-12-04 14:14:34 +08:00
lb
a2ed9ed54b fix 添加参数 2023-12-04 09:10:56 +08:00
49d002142f Merge pull request 'projects/mesxc-dy' (#137) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #137
2023-12-01 15:34:28 +08:00
helloDy
8399081a6f Merge branch 'projects/mesxc-test' into projects/mesxc-dy 2023-12-01 15:27:02 +08:00
helloDy
cc6c4772d3 ui 2023-12-01 15:25:46 +08:00
ba7dad7fce Merge pull request 'projects/mesxc-dy' (#136) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #136
2023-11-30 16:01:21 +08:00
helloDy
8e7e31f918 Merge branch 'projects/mes-dy' into projects/mesxc-dy 2023-11-30 15:53:40 +08:00
helloDy
5e4df4d849 Merge branch 'projects/mes-test' into projects/mes-dy 2023-11-30 15:06:20 +08:00
helloDy
1d3372ed69 ui 2023-11-30 15:04:17 +08:00
86f246eb94 Merge pull request 'projects/mes-lb' (#134) from projects/mes-lb into projects/mes-test
Reviewed-on: #134
2023-11-30 14:24:09 +08:00