672 Commits

Author SHA1 Message Date
Vce
8d7db1615d 修改机械设备定位字段显示 2024-03-30 18:03:00 +08:00
Vce
1583ebf05e 开发科目管理界面 2024-03-30 17:30:04 +08:00
kun
63d3a896c4 feat: 供应商管理系统页面以及项目管理人员审批页面开发 2024-03-29 18:54:35 +08:00
Vce
1330c5b746 fix: 修改高支模模块列表字段显示 2024-03-29 17:08:55 +08:00
Vce
b73951ff2c fix: 开发考试系统页面 2024-03-29 11:55:24 +08:00
Vce
96195672f1 fix: 修改机械设备定位和智能安全帽的接口传参 2024-03-27 19:12:03 +08:00
Vce
1fe7366c1d Merge branch 'shenzhen-dev' into dev-cjw 2024-03-27 16:46:53 +08:00
Vce
5f03e59f8d fix: test 2024-03-27 13:40:47 +08:00
Vce
8253545ec6 fix: 增加临边防护设备管理列表设备状态字段 2024-03-27 10:35:18 +08:00
Vce
c6364d35b3 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-26 16:28:10 +08:00
Vce
21d3c75ce2 增加“综合教育培训考试系统”模块 2024-03-26 15:25:01 +08:00
kun
7c83752125 fix: 海康插件BUG修改 2024-03-25 19:11:34 +08:00
Vce
7cf9b75189 Merge branch 'shenzhen-dev' into dev-cjw 2024-03-25 11:08:01 +08:00
Vce
03b9230d80 fix: 修改机械设备定位和智能安全帽模块bug 2024-03-25 11:06:28 +08:00
kun
d1e109d107 Merge branch 'shenzhen-dev' into dev-lhk 2024-03-25 09:52:01 +08:00
vce
24a75f18e3 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-22 17:56:32 +08:00
vce
f87ac46ddc fix: 修复机械设备定位和智能安全帽人员选择问题 2024-03-22 17:56:10 +08:00
vce
c65da100ee Merge branch 'dev-cjw' into shenzhen-dev 2024-03-22 10:36:58 +08:00
vce
aa51505cd8 fix:修改页面分页bug 2024-03-22 10:36:36 +08:00
vce
306f6b95ca Merge branch 'dev-cjw' into shenzhen-dev 2024-03-21 20:35:50 +08:00
vce
9a719f3277 fix: 修改智能安全帽和机械设备定位模块bug 2024-03-21 20:34:06 +08:00
vce
43aa09d6fd Merge branch 'dev-cjw' into shenzhen-dev 2024-03-20 22:35:48 +08:00
vce
cf3290cc05 fix: 修改bug 2024-03-20 22:35:27 +08:00
vce
9a292beea9 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-20 22:30:19 +08:00
vce
9080b1b85d fix: 智能安全帽和机械设备定位页面开发 2024-03-20 22:28:24 +08:00
kun
12484ddf51 fix: BUG修改 2024-03-20 09:16:20 +08:00
kun
6c68bab07f feat: 合并新功能 2024-03-19 19:15:23 +08:00
kun
0c1665c383 feat: 视频回放管理模块添加 2024-03-19 18:03:28 +08:00
vce
cddcb6a3a0 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-14 19:33:45 +08:00
vce
1d7854a5fd Fix: 修改bug 2024-03-14 19:33:28 +08:00
vce
c7e913de97 fix: 添加智能安全帽模块和机械设备定位模块 2024-03-14 19:07:47 +08:00
vce
bee8fff5d4 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-12 21:39:13 +08:00
vce
c7fe309c56 fix: 修复bug 2024-03-12 21:38:33 +08:00
vce
5c999e237c Merge branch 'dev-cjw' into shenzhen-dev 2024-03-12 17:46:24 +08:00
vce
61c0c508af fix: 修改榕图项目版后台 2024-03-12 17:45:32 +08:00
kun
3fc27e7b9f Merge branch 'dev-lhk' into shenzhen-dev 2024-03-12 10:29:18 +08:00
kun
80706b4468 fix: BUG修改 2024-03-12 10:28:48 +08:00
kun
94ba4551bf fix: BUG修改 2024-03-11 18:14:42 +08:00
vce
3d3fe32a91 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev 2024-03-11 14:09:55 +08:00
vce
ab5cdca69b Fix: 修复Bug 2024-03-11 14:08:33 +08:00
kun
5a6dbe869f Merge branch 'dev-lhk' into shenzhen-dev 2024-03-11 11:45:10 +08:00
kun
4d1f7825c0 fix: 表单验证BUG修改 2024-03-11 11:44:40 +08:00
kun
400a4b0b1b Merge branch 'dev-lhk' into shenzhen-dev 2024-03-11 09:59:50 +08:00
kun
3e7eea349e fix: BUG修改 2024-03-11 09:55:08 +08:00
vce
36bedb8270 Fix: 解决冲突 2024-03-08 18:23:20 +08:00
vce
79256e3fd7 Fix: 塔吊增加考勤记录 2024-03-08 18:16:42 +08:00
vce
34fd6c01bd Fix: 临港车辆管理添加字段 2024-03-08 16:29:58 +08:00
kun
8988acf60f Merge branch 'dev-cjw' into dev-lhk 2024-03-08 14:20:47 +08:00
kun
227b6e7c4d feat: 榕图江坑添加风险提醒文本 2024-03-08 14:19:37 +08:00
vce
541749b129 Merge branch 'dev-lhk' into dev-cjw 2024-03-07 18:11:28 +08:00