mt-fe-group/yudao-init
8
0
Rozštěpit 0
Zdrojový kód Úkoly Pull requesty Vydání Wiki Aktivita

projects/mescc/develop #24

Sloučený
juzi sloučil 94 commity z větve projects/mescc/develop do větve projects/mescc/main před 2024-05-31 14:21:24 +08:00
Konverzace 0 Commity 94 Změněné soubory 201 +27846 -1459

94 Commity

Autor SHA1 Zpráva Datum
juzi
edade214af Merge pull request 'projects/mescc/zhp' (#23) from projects/mescc/zhp into projects/mescc/develop
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti 
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
juzi
9bd4ac5066 Merge pull request 'projects/mescc/zjl' (#22) from projects/mescc/zjl into projects/mescc/develop
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti 
Reviewed-on: #22
 2024-05-29 13:15:23 +08:00
juzi
4b0e8dfab6 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-29 13:14:43 +08:00
juzi
71a428f034 系统管理 2024-05-29 13:13:46 +08:00
juzi
05c170ba5e Merge pull request 'projects/mescc/dy' (#21) from projects/mescc/dy into projects/mescc/develop
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti 
Reviewed-on: #21
 2024-05-22 16:52:01 +08:00
helloDy
8fd8c36b8a merge 2024-05-22 16:31:29 +08:00
helloDy
fe39f72045 生产管理 2024-05-22 16:28:47 +08:00
‘937886381’
5c05e6c2e4 修改ui 2024-05-21 09:13:52 +08:00
juzi
ab4d7a8e4b Merge pull request 'projects/mescc/zjl' (#20) from projects/mescc/zjl into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #20
 2024-05-21 08:35:14 +08:00
juzi
3228987c40 1 2024-05-21 08:34:03 +08:00
juzi
e16915450b Merge pull request 'projects/mescc/dy' (#19) from projects/mescc/dy into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #19
 2024-05-20 15:00:05 +08:00
helloDy
2061384d96 merge 2024-05-20 14:57:43 +08:00
juzi
f84355b673 mt 2024-05-20 14:56:35 +08:00
helloDy
14fa1823f2 生产管理 2024-05-20 14:55:36 +08:00
juzi
aec811827d 1 2024-05-20 14:54:18 +08:00
juzi
ee35987b0a Merge pull request 'projects/mescc/zhp' (#18) from projects/mescc/zhp into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #18
 2024-05-20 14:53:24 +08:00
‘937886381’
cb7cd0df81 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-20 13:33:15 +08:00
‘937886381’
923323a8df 修改bug 2024-05-20 13:32:36 +08:00
juzi
7459ca0019 Merge pull request 'projects/mescc/zhp' (#17) from projects/mescc/zhp into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #17
 2024-05-20 10:23:10 +08:00
‘937886381’
83ad88858b 驾驶舱 2024-05-20 10:20:37 +08:00
‘937886381’
5a9ce24451 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-17 10:32:33 +08:00
‘937886381’
208af7b565 驾驶舱对接 2024-05-17 10:31:47 +08:00
juzi
18e50722b0 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-14 15:19:51 +08:00
juzi
34bf9f91cf 角色管理 2024-05-14 15:18:44 +08:00
juzi
5b33fe539c Merge pull request 'projects/mescc/zhp' (#16) from projects/mescc/zhp into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #16
 2024-05-14 08:49:23 +08:00
‘937886381’
6f0c8503c6 修改bug 2024-05-14 08:46:58 +08:00
‘937886381’
097bab8241 修改bug 2024-05-13 16:20:37 +08:00
‘937886381’
46d7f4cb8a Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-13 13:46:19 +08:00
‘937886381’
ad8e6972fb 驾驶舱 2024-05-13 13:45:33 +08:00
juzi
85239a633d Merge pull request 'projects/mescc/zhp' (#15) from projects/mescc/zhp into projects/mescc/develop
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti 
Reviewed-on: #15
 2024-05-11 16:47:52 +08:00
‘937886381’
b28018a7a2 修改 2024-05-11 16:45:00 +08:00
‘937886381’
8a5b0f2857 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-11 16:41:25 +08:00
‘937886381’
56e011c179 驾驶舱 2024-05-11 16:40:29 +08:00
juzi
e918fab8d4 Merge pull request 'projects/mescc/zjl' (#14) from projects/mescc/zjl into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #14
 2024-05-11 11:16:37 +08:00
juzi
ca21a0cbed 首页 2024-05-11 11:15:17 +08:00
juzi
dd7c5f11ab Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-10 13:22:06 +08:00
juzi
b18a7a8fb4 Merge pull request 'projects/mescc/zhp' (#13) from projects/mescc/zhp into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #13
 2024-05-10 11:13:43 +08:00
‘937886381’
6b2c0ebec3 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-10 11:11:10 +08:00
‘937886381’
f312be08bf 驾驶舱 2024-05-10 11:10:42 +08:00
juzi
3765db0611 工厂驾驶舱样式 2024-05-09 18:35:12 +08:00
juzi
bfa8a73423 Merge branch 'projects/mescc/develop' into projects/mescc/zjl 2024-05-09 15:44:59 +08:00
juzi
31da2a55a3 各工厂数据 2024-05-09 15:43:02 +08:00
juzi
9e90449d1a Merge pull request 'projects/mescc/zhp' (#12) from projects/mescc/zhp into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #12
 2024-05-08 16:40:47 +08:00
‘937886381’
9c9dba5452 修改 2024-05-08 16:38:05 +08:00
‘937886381’
b3578cdd8a 修改 2024-05-07 13:51:11 +08:00
‘937886381’
6cf8eb70b4 保存 2024-05-07 10:23:38 +08:00
‘937886381’
9ab7010f5b Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-05-07 10:04:53 +08:00
‘937886381’
61ea9ea4a6 新增 2024-05-07 10:03:55 +08:00
DESKTOP-FUDKNA8\znjsz
fdf71145e8 1 2024-04-30 16:22:15 +08:00
DESKTOP-FUDKNA8\znjsz
ea63cb5730 update 综合 2024-04-30 11:02:17 +08:00
DESKTOP-FUDKNA8\znjsz
646eb9c270 update 综合驾驶舱 2024-04-29 17:00:53 +08:00
DESKTOP-FUDKNA8\znjsz
bc3a68a9a7 update 芯片OEE和转化效率 2024-04-29 16:06:59 +08:00
DESKTOP-FUDKNA8\znjsz
e066a7c4c7 update 芯片良率 2024-04-29 16:00:07 +08:00
DESKTOP-FUDKNA8\znjsz
b6820fd61f update 标准组件良率 2024-04-29 14:18:52 +08:00
DESKTOP-FUDKNA8\znjsz
5ed4eed5de update efficiency 2024-04-29 13:26:38 +08:00
g7hoo
df50f7dcbe Merge pull request '优化驾驶舱代码结构' (#11) from projects/mescc/lb into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #11
 2024-04-28 17:00:38 +08:00
DESKTOP-FUDKNA8\znjsz
417640dec1 Merge branch 'projects/mescc/develop' into projects/mescc/lb 2024-04-28 17:00:10 +08:00
DESKTOP-FUDKNA8\znjsz
aa2ac270fc 1 2024-04-28 16:55:21 +08:00
DESKTOP-FUDKNA8\znjsz
253f182370 update 接口结构 2024-04-28 15:18:46 +08:00
DESKTOP-FUDKNA8\znjsz
227411e38e update 产量驾驶舱的目录结构 2024-04-28 14:55:12 +08:00
g7hoo
b6b0d32fa2 Merge pull request '更新产量驾驶舱' (#10) from projects/mescc/lb into projects/mescc/develop
Některé kontroly jsou nedořešeny
continuous-integration/drone/push Build is pending
Podrobnosti 
Reviewed-on: #10
 2024-04-28 13:21:01 +08:00
DESKTOP-FUDKNA8\znjsz
aee1e06137 fix conflicts 2024-04-28 11:18:12 +08:00
‘937886381’
1b8f2522c1 新增 2024-04-28 11:04:33 +08:00
DESKTOP-FUDKNA8\znjsz
622a8b4a31 update 产量驾驶舱 2024-04-28 10:59:05 +08:00
DESKTOP-FUDKNA8\znjsz
08c9cf8dd6 update 标准组件产出 环形图 2024-04-26 17:05:26 +08:00
DESKTOP-FUDKNA8\znjsz
517874ffc2 update 2024-04-26 15:44:04 +08:00
DESKTOP-FUDKNA8\znjsz
e8cc80495f update 产量fto投入 2024-04-26 11:23:40 +08:00
DESKTOP-FUDKNA8\znjsz
752df8417d update 驾驶舱 2024-04-25 17:07:44 +08:00
DESKTOP-FUDKNA8\znjsz
bb399835e7 update 产量驾驶舱 2024-04-25 15:16:10 +08:00
DESKTOP-FUDKNA8\znjsz
30af8faa49 update 产量驾驶舱 2024-04-24 17:03:02 +08:00
juzi
ce02c70014 Merge pull request '1' (#9) from projects/mescc/zjl into projects/mescc/develop
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti 
Reviewed-on: #9
 2024-04-20 10:07:08 +08:00
juzi
906262f622 1 2024-04-20 10:06:24 +08:00
juzi
dbb60ac09b Merge pull request 'yarnlock更新' (#8) from projects/mescc/zjl into projects/mescc/develop
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti 
Reviewed-on: #8
 2024-04-20 09:58:28 +08:00
juzi
e0e48960ed yarnlock更新 2024-04-20 09:57:58 +08:00
juzi
2518fb3533 Merge pull request 'projects/mescc/zjl' (#7) from projects/mescc/zjl into projects/mescc/develop
Některé kontroly se nezdařily
continuous-integration/drone/push Build is failing
Podrobnosti 
Reviewed-on: #7
 2024-04-20 08:44:19 +08:00
juzi
af3ba890ec 修改地址 2024-04-20 08:43:44 +08:00
juzi
e3579186fa merge develop 2024-04-19 17:26:57 +08:00
juzi
a9f36c61ec 1 2024-04-19 17:22:45 +08:00
shr
af4b947c22 👷 添加自动构建发布配置
Všechny kontroly byly úspěšné
continuous-integration/drone/push Build is passing
Podrobnosti
2024-04-19 17:13:21 +08:00
juzi
8012bbec9f Merge pull request '修复CodeBrickZj没引入问题' (#5) from projects/mescc/lb into projects/mescc/develop 
Reviewed-on: #5
 2024-04-19 09:33:34 +08:00
DESKTOP-FUDKNA8\znjsz
bd0faef33f Merge branch 'projects/mescc/develop' into projects/mescc/lb 2024-04-19 09:18:10 +08:00
DESKTOP-FUDKNA8\znjsz
eb8c7bbfe4 1 2024-04-19 09:16:35 +08:00
DESKTOP-FUDKNA8\znjsz
d55dc7899f update main.js 2024-04-19 09:07:39 +08:00
juzi
fa80816a1f Merge pull request '首页数据对接完成' (#4) from projects/mescc/lb into projects/mescc/develop 
Reviewed-on: #4
 2024-04-18 17:39:04 +08:00
DESKTOP-FUDKNA8\znjsz
a63cfb5820 merge 2024-04-18 17:03:37 +08:00
DESKTOP-FUDKNA8\znjsz
a262fb96d4 update home 2024-04-18 17:01:10 +08:00
juzi
9dacfc23a1 Merge pull request 'projects/mescc/zhp' (#3) from projects/mescc/zhp into projects/mescc/develop 
Reviewed-on: #3
 2024-04-17 16:36:35 +08:00
‘937886381’
5721816782 Merge branch 'projects/mescc/develop' into projects/mescc/zhp 2024-04-17 16:18:25 +08:00
‘937886381’
320d747eb8 新增模块 2024-04-17 16:17:07 +08:00
juzi
677f542f7c Merge pull request '报表新增' (#2) from projects/mescc/zhp into projects/mescc/develop 
Reviewed-on: #2
 2024-04-12 17:00:25 +08:00
‘937886381’
5b59893edb 报表新增 2024-04-12 16:52:25 +08:00