‘937886381’
|
b6f801c6ce
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2023-12-29 09:00:46 +08:00 |
|
‘937886381’
|
9e2da2ddc2
|
修改
|
2023-12-29 09:00:00 +08:00 |
|
|
|
e72da57a54
|
Merge pull request 'projects/mesxc-zjl' (#160) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #160
|
2023-12-28 16:19:32 +08:00 |
|
|
|
9690ab4f70
|
merge test
|
2023-12-28 16:18:07 +08:00 |
|
|
|
41e1f46cfc
|
1
|
2023-12-28 16:16:25 +08:00 |
|
|
|
a6127657cc
|
Merge pull request 'projects/mesxc-dy' (#159) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #159
|
2023-12-28 09:04:52 +08:00 |
|
helloDy
|
60a6e86a6b
|
Merge branch 'projects/mesxc-test' into projects/mesxc-dy
|
2023-12-28 09:03:10 +08:00 |
|
helloDy
|
a8ca7c37f2
|
工单详情
|
2023-12-28 09:02:31 +08:00 |
|
|
|
0bb434bc22
|
Merge pull request 'projects/mesxc-dy' (#158) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #158
|
2023-12-22 17:17:58 +08:00 |
|
helloDy
|
f617597f38
|
Merge branch 'projects/mesxc-test' into projects/mesxc-dy
|
2023-12-22 16:41:28 +08:00 |
|
helloDy
|
df7bc08f71
|
工单详情ui
|
2023-12-22 16:35:03 +08:00 |
|
|
|
d65f5f9bca
|
Merge pull request 'projects/mesxc-zjl' (#157) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #157
|
2023-12-20 14:23:37 +08:00 |
|
|
|
4c99d39f8a
|
修改
|
2023-12-20 14:22:30 +08:00 |
|
|
|
220ed16c64
|
merge test
|
2023-12-20 14:15:25 +08:00 |
|
|
|
39d2c4a959
|
菜单
|
2023-12-20 14:11:05 +08:00 |
|
|
|
b0bac562c3
|
Merge pull request 'projects/mesxc-lb' (#156) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #156
|
2023-12-20 10:45:58 +08:00 |
|
|
|
60a94cd839
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2023-12-20 10:45:19 +08:00 |
|
|
|
a764e20bd4
|
update
|
2023-12-20 10:45:00 +08:00 |
|
|
|
e1384a2d3e
|
Merge pull request 'projects/mesxc-lb' (#155) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #155
|
2023-12-20 10:28:42 +08:00 |
|
|
|
b9db57d66a
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2023-12-20 10:27:59 +08:00 |
|
|
|
9561dc27e3
|
fix some bugs
|
2023-12-20 10:26:38 +08:00 |
|
|
|
cb6e3c3d5f
|
Merge pull request 'projects/mesxc-zhp' (#154) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #154
|
2023-12-19 16:36:44 +08:00 |
|
‘937886381’
|
6d8889bbec
|
Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
|
2023-12-19 16:32:46 +08:00 |
|
‘937886381’
|
553d19db89
|
修改bug
|
2023-12-19 16:32:12 +08:00 |
|
|
|
f0536c9cf9
|
Merge pull request 'projects/mesxc-lb' (#153) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #153
|
2023-12-19 14:10:49 +08:00 |
|
|
|
c91be221dc
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2023-12-19 14:10:16 +08:00 |
|
|
|
069b28eeae
|
update login
|
2023-12-19 14:09:37 +08:00 |
|
|
|
84cc6dfde7
|
Merge pull request 'projects/mesxc-zjl' (#152) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #152
|
2023-12-19 10:15:53 +08:00 |
|
|
|
1d61f056b8
|
merge test
|
2023-12-19 10:15:15 +08:00 |
|
|
|
eda63ee8c8
|
Merge pull request 'projects/mesxc-lb' (#151) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #151
|
2023-12-19 09:55:21 +08:00 |
|
|
|
78e8401029
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2023-12-19 09:54:47 +08:00 |
|
|
|
5ad93105b3
|
update login
|
2023-12-19 09:31:38 +08:00 |
|
|
|
97612a13ac
|
Merge pull request 'projects/mesxc-lb' (#150) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #150
|
2023-12-19 09:09:59 +08:00 |
|
|
|
d06756c6ff
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2023-12-19 09:07:55 +08:00 |
|
|
|
5ac17b15e1
|
update merge
|
2023-12-19 09:07:19 +08:00 |
|
|
|
4e064e4b01
|
Merge pull request 'projects/mesxc-lb' (#149) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #149
|
2023-12-19 09:02:24 +08:00 |
|
|
|
f280a92145
|
merge test
|
2023-12-19 09:01:13 +08:00 |
|
|
|
aaa131cb1f
|
update 巡检记录
|
2023-12-18 17:00:47 +08:00 |
|
|
|
f6af441030
|
update 巡检配置
|
2023-12-18 16:32:16 +08:00 |
|
|
|
cb9132abc1
|
update
|
2023-12-18 15:48:18 +08:00 |
|
|
|
5886875770
|
update 维修
|
2023-12-18 15:39:18 +08:00 |
|
|
|
ccb2808e60
|
logo
|
2023-12-18 15:12:17 +08:00 |
|
|
|
a766318e20
|
Merge pull request '成本bug' (#148) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #148
|
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
|
2023-12-18 14:33:31 +08:00 |
|
|
|
c8219bd7ee
|
Merge pull request '修改成本bug' (#147) from projects/mesxc-zwq into projects/mesxc-test
Reviewed-on: #147
|
2023-12-18 14:26:46 +08:00 |
|
|
|
20f5a0d4c7
|
修改成本bug
|
2023-12-18 14:26:23 +08:00 |
|
|
|
fd4b0088dc
|
update 特殊设备保养
|
2023-12-18 14:25:08 +08:00 |
|
|
|
e039a3992d
|
Merge pull request 'projects/mesxc-zhp' (#146) from projects/mesxc-zhp into projects/mesxc-test
Reviewed-on: #146
|
2023-12-15 16:29:57 +08:00 |
|
‘937886381’
|
c8d55ff625
|
解决冲突
|
2023-12-15 16:28:37 +08:00 |
|
‘937886381’
|
83fc835c51
|
质量管理
|
2023-12-15 16:27:30 +08:00 |
|
|
|
165a833088
|
update 保养记录
|
2023-12-14 16:58:33 +08:00 |
|
|
|
8d5623bb24
|
'1'
|
2023-12-14 16:07:21 +08:00 |
|
|
|
4fa49c46ff
|
Merge pull request 'projects/mesxc-zjl' (#145) from projects/mesxc-zjl into projects/mesxc-test
Reviewed-on: #145
|
2023-12-14 15:55:28 +08:00 |
|
|
|
ae251fc428
|
merge test
|
2023-12-14 15:54:46 +08:00 |
|
|
|
a2c61b86ca
|
Merge pull request 'projects/mesxc-dy' (#144) from projects/mesxc-dy into projects/mesxc-test
Reviewed-on: #144
|
2023-12-14 15:52:47 +08:00 |
|
|
|
503e3442a0
|
merge test
|
2023-12-14 15:51:26 +08:00 |
|
|
|
69a65b32ea
|
12.14测试bug
|
2023-12-14 15:48:35 +08:00 |
|
|
|
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 |
|
|
|
46dd33cb05
|
update 特种设备保养
|
2023-12-13 10:57:02 +08:00 |
|
|
|
68898ea67f
|
'1'
|
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
|
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 |
|
|
|
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 |
|
|
|
5f47cb131f
|
add 添加消防设备
|
2023-12-12 16:50:18 +08:00 |
|
|
|
ea21f3d4bc
|
add 安全设备，特种设备
|
2023-12-12 16:27:37 +08:00 |
|
|
|
bdda6c9985
|
add 特殊设备
|
2023-12-12 13:57:02 +08:00 |
|
|
|
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 |
|
|
|
b62d0e4096
|
add israchart
|
2023-12-12 10:53:00 +08:00 |
|
|
|
1c123fa22d
|
Merge branch 'projects/mesxc-test' into projects/mesxc-lb
|
2023-12-11 10:22:51 +08:00 |
|
|
|
6b3619514d
|
update 驾驶舱
|
2023-12-11 10:21:45 +08:00 |
|
|
|
dee9f7ce8b
|
update
|
2023-12-11 09:47:58 +08:00 |
|
|
|
b4d2b69004
|
update
|
2023-12-11 09:11:51 +08:00 |
|
|
|
8fdaa3e968
|
环保管理
|
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
|
2023-12-07 10:06:18 +08:00 |
|
|
|
f99e979d14
|
'1'
|
2023-12-07 10:06:14 +08:00 |
|
|
|
4f64c255af
|
update
|
2023-12-06 15:29:11 +08:00 |
|
|
|
cc0d3d8b75
|
add 烟气处理
|
2023-12-06 10:38:56 +08:00 |
|
|
|
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 |
|
|
|
7cb88fab88
|
add 用量统计&风机频率
|
2023-12-06 09:49:38 +08:00 |
|
|
|
e7263302a7
|
update line
|
2023-12-05 17:00:55 +08:00 |
|
|
|
b26e1d5a7f
|
update switcher
|
2023-12-05 15:44:22 +08:00 |
|
|
|
86bdabf358
|
update
|
2023-12-05 15:24:20 +08:00 |
|
|
|
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 |
|
|
|
6c661bedd3
|
add databoard
|
2023-12-04 17:00:40 +08:00 |
|
‘937886381’
|
4e48eae2a7
|
修改ui
|
2023-12-04 14:14:34 +08:00 |
|
|
|
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 |
|
|
|
be430ebbff
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-30 09:08:59 +08:00 |
|
|
|
61b4bf784b
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-29 10:17:02 +08:00 |
|
|
|
b0f10b9002
|
'1'
|
2023-11-29 10:16:58 +08:00 |
|
|
|
e6b9d75f16
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-28 09:03:13 +08:00 |
|
|
|
d9f3434712
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-27 09:31:52 +08:00 |
|
|
|
de15716b7c
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-22 14:53:49 +08:00 |
|
|
|
c736992a34
|
'1'
|
2023-11-22 14:49:56 +08:00 |
|
|
|
dcbb2c719b
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-22 14:15:39 +08:00 |
|
|
|
bc2940ca99
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-21 17:30:38 +08:00 |
|
|
|
76938951ed
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-20 16:07:12 +08:00 |
|
|
|
8b91e7812f
|
'1'
|
2023-11-17 10:38:44 +08:00 |
|
|
|
9cffa01414
|
Merge branch 'projects/mes-test' of git.picaiba.com:mt-fe-group/yudao-dev into projects/mes-test
|
2023-11-17 10:38:35 +08:00 |
|
|
|
905479d5f4
|
'del_dist'
|
2023-11-17 10:29:23 +08:00 |
|
|
|
c1ae248234
|
'1'
|
2023-11-17 10:28:39 +08:00 |
|
