352 Commits

Author SHA1 Message Date
Vce
7da032e55e 限制危大工程数据只能由项目账号和责任人进行操作,而责任单位的其他人只能查看 2024-06-05 19:39:09 +08:00
Vce
72236ca3d9 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-05 13:58:07 +08:00
Vce
28089d7837 添加试题显示图片 2024-06-05 13:57:50 +08:00
kun
186291b249 fix: BUG修改 2024-06-04 22:21:28 +08:00
kun
c4ddb4dbfa fix: BUG修改 2024-06-04 21:27:19 +08:00
kun
4a87984e36 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-02 22:28:58 +08:00
kun
d0ae3f23a8 fix: BUG修改 2024-06-02 22:28:55 +08:00
Vce
e1cea0452c Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-02 22:15:18 +08:00
Vce
51eaef822e 修改图片不显示的bug 2024-06-02 22:15:02 +08:00
kun
3d1ab15e1e fix: BUG修改 2024-05-31 21:23:03 +08:00
kun
2c5d15d390 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-31 18:56:59 +08:00
kun
4366e7017e fix: BUG修改 2024-05-31 18:56:56 +08:00
Vce
11e18aa12e 修改动火作业动火人及动火编号字段展示 2024-05-31 16:12:15 +08:00
d82429e83c 1 2024-05-30 19:46:48 +08:00
b44be63539 修复bug 2024-05-30 19:29:15 +08:00
ffbc110aa6 1 2024-05-30 11:57:59 +08:00
Vce
e4ebb8702e 修改进度上传是不能选择否的bug 2024-05-30 10:52:46 +08:00
kun
5718ecd0e1 fix: BUG修改 2024-05-30 09:13:50 +08:00
942cb3dc5b flx:冲突 2024-05-29 20:33:11 +08:00
4b33fc53a0 1 2024-05-29 20:29:43 +08:00
kun
1a9c140129 fix: BUG修改 2024-05-29 20:26:46 +08:00
kun
278df7f5b7 fix: BUG修改 2024-05-29 18:54:32 +08:00
kun
cd2d793ad6 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-29 18:01:30 +08:00
kun
4b513961d8 fix: BUG修改 2024-05-29 18:01:27 +08:00
Vce
2aaf035bc9 修改劳务管理环比 2024-05-29 17:20:00 +08:00
b16b2e8cd2 fix: BUG修改 2024-05-28 21:03:58 +08:00
kun
fc76daca2c Merge branch 'bjxz-rain' into bjxz-dev 2024-05-28 20:03:01 +08:00
kun
1fba2d9c88 fix: BUG修改 2024-05-28 20:01:14 +08:00
26df94b28b Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-05-28 18:09:33 +08:00
4b1e8f2fc2 修改一键报警 2024-05-28 18:08:53 +08:00
kun
0047487dce Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-28 15:58:14 +08:00
kun
9acd6bc803 fix: BUG修改 2024-05-28 15:58:10 +08:00
Vce
8e6b41b9f9 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-28 11:03:34 +08:00
Vce
4664a4fb3c Merge branch 'bjxz-cjw' into bjxz-dev 2024-05-28 11:03:24 +08:00
Vce
b36ed37065 修改劳务管理考勤环比 2024-05-28 11:03:04 +08:00
kun
bbd7245c08 fix: 冲突解决 2024-05-27 21:53:02 +08:00
kun
08422bb506 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-27 21:51:51 +08:00
kun
0f8af40914 fix: BUG修改 2024-05-27 21:51:47 +08:00
d9ada299de 1 2024-05-27 21:45:49 +08:00
1c9371aa76 修改云控制台点击颜色 2024-05-27 21:20:49 +08:00
Vce
b4dd2e48c2 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-27 21:08:00 +08:00
Vce
1bc73307f1 修改劳务人员显示环比 2024-05-27 21:07:26 +08:00
kun
114ea17389 Merge branch 'bjxz-rain' into bjxz-dev 2024-05-27 19:44:58 +08:00
kun
8ca3345f44 fix: BUG修改 2024-05-27 19:44:30 +08:00
7d0b01e711 1 2024-05-27 19:40:17 +08:00
1158fc557b 修改安全、质量隐患 2024-05-27 16:09:53 +08:00
kun
8ea94ef3ad Merge branch 'bjxz-rain' into bjxz-dev 2024-05-27 09:00:56 +08:00
686cf0b04d 1 2024-05-26 19:13:56 +08:00
kun
6adf627be4 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-05-25 19:56:03 +08:00
kun
33ce5012d7 fix: BUG修改 2024-05-25 19:55:24 +08:00