1766 Commits

Author SHA1 Message Date
kun
4f150226ff Merge branch 'bjxz-rain' into bjxz-dev 2024-05-18 18:03:23 +08:00
kun
ff3f03897e fix: BUG修改 2024-05-18 18:02:23 +08:00
9d7024f5e5 修改特种用户权限 2024-05-18 09:47:20 +08:00
Vce
736e394e6c Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-18 02:24:28 +08:00
Vce
156a6c976d Merge branch 'bjxz-rain' into bjxz-dev 2024-05-18 02:22:28 +08:00
Vce
306cc21218 调整特种 2024-05-18 01:47:21 +08:00
kun
70d2a6bdd1 fix: BUG修改 2024-05-17 23:36:00 +08:00
kun
4169c6a601 fix: BUG修改 2024-05-17 22:42:18 +08:00
kun
2b55770511 fix: 冲突解决 2024-05-17 20:15:00 +08:00
kun
cb2e88eb88 fix: BUG修改 2024-05-17 20:14:19 +08:00
Vce
2a2e5d86a4 fix: BUG修改 2024-05-17 20:13:58 +08:00
kun
5ed70c5d45 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-17 15:03:53 +08:00
Vce
d94ff6c72d 1 2024-05-17 14:58:13 +08:00
Vce
d0c5583f86 修复特种 2024-05-17 14:53:55 +08:00
kun
47fb813665 fix: BUG修改 2024-05-17 13:59:49 +08:00
kun
b6157e392c Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-17 09:07:12 +08:00
kun
57265f91af fix: BUG修改 2024-05-17 09:07:09 +08:00
Vce
bfa2d1f22e 调整盲板显示 2024-05-17 07:46:40 +08:00
Vce
a72f728c93 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-17 07:44:53 +08:00
Vce
bc35923e89 修改盲板抽堵作业页面显示异常问题 2024-05-17 07:21:22 +08:00
Vce
d6fa8e86ca 1 2024-05-17 03:12:37 +08:00
Vce
11c5c8fe12 1 2024-05-17 03:03:41 +08:00
Vce
00a4807bf5 flx:修改动火 2024-05-17 01:17:07 +08:00
kun
f0497246ae fix: BUG修改 2024-05-16 18:27:37 +08:00
kun
a4f57f0d93 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-16 18:12:04 +08:00
Vce
99cd95c490 flx:修改特种作业模块 2024-05-16 18:11:14 +08:00
kun
995556a25f fix: BUG修改 2024-05-16 18:10:38 +08:00
Vce
eb5e2ec392 flx:修改动火 2024-05-16 09:27:37 +08:00
Vce
f3ced97e12 fix: BUG修改 2024-05-15 20:31:40 +08:00
Vce
ea3d44ce00 Merge branch 'bjxz-dev' into bjxz-rain 2024-05-15 20:31:15 +08:00
kun
ffc4d63148 fix: BUG修改 2024-05-15 20:18:23 +08:00
Vce
d69dba3ee7 flx:修改动火作业 2024-05-15 20:02:29 +08:00
kun
ec0de14c4f Merge branch 'bjxz-rain' into bjxz-dev 2024-05-15 18:29:40 +08:00
Vce
cb237539b0 flx:新增特种作业 2024-05-15 18:23:40 +08:00
kun
a558e50d4c fix: BUG修改 2024-05-15 18:21:20 +08:00
kun
7e94105435 fix: BUG修改 2024-05-15 11:57:38 +08:00
kun
1a9cd61073 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-15 10:52:29 +08:00
kun
7cb889e459 fix: BUG修改 2024-05-14 20:04:47 +08:00
Vce
9c38e882c8 flx:提交特种作业模块 2024-05-14 18:16:17 +08:00
kun
a7d2486f0b Merge branch 'bjxz-rain' into bjxz-dev 2024-05-14 11:35:12 +08:00
Vce
cc03aba900 flx:安全绩效图标新增滚动条 调整安全/质量分析 2024-05-14 11:27:44 +08:00
Vce
7088e2ac0a 危大工程计划时间必填 2024-05-13 23:33:45 +08:00
kun
ddecd08a22 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-13 21:24:26 +08:00
kun
78064d6392 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-13 21:23:38 +08:00
kun
649ed51269 fix: BUG修改 2024-05-13 21:23:33 +08:00
Vce
9883117e33 flx:修改bug 2024-05-13 21:12:43 +08:00
Vce
826d4b39b5 Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain 2024-05-13 21:03:12 +08:00
Vce
6a91cd6330 1 2024-05-13 21:02:03 +08:00
Vce
984f248886 flx:安全绩效 2024-05-13 20:48:56 +08:00
Vce
4f73d737b8 添加劳务管理-人员登记培训-删除按钮 2024-05-13 18:42:37 +08:00