Commit Graph

137 Commits

Author SHA1 Message Date
‘937886381’
fad6028469 新增报表 2024-06-11 14:08:32 +08:00
‘937886381’
b40414b837 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 14:56:26 +08:00
b0f979318b Merge pull request 'projects/mescc/dy' (#37) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #37
2024-06-07 14:55:58 +08:00
‘937886381’
db70699a6b Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 14:49:01 +08:00
‘937886381’
a2e73b25ce 修改 2024-06-07 14:48:33 +08:00
helloDy
0a10b7f177 Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-07 14:16:51 +08:00
helloDy
39cb9acfec 工单 2024-06-07 14:16:20 +08:00
3df0ab48de Merge pull request 'projects/mescc/zhp' (#36) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #36
2024-06-07 11:18:49 +08:00
‘937886381’
9854dd83b2 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-07 11:14:42 +08:00
‘937886381’
ef618a4abb 修改bug 2024-06-07 11:13:59 +08:00
40c7aaa323 Merge pull request 'projects/mescc/dy' (#35) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #35
2024-06-05 16:46:34 +08:00
helloDy
1a3599a42b Merge branch 'projects/mescc/develop' into projects/mescc/dy 2024-06-05 16:43:31 +08:00
helloDy
8a08846198 bug 工单详情 2024-06-05 16:42:54 +08:00
6d6f73e7d2 Merge pull request 'projects/mescc/zhp' (#34) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #34
2024-06-05 15:05:23 +08:00
‘937886381’
1e8d60696b Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-05 14:30:51 +08:00
‘937886381’
ba0ba04182 修改首页 2024-06-05 14:30:05 +08:00
6a9acc13ae Merge pull request 'projects/mescc/zhp' (#33) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #33
2024-06-05 14:16:55 +08:00
‘937886381’
035bf0e095 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-05 14:14:44 +08:00
‘937886381’
69f953fb0c 修改 2024-06-05 14:14:12 +08:00
d43a53e7f5 Merge pull request '修改bug' (#32) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #32
2024-06-04 15:43:44 +08:00
7fc6ed87a4 修改bug 2024-06-04 15:43:00 +08:00
006d44b842 Merge pull request 'projects/mescc/zjl' (#31) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #31
2024-06-04 09:09:27 +08:00
7c6949dfa0 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-04 09:08:07 +08:00
78f7784f23 router 2024-06-04 09:07:23 +08:00
7d7e4314e9 Merge pull request 'projects/mescc/dy' (#30) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #30
2024-06-04 08:57:54 +08:00
helloDy
c77130603e merge 2024-06-04 08:56:52 +08:00
helloDy
7cb8abd618 滚动条 2024-06-04 08:55:45 +08:00
c6169afaec Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-06-04 08:36:06 +08:00
ff98ad35c5 logo图标等 2024-06-04 08:35:23 +08:00
acb87e86a1 Merge pull request 'projects/mescc/zhp' (#29) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #29
2024-06-03 16:44:17 +08:00
‘937886381’
1e3ba8c9d0 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-03 16:43:16 +08:00
‘937886381’
9d11f8b943 修改 2024-06-03 16:42:28 +08:00
1cc4c8f8a3 Merge pull request 'projects/mescc/zhp' (#28) from projects/mescc/zhp into projects/mescc/develop
Some checks are pending
continuous-integration/drone/push Build is pending
Reviewed-on: #28
2024-06-03 10:05:37 +08:00
‘937886381’
38b278530c Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-03 08:57:56 +08:00
‘937886381’
7a9549bc8f 修改bug 2024-06-03 08:57:04 +08:00
5f2c85e4d7 Merge pull request 'projects/mescc/dy' (#27) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #27
2024-06-03 08:53:37 +08:00
helloDy
44283a049b merge 2024-06-03 08:52:30 +08:00
helloDy
da14d9f018 merge 2024-06-03 08:44:28 +08:00
00dd5b4bfe Merge pull request 'projects/mescc/zhp' (#25) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #25
2024-06-03 08:44:02 +08:00
helloDy
fe70138870 生产管理 2024-06-03 08:37:31 +08:00
‘937886381’
a5f8e72a78 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-06-03 08:24:18 +08:00
‘937886381’
38665c38bd 修改 2024-06-03 08:23:40 +08:00
edade214af Merge pull request 'projects/mescc/zhp' (#23) from projects/mescc/zhp into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #23
2024-05-30 22:11:27 +08:00
‘937886381’
91fd1b09d5 工厂驾驶舱 2024-05-30 16:00:18 +08:00
‘937886381’
4569d047d7 解决冲突 2024-05-29 17:07:09 +08:00
‘937886381’
dc1667cdb7 产量和效率 2024-05-29 17:05:55 +08:00
9bd4ac5066 Merge pull request 'projects/mescc/zjl' (#22) from projects/mescc/zjl into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #22
2024-05-29 13:15:23 +08:00
4b0e8dfab6 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-29 13:14:43 +08:00
71a428f034 系统管理 2024-05-29 13:13:46 +08:00
05c170ba5e Merge pull request 'projects/mescc/dy' (#21) from projects/mescc/dy into projects/mescc/develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #21
2024-05-22 16:52:01 +08:00