580 Commits

Author SHA1 Message Date
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
ddecd08a22 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-13 21:24:26 +08:00
Vce
984f248886 flx:安全绩效 2024-05-13 20:48:56 +08:00
Vce
4f73d737b8 添加劳务管理-人员登记培训-删除按钮 2024-05-13 18:42:37 +08:00
Vce
e4e123df8a flx:绑定安全数据 2024-05-13 01:20:59 +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
Vce
d8a628d625 Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-09 18:50:02 +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
309eaea69d 把所有的劳务人员替换为为施工人员 2024-05-08 23:48:42 +08:00
kun
c8c26271b4 fix: BUG修改 2024-05-08 13:36:24 +08:00
Vce
6cf49b0f5a Merge branch 'bjxz-dev' into bjxz-cjw 2024-05-08 12:38:54 +08:00
Vce
f0607fe7fc dev:暂存危大工程代码 2024-05-08 12:07:33 +08:00
kun
498eaf23b7 fix: BUG修改 2024-05-07 19:16:21 +08:00
kun
8a83f84459 fix: BUG修改 2024-05-06 12:03:45 +08:00
kun
e23d609a27 fix: BUG修改 2024-05-06 01:41:20 +08:00
kun
886e2f2cbb fix: BUG修改 2024-05-05 22:53:43 +08:00
Vce
06d7910514 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-05-05 15:16:30 +08:00
Vce
fb8a36ade1 添加app测试环境最新地址 2024-05-05 15:16:22 +08:00
kun
01384f20ee fix: BUG修改 2024-05-05 14:08:03 +08:00
Vce
6d71c469f0 dev添加鞍钢最新地址 2024-05-04 15:25:27 +08:00
kun
6f042c68f6 fix: BUG修改 2024-05-03 09:51:05 +08:00
kun
2ce8290ad3 fix: BUG修改 2024-05-02 21:35:13 +08:00
Vce
f3c90cca4b dev:增加组织机构管理下拉框 2024-04-30 21:45:40 +08:00
kun
e041ea2646 fix: BUG修改 2024-04-30 09:52:47 +08:00
kun
a7c12b8a20 fix: BUG修改 2024-04-30 01:56:36 +08:00
kun
12a39cf488 fix: BUG修改 2024-04-30 01:47:07 +08:00
kun
e20af1ad52 fix: BUG修改 2024-04-30 00:23:48 +08:00
cjp
6bbc412cda 23:43 2024-04-29 23:43:21 +08:00