1520 Commits

Author SHA1 Message Date
Vce
c1e9f2e2d2 fix: test 2024-03-27 09:26:07 +08:00
kun
b45de2e3a0 Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev 2024-03-26 19:03:08 +08:00
kun
39528bd0b7 feat: 部分新功能添加 2024-03-26 19:03:04 +08:00
Vce
0f24579c84 fix: 添加http://jxj.zhgdyun.com:15551测试环境 2024-03-26 17:23:46 +08:00
Vce
a8b35586e9 fix: 演示平台 2024-03-26 16:29:18 +08:00
Vce
c6364d35b3 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-26 16:28:10 +08:00
Vce
42d4678306 fix: 修改为演示环境 2024-03-26 16:13:58 +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
79772354ab fix: 添加菜单判断 2024-03-25 15:37:08 +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
kun
93bc1c3f17 fix: BUG修改 2024-03-25 09:49:01 +08:00
Vce
01cfac30b0 fix: test 2024-03-25 00:33:29 +08:00
vce
d35ca96cd7 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-23 13:01:40 +08:00
vce
3bbc3d9849 fix: 修改智荟塔项目信息 2024-03-23 13:00:05 +08:00
kun
e8dc252408 feat: 部分页面开发以及接口对接 2024-03-22 18:49:41 +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
7c4d774736 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-22 15:54:29 +08:00
vce
b394f49495 fix: 修改中建四局智荟塔指挥中心信息 2024-03-22 15:50:09 +08:00
kun
ea132b30c7 fix: BUG修改 2024-03-22 14:25:48 +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
92e14ce5b2 fix:merge 2024-03-21 20:35:34 +08:00
vce
9a719f3277 fix: 修改智能安全帽和机械设备定位模块bug 2024-03-21 20:34:06 +08:00
kun
08a237cd1a feat: 新页面开发 2024-03-21 19:30:54 +08:00
kun
a7a6536aa3 fix: BUG修改 2024-03-21 11:45:00 +08:00
kun
bba30d4f32 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev 2024-03-21 11:44:15 +08:00
kun
8877f3ade2 fix: BUG修改 2024-03-21 11:44:10 +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
4edb61d74d fix: BUG修改 2024-03-20 20:24:29 +08:00
kun
957a99ab5f fix: BUG修改 2024-03-20 20:22:12 +08:00
kun
cb3da48473 feat: 功能模块新增 2024-03-20 18:13:55 +08:00
kun
12484ddf51 fix: BUG修改 2024-03-20 09:16:20 +08:00
kun
b2259729d6 fix: BUG修改 2024-03-19 19:17:08 +08:00
kun
6c68bab07f feat: 合并新功能 2024-03-19 19:15:23 +08:00
kun
0c1665c383 feat: 视频回放管理模块添加 2024-03-19 18:03:28 +08:00
kun
81ade4bd74 fix: BUG修改 2024-03-16 19:01:31 +08:00
kun
fea2477e43 fix: BUG修改 2024-03-16 15:33:03 +08:00
vce
68f9c20d9a Fix: 修改中建四局页面 2024-03-15 15:44:43 +08:00
vce
c5f6c79b95 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-15 13:50:57 +08:00
vce
b5f9fd8d0e Fix: 修改中建四局页面 2024-03-15 13:48:26 +08:00
vce
9b5c9b9ffe fix: 修改bug 2024-03-14 19:34:44 +08:00
vce
cddcb6a3a0 Merge branch 'dev-cjw' into shenzhen-dev 2024-03-14 19:33:45 +08:00