1210 Commits

Author SHA1 Message Date
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
kun
78cfed6e75 fix: BUG修改 2023-12-04 10:35:23 +08:00
kun
8fa0f135bd fix: BUG修改 2023-12-04 10:30:54 +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
袁晶琳
4a95d203c0 Merge branch 'dev-yjl' into 'shenzhen-dev'
项目页面调整/质量管理模块优化

See merge request !196
2023-10-13 17:52:50 +08:00
jxj_yjl
747590bb59 项目页面调整/质量管理模块优化 2023-10-13 17:51:24 +08:00
袁晶琳
e244f0479f Merge branch 'dev-yjl' into 'shenzhen-dev'
金林湾页面问题修复/隧道定位路由新建

See merge request !195
2023-09-15 14:53:28 +08:00
jxj_yjl
6691aa8932 金林湾页面问题修复/隧道定位路由新建 2023-09-15 14:51:27 +08:00
袁晶琳
a9a46dcfea Merge branch 'dev-yjl' into 'shenzhen-dev'
页面bug修改提交

See merge request !194
2023-09-08 17:46:18 +08:00
jxj_yjl
f15c7227f3 页面bug修改提交 2023-09-08 17:45:24 +08:00
袁晶琳
09af0af274 Merge branch 'dev-yjl' into 'shenzhen-dev'
修改 演示平台/成润项目页面bug

See merge request !193
2023-08-31 18:16:49 +08:00
jxj_yjl
378af1bd71 修改 演示平台/成润项目页面bug 2023-08-31 18:16:18 +08:00
袁晶琳
b528662ce4 Merge branch 'dev-yjl' into 'shenzhen-dev'
系统设置登录模块区分

See merge request !192
2023-08-18 19:24:56 +08:00
jxj_yjl
53a5b893cb 系统设置登录模块区分 2023-08-18 19:24:28 +08:00
袁晶琳
026e5b8fba Merge branch 'dev-yjl' into 'shenzhen-dev'
系统设置/巡检点/页面问题修复等

See merge request !191
2023-08-18 18:47:42 +08:00
jxj_yjl
f1ea06327d 系统设置/巡检点/页面问题修复等 2023-08-18 18:46:24 +08:00
jxj_yjl
fcc491257c 修改演示平台页面bug 2023-08-14 09:19:39 +08:00
袁晶琳
9235c8d452 Merge branch 'dev-yjl' into 'shenzhen-dev'
调整企业管理页面

See merge request !190
2023-08-10 14:01:30 +08:00
jxj_yjl
a9ad2dbcaa 调整企业管理页面 2023-08-10 14:00:02 +08:00
袁晶琳
c8bf634a82 Merge branch 'dev-yjl' into 'shenzhen-dev'
管理员账号界面:企业管理新增功能开发/新开发字典管理页面

See merge request !188
2023-08-09 17:44:42 +08:00
jxj_yjl
ffc5be0375 管理员账号界面:企业管理新增功能开发/新开发字典管理页面 2023-08-09 17:43:01 +08:00
袁晶琳
46d1853ef9 Merge branch 'dev-yjl' into 'shenzhen-dev'
修改金林湾/临边/有毒气体/智能烟感页面bug

See merge request !186
2023-08-08 10:22:04 +08:00
jxj_yjl
158f2b9d08 修改金林湾/临边/有毒气体/智能烟感页面bug 2023-08-08 10:21:04 +08:00
袁晶琳
ace319c774 Merge branch 'dev-yjl' into 'shenzhen-dev'
上海项目页面模块开发:临边防护/有毒气体监测/无线智能烟感报警系统

See merge request !185
2023-08-04 18:33:17 +08:00
jxj_yjl
d1ee0ea4a7 上海项目页面模块开发:临边防护/有毒气体监测/无线智能烟感报警系统 2023-08-04 18:31:22 +08:00
jxj_yjl
e279114c11 Merge branches 'dev-yjl' and 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-07-31 09:15:57 +08:00
jxj_yjl
4d4d832aef 中建四大屏数据新增 2023-07-31 09:14:58 +08:00
cjp
36db040b7d fix: BUG修改 2023-07-28 09:21:27 +08:00
cjp
a45eb31c20 fix: 修改BUG 2023-07-27 18:28:05 +08:00
cjp
e08280801e Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into shenzhen-dev 2023-07-27 09:08:27 +08:00
cjp
0f5a246e1b fix: BUG 修改
commit fd120a19497e0533ece7c18b4037d86ef7a5d8a3
Author: cjp <3096114695@qq.com>
Date:   Thu Jul 27 08:55:32 2023 +0800
2023-07-27 09:01:56 +08:00
cjp
fd120a1949 fix: BUG 修改 2023-07-27 08:55:32 +08:00
jxj_yjl
58807f1fdb Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/dhp/zhgdyun into dev-yjl 2023-07-26 13:52:06 +08:00
jxj_yjl
c7790a80c2 中建四局数据天机 2023-07-26 13:50:36 +08:00
cjp
913dc74cb6 fix: BUG修改 2023-07-26 11:07:33 +08:00
cjp
e9862f5245 fix: BUG修改 2023-07-26 09:49:30 +08:00