85 Commits

Author SHA1 Message Date
kun
5bd84a5692 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-27 18:51:32 +08:00
kun
8cf07f81c9 feat: 新项目环境、内容添加 2024-06-27 18:51:28 +08:00
Vce
253f114023 feat:完成app承包商管理模块的页面开发与接口对接 2024-06-27 16:35:13 +08:00
b802c2ca29 1 2024-06-05 20:24:55 +08:00
kun
5718ecd0e1 fix: BUG修改 2024-05-30 09:13:50 +08:00
942cb3dc5b flx:冲突 2024-05-29 20:33:11 +08:00
kun
8ca3345f44 fix: BUG修改 2024-05-27 19:44:30 +08:00
kun
cb4ebb4c2a Merge branch 'bjxz-rain' into bjxz-dev 2024-05-24 21:13:32 +08:00
kun
aa622552bc fix: BUG修改 2024-05-24 21:13:08 +08:00
895bb4f73e 合并冲突 2024-05-24 19:05:47 +08:00
afb67831c3 1 2024-05-24 19:01:59 +08:00
kun
d076271208 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-24 19:01:33 +08:00
kun
90f120a995 fix: BUG修改 2024-05-24 19:01:30 +08:00
60b57a0082 1 2024-05-24 16:03:23 +08:00
1a27280593 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-24 15:51:46 +08:00
d8c0a2d55f flx:修复bug 2024-05-24 15:45:40 +08:00
kun
934c222553 fix: 冲突解决以及BUG修改 2024-05-23 23:42:20 +08:00
kun
0f918dbde3 fix: BUG修改 2024-05-23 23:39:19 +08:00
312940d348 flx:修改bug 2024-05-23 20:06:14 +08:00
kun
ec58eefa80 fix: BUG修改 2024-05-22 20:52:14 +08:00
kun
926f4fa201 fix: 冲突解决 2024-05-21 18:06:06 +08:00
36db958732 提交应急 2024-05-21 18:03:30 +08:00
kun
b772783350 fix: BUG修改 2024-05-21 01:19:28 +08:00
fa31c452ba 提交应急 2024-05-21 01:06:52 +08:00
8bdc11408c flx:提交应急 2024-05-19 19:15:30 +08:00
e774f4d83b flx:应急处置 2024-05-18 18:26:25 +08:00
kun
e98da3f660 fix: BUG修改 2024-05-17 23:35:44 +08:00
Vce
c1416e8e40 打通剩下四个特种流程 2024-05-17 14:15:08 +08:00
Vce
ae212f4e4d 暂存四个特种作业 2024-05-17 06:36:51 +08:00
Vce
b1656cb321 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-16 16:54:15 +08:00
Vce
bbed73adf9 调整动火作业 2024-05-16 16:54:07 +08:00
kun
f9f3c90f6a feat: 视频回放功能页面添加 2024-05-16 13:43:33 +08:00
kun
21a0c616ca fix: BUG修改 2024-05-16 10:39:22 +08:00
Vce
564daf5700 暂存动火作业 2024-05-16 04:10:40 +08:00
Vce
903ac9abbf 添加动火框架 2024-05-14 18:16:51 +08:00
kun
ac9ac9919e fix: BUG修改 2024-05-13 11:43:57 +08:00
kun
ec2ce36f7c Merge branch 'dev-Rain' into bjxz-dev 2024-05-13 01:40:10 +08:00
Vce
04512df2f5 1 2024-05-13 01:15:55 +08:00
kun
119b6d75a5 feat: 安全质量风险功能添加以及BUG修改 2024-05-13 00:53:24 +08:00
kun
205fe2f107 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-11 03:00:55 +08:00
kun
794d971a01 fix: BUG修改 2024-05-11 03:00:50 +08:00
Vce
beffce4330 暂存危大工程 2024-05-10 19:17:33 +08:00
Vce
62401d6977 暂存代码 2024-05-09 22:52:28 +08:00
Vce
57150e4600 将所有劳务人员替换为施工人员 2024-05-09 13:10:52 +08:00
kun
4eb29cfc97 fix: BUG修改 2024-05-09 00:59:04 +08:00
kun
e415816007 fix: BUG修改 2024-05-07 22:58:01 +08:00
kun
98bd8146b3 fix: BUG修改 2024-05-05 14:10:07 +08:00
@wpf
2dd822a24b feat: 消息功能添加 2024-05-05 11:24:10 +08:00
15a1b16de3 增加更新进度条 2024-05-04 11:47:59 +08:00
Vce
245b4d683c fix:修改BUG 2024-04-30 12:23:09 +08:00