Commit Graph

378 Commits

Author SHA1 Message Date
lb
f8baaa8955 update ui 2023-10-17 17:02:53 +08:00
lb
416d4bb390 update 2023-10-17 15:27:08 +08:00
lb
fe7821cbd8 update 核心模块-厂务-设备 2023-10-17 15:22:17 +08:00
9be57ad750 Merge pull request 'test' (#47) from test into master
Reviewed-on: #47
2023-10-17 08:53:53 +08:00
f7313c5911 Merge pull request 'lb' (#46) from lb into test
Reviewed-on: #46
2023-10-17 08:38:26 +08:00
lb
a7e81ad8fb Merge branch 'test' into lb 2023-10-16 17:04:34 +08:00
lb
32cbf9076f update 更新设备类型上传 2023-10-16 17:03:29 +08:00
9a411cc663 Merge pull request 'dy' (#45) from dy into test
Reviewed-on: #45
2023-10-16 15:50:05 +08:00
helloDy
445a88e540 Merge branch 'test' into dy 2023-10-16 15:47:50 +08:00
helloDy
2b355aaf8f ui 2023-10-16 15:47:31 +08:00
lb
f60a46ed1d update 设备信息上传 2023-10-16 15:36:26 +08:00
2688896660 Merge pull request 'dy' (#44) from dy into test
Reviewed-on: #44
2023-10-13 17:12:02 +08:00
helloDy
4a67e226e1 merge 2023-10-13 17:09:07 +08:00
helloDy
11ee0d6541 Merge branch 'test' into dy 2023-10-13 17:06:35 +08:00
98b3237c9a Merge pull request 'lb' (#43) from lb into test
Reviewed-on: #43
2023-10-13 17:06:02 +08:00
helloDy
46aaa47e07 bug 2023-10-13 17:05:01 +08:00
lb
ca0f62b2eb Merge branch 'test' into lb 2023-10-13 17:04:18 +08:00
lb
5534104e87 update equipment edit 2023-10-13 17:01:49 +08:00
lb
b72fe1bfed update equipment edit 2023-10-13 16:08:31 +08:00
f4493bde1c Merge pull request 'dy' (#42) from dy into test
Reviewed-on: #42
2023-10-12 17:06:04 +08:00
helloDy
d682ecc91c Merge branch 'test' into dy 2023-10-12 17:05:03 +08:00
helloDy
2b76ef7d23 bug 2023-10-12 17:04:03 +08:00
lb
9ec13b35b8 update equipment 2023-10-12 17:03:07 +08:00
lb
7acccd3de0 bugfix zentao 2023-10-12 15:40:05 +08:00
e40f45a79a Merge pull request 'zjl' (#41) from zjl into test
Reviewed-on: #41
2023-10-12 14:43:24 +08:00
77083a84a1 merge test 2023-10-12 14:41:59 +08:00
9f53ea6981 10.12 2023-10-12 14:39:59 +08:00
lb
8f634d012c bugfix zentao 2023-10-12 11:08:51 +08:00
03c573d5b2 Merge pull request 'zjl' (#40) from zjl into test
Reviewed-on: #40
2023-10-11 14:34:26 +08:00
348714edaf merge test 2023-10-11 14:33:37 +08:00
814fe4605a UI样式修改能源&班组 2023-10-11 14:30:18 +08:00
bb6bfc5ab6 Merge pull request 'lb' (#39) from lb into test
Reviewed-on: #39
2023-10-11 10:33:08 +08:00
lb
0162f338ba Merge branch 'test' into lb 2023-10-11 10:30:25 +08:00
lb
8f99915720 add 设备看板 2023-10-11 10:29:26 +08:00
744e5d80be Merge pull request 'dy' (#38) from dy into test
Reviewed-on: #38
2023-10-10 17:08:40 +08:00
helloDy
d3b119ad9b Merge branch 'test' into dy 2023-10-10 17:07:02 +08:00
helloDy
69bdab75d4 bug 2023-10-10 17:06:39 +08:00
lb
af5e0333ed update ui 2023-10-10 17:01:57 +08:00
lb
b2ee61b8cb update 改为抽屉展示 2023-10-10 14:22:00 +08:00
lb
723d83cc02 update 设备分组 2023-10-10 10:04:23 +08:00
lb
769830c448 update 设备分组 2023-10-09 17:01:19 +08:00
lb
907db90e93 update 设备分组的抽屉 2023-10-09 16:27:44 +08:00
lb
6e390bf12a update 2023-10-09 13:32:33 +08:00
lb
b39f0625a1 update 2023-10-09 11:37:19 +08:00
lb
e985c73e00 update gantt 2023-10-08 17:14:18 +08:00
180fcf5ad8 Merge pull request 'dy' (#37) from dy into test
Reviewed-on: #37
2023-10-08 17:03:04 +08:00
helloDy
b1c0d21888 Merge branch 'test' into dy 2023-10-08 16:59:31 +08:00
helloDy
96d52fafee pdf 2023-10-08 16:59:09 +08:00
lb
4f7889ff60 done time sequence demo 2023-10-08 15:53:38 +08:00
lb
bc2c5a4787 update time sequence status 2023-10-08 15:00:38 +08:00