318 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
b3a25d8b91 Merge branch 'bjxz-cjw' into bjxz-dev 2024-06-27 18:27:55 +08:00
Vce
253f114023 feat:完成app承包商管理模块的页面开发与接口对接 2024-06-27 16:35:13 +08:00
kun
f3e54fc053 fix: 考试成绩合格结果规则修改 2024-06-27 16:02:59 +08:00
kun
545f44b991 fix: 解决冲突 2024-06-14 20:06:39 +08:00
kun
2ce7d9ee28 fix: 修改页面中顶部导航栏固定的样式以及合并代码 2024-06-14 20:05:51 +08:00
6f9c0c9e38 flx:修改盲板抽堵时间 2024-06-14 19:28:53 +08:00
871a99cabc flx:解决冲突 提交盲板作业 2024-06-13 20:39:21 +08:00
f69bb50fc2 flx:提交盲板作业的时间 2024-06-13 20:37:00 +08:00
kun
f118f42212 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-13 11:13:42 +08:00
kun
b784bd3c86 fix: BUG修改 2024-06-13 11:13:39 +08:00
006a5f9ea1 flx:修改安全编辑问题 2024-06-12 21:32:18 +08:00
kun
72733ac959 fix: 修改了特种作业的文字显示问题 2024-06-12 21:24:03 +08:00
kun
d844f35ba8 fix: BUG修改 2024-06-12 21:22:52 +08:00
a6dece2a07 修改质量安全 视频列表 2024-06-12 14:57:29 +08:00
679c9afca1 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-06-11 21:31:42 +08:00
162b5b8561 提交 2024-06-11 21:27:01 +08:00
Vce
3865cb3afd 固定tabBar 2024-06-11 18:46:40 +08:00
Vce
7cbde72cea 修改bug 2024-06-11 13:12:20 +08:00
kun
ade59383b6 fix: BUG修改 2024-06-08 15:40:06 +08:00
kun
35023f20e7 fix: 冲突解决 2024-06-08 00:49:00 +08:00
kun
c76ff18adb fix: BUG修改 2024-06-08 00:48:04 +08:00
6a5a61a8ef 冲突 2024-06-08 00:13:08 +08:00
e64e784d70 提交 2024-06-08 00:07:12 +08:00
Vce
1589c22fc0 修改bug 2024-06-07 19:31:21 +08:00
135d48ce46 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-06-07 18:35:14 +08:00
Vce
c6dae01dd0 修改安全质量复查人显示 2024-06-07 18:25:51 +08:00
9cf1449d3f 提交视频 2024-06-07 17:41:10 +08:00
Vce
7371bed8ef Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-07 17:03:28 +08:00
Vce
1ad80cf8f0 修改ai预警以及安全和质量复查人 2024-06-07 17:03:10 +08:00
kun
1ac91301fa Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-dev 2024-06-06 22:33:50 +08:00
kun
421b538fb8 fix: BUG修改 2024-06-06 22:33:46 +08:00
83e097b74d Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-06-06 18:22:48 +08:00
kun
8078bc723d fix: BUG修改 2024-06-06 18:13:21 +08:00
081aa07f63 修改车辆 添加全选 2024-06-06 16:22:39 +08:00
kun
8316997393 fix: BUG修改 2024-06-06 09:47:49 +08:00
kun
e282b616f2 Merge branch 'bjxz-rain' into bjxz-dev 2024-06-05 23:33:42 +08:00
kun
c097d3a912 fix: BUG修改 2024-06-05 23:32:47 +08:00
848c7d15ab Merge branch 'bjxz-rain' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain 2024-06-05 22:29:06 +08:00
6e0c2b372d 提交 2024-06-05 22:28:18 +08:00
kun
280ec0b348 fix: BUG修改 2024-06-05 21:38:17 +08:00
kun
9da8323818 fix: BUG修改 2024-06-05 21:37:18 +08:00
65ca2580c3 flx:冲突 2024-06-05 21:05:07 +08:00
0c48444621 flx:冲突 2024-06-05 21:03:55 +08:00
023d7ab27e 提交车辆 2024-06-05 20:58:30 +08:00
b802c2ca29 1 2024-06-05 20:24:55 +08:00
Vce
7da032e55e 限制危大工程数据只能由项目账号和责任人进行操作,而责任单位的其他人只能查看 2024-06-05 19:39:09 +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