2355 Commits

Author SHA1 Message Date
f59347c63a flx:提交执法记录仪模块 2025-07-08 09:33:11 +08:00
8f9cc45f29 修复bug 2025-07-07 10:43:49 +08:00
bc82dba006 添加企业大屏路由 2025-07-03 09:29:17 +08:00
a6533a8717 Merge branch 'jiayu-dev' into xjw-dev 2025-07-02 16:21:46 +08:00
b83a32ff43 回滚6.9号,修复bug,区域绑定闸机设备 2025-07-02 16:21:25 +08:00
03a904e419 flx:修改错误文字 2025-07-01 18:08:54 +08:00
717e9e8822 flx:修改样式问题 2025-07-01 16:09:37 +08:00
da49e10d32 flx:添加黑名单 刷新名单人员 2025-06-30 18:02:35 +08:00
da0ec4e14e flx:提交黑名单页面 新增退场字段 2025-06-30 17:40:59 +08:00
8033850e36 flx:优化页面 2025-06-30 16:42:41 +08:00
a4168b5bd3 flx:优化 2025-06-27 18:19:37 +08:00
24aa249589 flx:修复包含下级问题 2025-06-25 17:29:14 +08:00
2115ab0f16 flx:修改提示问题 2025-06-25 17:20:46 +08:00
d600729f5f flx:修复bug 2025-06-25 17:08:50 +08:00
2541fc6a54 flx:修改bug 2025-06-25 16:33:11 +08:00
b3e919fb79 flx:修复考勤组删除问题 2025-06-25 10:18:01 +08:00
1c0e81b0e4 flx:修改人员考勤显示问题 2025-06-25 10:12:11 +08:00
1a60bfe306 flx:提交新江湾 人员管理配置 2025-06-25 09:34:24 +08:00
f0edfe34f6 flx:修改配置 2025-06-21 11:49:35 +08:00
2038b349e3 Merge branch 'uat' of http://192.168.34.160:8023/admin/zhgdyun into bjxz-dev 2025-06-21 11:48:19 +08:00
3fa5be3db6 flx:提交风险分级管控模块 2025-06-21 11:47:21 +08:00
de2a50254c 合并冲突 2025-06-16 16:12:01 +08:00
315039c146 区域绑定闸机设备 2025-06-16 16:08:48 +08:00
8691686ec5 flx:修改管控清单bug 2025-06-16 13:41:12 +08:00
dcfc793b5e flx:修复bug 2025-06-16 10:21:15 +08:00
3d28361d36 Merge branch 'uat' of http://192.168.34.160:8023/admin/zhgdyun into bjxz-dev 2025-06-13 18:07:15 +08:00
5c505eaa6b flx:提交风险分级管控模块 2025-06-13 18:06:27 +08:00
a4a5d00232 Merge branch 'uat' into jiayu-dev 2025-06-10 11:46:40 +08:00
0380b18fb8 修复bug 2025-06-10 11:45:58 +08:00
ce19343b79 修复bug 2025-06-10 11:44:01 +08:00
2b74ffa76f Merge branch 'uat' of http://192.168.34.160:8023/admin/zhgdyun into bjxz-dev 2025-06-10 11:19:21 +08:00
9e7172e852 flx:修复盾构机时间问题 2025-06-10 11:12:35 +08:00
0265c66715 bug修复 2025-06-09 18:40:38 +08:00
b57db28bef 地图定位模块 2025-06-09 10:33:17 +08:00
db8caa7c78 版本更新 2025-06-09 09:51:51 +08:00
a5ffc31612 flx:提交随机数据生成盾构机、履带吊、汽车吊模块 车辆测速新增功能 2025-06-07 17:44:24 +08:00
1f1fb967ff flx:提交企业后台安全风险库模块 2025-06-05 18:01:29 +08:00
1b93d1dd78 Merge branch 'bjxz-dev' of http://192.168.34.160:8023/admin/zhgdyun into bjxz-dev 2025-06-04 11:29:01 +08:00
0720cc409a flx:修复bug 2025-06-04 11:28:25 +08:00
fa5e5a7e90 Merge pull request 'uat' (#3) from uat into prod
Reviewed-on: #3
2025-06-04 11:21:18 +08:00
ef1b2509e3 Merge pull request 'uat' (#1) from uat into bjxz-dev
Reviewed-on: #1
2025-06-03 18:00:14 +08:00
dhp
230f06fd0b 加上/#/large 2025-06-03 17:04:09 +08:00
dhp
3f481bb902 修改bug 2025-06-03 16:55:34 +08:00
dhp
9927d76069 修改大屏url 2025-06-03 16:50:15 +08:00
0079017e4d flx:提交运维管理样式修改 2025-06-03 14:06:08 +08:00
994fbbaa08 flx 2025-05-30 17:33:26 +08:00
906e4b6d73 flx:注释mars3d-cesium/Build/Cesium/Widgets/widgets.css 2025-05-30 17:23:22 +08:00
7de3daf0e5 flx:注释mars3d/dist/mars3d.css 2025-05-30 17:22:16 +08:00
997f70b20a flx:新增运维管理模块 2025-05-30 14:54:52 +08:00
7333818482 合并冲突 2025-04-12 15:09:20 +08:00