Commit Graph

743 Commits

Author SHA1 Message Date
扈兆增
8d17118b40 三维修改 2026-07-10 17:56:16 +08:00
扈兆增
90bd2bac1f 基础信息后台对接, 2026-07-09 14:58:14 +08:00
扈兆增
ddaa39c811 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform 2026-07-09 11:33:08 +08:00
扈兆增
b52ca56fd3 地图加载优化,地图接口更新 2026-07-09 11:33:04 +08:00
王兴凯
948009a314 代码合并 2026-07-08 08:41:03 +08:00
扈兆增
f55b061bf2 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-08 08:33:39 +08:00
扈兆增
18ab994b24 修改地图逻辑,沿程配置修改 2026-07-08 08:33:08 +08:00
王兴凯
ce8ebe552f bug修改与页面完善 2026-07-07 19:00:45 +08:00
王兴凯
e624cf3bb9 bug修改与页面完善 2026-07-07 18:59:55 +08:00
lilin
568f76dafa Merge branch 'main' into dev-lilin
# Conflicts:
#	backend/src/main/resources/application-prod.yml
2026-07-07 18:56:03 +08:00
lilin
ec8ba69d65 沿程配置表代码提交 2026-07-07 18:55:12 +08:00
tangwei
d88eca8b8f Merge branch 'main' into dev-tw 2026-07-07 17:13:29 +08:00
tangwei
a7e4cd8c0d fix: 优化逻辑 2026-07-07 17:06:34 +08:00
tangwei
645b97435c fix: 优化逻辑 2026-07-07 16:15:49 +08:00
tangwei
d9e15f9736 feat: 栖息地关联站点描点 2026-07-07 15:44:55 +08:00
tangwei
58fec2e6f1 fix: 电站统计状态条件优化 2026-07-07 15:20:16 +08:00
tangwei
6c521d9d84 fix: 优化地图查询接口逻辑 2026-07-07 14:40:04 +08:00
王兴凯
a83131abb5 弹框自定义狂赌问题解决 2026-07-07 13:51:15 +08:00
王兴凯
80474e9783 弹框自定义狂赌问题解决 2026-07-07 13:50:21 +08:00
扈兆增
2f87f8fb40 Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-07 13:48:47 +08:00
扈兆增
549849b479 填报页面修改,沿程配置修改,添加预警和推送页面 2026-07-07 13:48:20 +08:00
tangwei
8c9f25c90f fix: 优化地图查询接口逻辑 2026-07-07 13:38:59 +08:00
tangwei
195ccc58d1 fix: 优化逻辑 2026-07-07 11:30:00 +08:00
tangwei
501d42ac2f fix: 优化逻辑 2026-07-07 11:20:44 +08:00
王兴凯
5465ef72d6 弹窗拖动+过鱼设施-过鱼总量-弹框添加 2026-07-07 10:33:29 +08:00
tangwei
5fa17e767a fix: 优化逻辑 2026-07-07 10:28:42 +08:00
tangwei
85b4a1fdbd fix: 优化逻辑 2026-07-06 18:10:59 +08:00
lilin
e5dcdaf299 Merge branch 'main' into dev-lilin 2026-07-06 17:09:42 +08:00
lilin
e1072ac2e8 沿程配置表代码提交,修改了图例数据管理删除菜单的时候也删除图层菜单 2026-07-06 17:09:08 +08:00
tangwei
d30d873fa4 fix: 优化逻辑 2026-07-06 17:01:44 +08:00
tangwei
c6dc532040 fix: 优化逻辑 2026-07-06 16:09:40 +08:00
tangwei
25aeb62e95 feat: 条件过滤数据列表 2026-07-06 15:11:08 +08:00
tangwei
1b7f52783d feat: 鱼类调查装置锚点信息 2026-07-06 12:28:13 +08:00
tangwei
fa805bfc53 feat: 野生动物锚点 2026-07-06 11:48:38 +08:00
tangwei
61e896de25 feat: 野生动物锚点 2026-07-06 11:48:23 +08:00
tangwei
fdaba51634 feat: 栖息地/珍稀植物园/动物救助站描点接口(仅查询在建状态的) 2026-07-06 11:36:11 +08:00
tangwei
d6ab49711a feat: 全过程过鱼统计总数,根据基地分组 2026-07-06 11:12:30 +08:00
tangwei
c056d30682 feat: 过鱼设施地图描点接口(仅查询在建状态的) 2026-07-06 10:49:40 +08:00
tangwei
aa71489035 feat: 流量站锚点接口 2026-07-06 10:34:48 +08:00
王兴凯
9473a87a1d 智能告警BUG修改 2026-07-06 10:27:41 +08:00
tangwei
275cb5e454 feat: 电站出入库水温描点 2026-07-06 10:18:43 +08:00
tangwei
85cf3bc358 feat: 栖息地/珍稀植物园/动物救助站描点 2026-07-06 09:46:43 +08:00
tangwei
f6e2d49558 feat: 生态流量泄放设施描点 2026-07-06 09:05:54 +08:00
扈兆增
46100d8318 问题记录 2026-07-06 09:01:31 +08:00
王兴凯
03e299bd7c 首页和智能告警 2026-07-06 08:56:56 +08:00
王兴凯
3a8dc22af4 首页和智能告警 2026-07-06 08:54:58 +08:00
扈兆增
09b02e791e Merge branch 'main' of http://121.37.111.42:3000/zhengsl/WholeProcessPlatform into main_hzz 2026-07-06 08:53:00 +08:00
tangwei
35ae8e340f Merge remote-tracking branch 'origin/main' 2026-07-06 08:36:29 +08:00
tangwei
da09eeb836 feat: 增殖站地图描点 2026-07-06 08:36:16 +08:00
lilin
66470b4ee5 Merge branch 'main' into dev-lilin 2026-07-03 17:27:35 +08:00