1242 Commits

Author SHA1 Message Date
kun
7b6a1d772e fix: BUG修改 2024-01-02 18:52:03 +08:00
cjp
c5f5fd2754 fix: 榕图施工图,物资采购,技术管理新功能开发 2023-12-28 18:13:42 +08:00
cjp
f715174e0d fix: 榕图定制开发,进度款合同、工器具管理开发完成 2023-12-25 17:57:26 +08:00
cjp
f2f47ee659 Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-cjp 2023-12-16 14:07:38 +08:00
kun
df0c2bb2f5 Merge branch 'dev-lhk' into shenzhen-dev 2023-12-15 11:41:16 +08:00
kun
ad481748ca fix: BUG修改 2023-12-15 11:39:48 +08:00
kun
7283ba92ca fix: BUG修改 2023-12-15 10:45:29 +08:00
kun
2fd8632e18 fix: 污水监测BUG修改 2023-12-15 10:40:14 +08:00
cjp
4a3dca991d Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-cjp 2023-12-14 09:14:02 +08:00
cjp
6e33d046fa fix: 中建四局BIM动态获取;梁场后台BUG修复 2023-12-14 09:13:45 +08:00
kun
013ab77566 Merge branch 'dev-lhk' into shenzhen-dev 2023-12-14 09:12:15 +08:00
kun
db62427fff feat: 贵阳项目名称 - 污水监测功能新增 2023-12-13 17:56:32 +08:00
kun
5e8bcf74ce feat: 污水监测功能新增 2023-12-12 18:23:23 +08:00
kun
c7880de608 Merge branch 'dev-lhk' into shenzhen-dev 2023-12-12 11:49:51 +08:00
cjp
83d2673a13 fix: 智慧梁场PC端BUG修改 2023-12-12 11:49:17 +08:00
kun
edf261d8f5 fix: BUG修改 2023-12-12 11:48:24 +08:00
kun
59756c672b fix: BUG修改 2023-12-12 11:43:19 +08:00
kun
86308e1978 fix: BUG修改 2023-12-11 18:55:46 +08:00
cjp
04f8e8a4d9 fix: BUG修改,后台权限配置改为接口字典获取 2023-12-11 17:32:46 +08:00
kun
43bcdc65d5 Merge branch 'shenzhen-dev' into dev-lhk 2023-12-11 11:00:24 +08:00
kun
3caa9a8bd1 fix: BUG修改 2023-12-11 10:59:39 +08:00
cjp
32037f7351 fix: BUG修复 2023-12-11 10:46:31 +08:00
cjp
41f6d15297 fix: 智慧梁场后台开发完成 2023-12-08 19:20:15 +08:00
kun
c96d56b4c6 fix: BUG修改 2023-12-08 18:28:56 +08:00
kun
a031f4f7e9 feat: BIMBASE新功能新增以及BUG修改 2023-12-08 18:17:33 +08:00
kun
ab6076486f Merge branch 'shenzhen-dev' into dev-lhk 2023-12-05 18:36:23 +08:00
kun
04099d993a fix: BUG修改 2023-12-05 18:35:57 +08:00
kun
45810bde91 fix: 解决冲突 2023-12-05 13:41:43 +08:00
cjp
5020d6954c fix: 数据看板动态获取 2023-12-05 13:36:51 +08:00
kun
3b0ce2a27b fix: BUG修改 2023-12-05 09:06:13 +08:00
kun
3d556806b8 fix: BUG修改 2023-12-04 21:28:51 +08:00
kun
5fb7f6e506 fix: BUG修改 2023-12-04 18:01:09 +08:00
kun
a1df60612c fix: BUG修改 2023-12-04 17:18:44 +08:00
kun
fb4935148b fix: BUG修改 2023-12-04 17:16:49 +08:00
cjp
9866b87da2 fix: url配置 2023-12-04 10:44:02 +08:00
kun
78cfed6e75 fix: BUG修改 2023-12-04 10:35:23 +08:00
kun
8fa0f135bd fix: BUG修改 2023-12-04 10:30:54 +08:00
cjp
a76022de86 fix: 水稳拌合站页面编写和静态对接 2023-12-04 09:10:16 +08:00
kun
1fbc368f6a fix: BUG修改 2023-12-02 18:09:28 +08:00
kun
606ef8f7d1 feat: BIM模型构件隐藏和着色 2023-12-02 18:00:01 +08:00
cjp
222532953a fix: 智能张拉-智能压浆-水稳拌合站新功能开发;合并shenzhen-dev分支 2023-12-02 11:52:03 +08:00
cjp
b467a1745b fix: 车辆定位围栏静态完成 2023-11-20 18:20:04 +08:00
cjp
9b0d967048 fix: 车辆定位开发 2023-11-18 17:54:03 +08:00
cjp
c767ce8bdc fix: 进度管理问题项修复,以及需求调整 2023-11-13 10:06:21 +08:00
袁晶琳
77d363cf7f Merge branch 'dev-yjl' into 'shenzhen-dev'
安全管理模块还原初始版本

See merge request !199
2023-11-04 15:12:31 +08:00
jxj_yjl
4adc406712 安全管理模块还原初始版本 2023-11-04 15:11:45 +08:00
袁晶琳
196be77985 Merge branch 'dev-yjl' into 'shenzhen-dev'
标准版进度管理模块开发完成

See merge request !198
2023-11-04 09:21:19 +08:00
jxj_yjl
758308e57d 标准版进度管理模块开发完成 2023-11-04 09:16:56 +08:00
袁晶琳
e2f593900d Merge branch 'dev-yjl' into 'shenzhen-dev'
沈阳和盈-智慧党建页面新增/质量管理模块页面调整/bug修改

See merge request !197
2023-10-19 15:04:27 +08:00
jxj_yjl
6a64c8d146 沈阳和盈-智慧党建页面新增/质量管理模块页面调整/bug修改 2023-10-19 15:01:53 +08:00