1537 Commits

Author SHA1 Message Date
kun
59c6164142 fix: BUG修改 2024-04-01 13:50:42 +08:00
Vce
0827317e82 Merge branch 'bjxz-dev' into bjxz-cjw 2024-04-01 09:06:45 +08:00
Vce
08c38291f9 Merge branch 'shenzhen-dev' into dev-cjw 2024-03-30 19:04:05 +08:00
kun
3642e32445 fix: BUG修改 2024-03-30 18:07:37 +08:00
Vce
8d7db1615d 修改机械设备定位字段显示 2024-03-30 18:03:00 +08:00
Vce
1583ebf05e 开发科目管理界面 2024-03-30 17:30:04 +08:00
kun
09820113a3 fix: BUG修改 2024-03-30 11:56:56 +08:00
kun
f71c40e551 fix: BUG修改 2024-03-30 11:51:22 +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
f489731cf6 fix: 修改app更新地址 2024-03-29 16:15:36 +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
73618c7383 中建四局:根据客户需求修改CIM+数据 2024-03-27 16:45:45 +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
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