1585 Commits

Author SHA1 Message Date
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
kun
2f0f2d50a3 Merge branch 'dev-Rain' into bjxz-dev 2024-05-13 10:01:19 +08:00
Vce
86c0ded6e7 flx:修复表图 无数据 显示暂无 2024-05-13 09:58:03 +08:00
Vce
53c9578e12 Merge branch 'dev-Rain' into bjxz-dev 2024-05-13 01:58:30 +08:00
Vce
e4e123df8a flx:绑定安全数据 2024-05-13 01:20:59 +08:00
kun
31c107be34 fix: BUG修改 2024-05-13 00:52:47 +08:00
Vce
7ea192fb7c flx:冲突解决 2024-05-12 20:15:21 +08:00
Vce
035a39923e flx:提交教育培训 2024-05-12 20:08:08 +08:00
kun
3ecf1282a4 fix: 冲突解决 2024-05-12 18:26:58 +08:00
kun
6a610b192d fix: BUG修改 2024-05-12 18:23:26 +08:00
kun
a1cdeb83d1 fix: BUG修改 2024-05-12 10:06:08 +08:00
Vce
2fc8a10a48 提交安全和质量分析页面 2024-05-12 09:22:59 +08:00
kun
b46682e177 fix: 冲突解决 2024-05-12 01:56:48 +08:00
kun
d5710c9f26 fix: BUG修改 2024-05-12 01:56:19 +08:00
Vce
6ee44e7690 Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-12 01:39:55 +08:00
Vce
394ac7da93 修改危大工程BUG 2024-05-12 01:39:25 +08:00
kun
8feee43963 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-11 02:53:58 +08:00
kun
a78ff5cd41 fix: BUG修改 2024-05-11 02:53:54 +08:00
Vce
7ce3bd7715 危大工程 2024-05-11 02:49:01 +08:00
Vce
8b527e989b 暂存危大工程 2024-05-10 20:14:59 +08:00
Vce
f2b6bd3928 Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-10 16:49:14 +08:00
Vce
27146b0681 修改BUG 2024-05-10 15:34:11 +08:00
Vce
6913a0966e 所有外来车替换为临时车 2024-05-10 10:02:33 +08:00
kun
40cef488f2 fix: BUG修改 2024-05-09 21:11:40 +08:00
kun
2a9ed59114 fix: BUG修改 2024-05-09 20:23:14 +08:00
kun
001dd96b4c Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-09 20:17:18 +08:00
kun
a0ca4397db fix: BUG修改 2024-05-09 20:17:15 +08:00
Vce
d8a628d625 Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-09 18:50:02 +08:00
Vce
5fcfc30072 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-09 18:17:45 +08:00
Vce
f1ff4bd324 修改人员详情显示BUG 2024-05-09 18:17:24 +08:00
kun
ef04952c1b Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-09 16:42:45 +08:00
kun
77358756d7 fix: BUG修改 2024-05-09 16:42:40 +08:00
Vce
545c8333d8 把临时车替换为长期车 2024-05-09 14:02:14 +08:00
kun
0fb5bf5f69 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-09 00:45:45 +08:00
kun
85edc52a98 fix: BUG修改 2024-05-09 00:45:41 +08:00
Vce
159a16e482 调整车辆黑白名单样式 2024-05-09 00:24:45 +08:00
Vce
309eaea69d 把所有的劳务人员替换为为施工人员 2024-05-08 23:48:42 +08:00