Commit Graph

232 Commits

Author SHA1 Message Date
庞东林
9f57272b5b Merge branch 'huku' 2021-12-23 15:12:59 +08:00
庞东林
d98096ff4d 专湖区域筛选去重 2021-12-23 15:12:37 +08:00
庞东林
dddb52ae49 Merge branch 'huku' 2021-12-23 15:09:57 +08:00
庞东林
4d61ba87d5 增加专湖区域多选 2021-12-23 15:06:33 +08:00
c400e30d82 Merge remote-tracking branch 'origin/huku' 2021-12-22 12:21:03 +08:00
庞东林
3584c8f67a 更换专湖表头字段 2021-12-21 17:16:23 +08:00
4454500cf7 Merge remote-tracking branch 'origin/yinyongshui' 2021-12-21 12:58:10 +08:00
庞东林
2ce3a41022 添加水质目标 2021-12-21 12:45:23 +08:00
ba214a69c4 Merge remote-tracking branch 'origin/yinyongshui' 2021-12-21 12:14:29 +08:00
5986b1cb73 Merge remote-tracking branch 'origin/huku' 2021-12-21 12:14:09 +08:00
庞东林
3e6a8a7116 添加总数 2021-12-20 22:29:27 +08:00
庞东林
38cbc32fe3 添加快速填充 2021-12-20 21:24:38 +08:00
庞东林
73cf7c384c 修改专湖表头 2021-12-20 15:36:49 +08:00
庞东林
feedbe3031 调整导出及表头 2021-12-20 15:22:11 +08:00
庞东林
8f933c841b 查询联动修正 2021-12-20 11:42:19 +08:00
933649d880 Merge remote-tracking branch 'origin/yinyongshui' 2021-12-19 10:08:20 +08:00
ee99becf25 Merge remote-tracking branch 'origin/huku' 2021-12-19 10:08:08 +08:00
8041a34c44 Merge remote-tracking branch 'origin/master' 2021-12-19 10:07:59 +08:00
庞东林
c40ae033eb 修改参数传值 2021-12-18 21:08:37 +08:00
shixiaoman
4a6f4d9a3d Merge branch 'xiaoman' 2021-12-17 15:40:35 +08:00
庞东林
8cc2bea78e 增加区域去重 2021-12-17 15:40:03 +08:00
shixiaoman
459c56aa04 字典表添加经纬度 2021-12-17 15:39:48 +08:00
庞东林
51cd0d7a2c 修改超标评价接口 2021-12-16 22:23:59 +08:00
庞东林
ba36439ac7 增加首次加载时间判断 2021-12-16 20:55:05 +08:00
a51f84d95d Merge remote-tracking branch 'origin/yinyongshui' 2021-12-16 18:13:19 +08:00
庞东林
d9dec2a30e 修改断面名称接口 2021-12-16 17:30:36 +08:00
2cc0e065fe Merge remote-tracking branch 'origin/yinyongshui' 2021-12-16 16:38:37 +08:00
6af6c54110 Merge remote-tracking branch 'origin/xiaoman' 2021-12-16 16:38:31 +08:00
庞东林
4b4aaa036e 切换搜索条件组件 2021-12-16 14:57:16 +08:00
庞东林
bcfc64295f 饮用水全部捆绑接口 2021-12-16 14:42:27 +08:00
shixiaoman
7517408155 江河数据采集bug修复 2021-12-16 14:32:37 +08:00
9facc29e36 Merge remote-tracking branch 'origin/yinyongshui' 2021-12-16 10:53:54 +08:00
庞东林
2e86910009 断面判空 2021-12-15 22:28:56 +08:00
f8ac21f58e Merge remote-tracking branch 'origin/yinyongshui' 2021-12-15 22:15:02 +08:00
庞东林
1ea96ddde7 水质统计 2021-12-15 22:08:57 +08:00
庞东林
132460dc77 水质统计 2021-12-15 22:06:21 +08:00
b2bedd37bb Merge remote-tracking branch 'origin/master' 2021-12-15 20:54:53 +08:00
shixiaoman
f421e51a24 Merge branch 'xiaoman' 2021-12-15 15:22:46 +08:00
shixiaoman
a3f5f6ffe2 江河统计导出修改 2021-12-15 15:15:57 +08:00
25061b53ff Merge remote-tracking branch 'origin/yinyongshui' 2021-12-15 13:02:43 +08:00
54393f19d5 Merge remote-tracking branch 'origin/huku' 2021-12-15 13:02:22 +08:00
庞东林
4d09555428 上传提示 2021-12-15 09:30:28 +08:00
庞东林
697954ffd8 添加上传提示 2021-12-15 09:25:17 +08:00
庞东林
1cea394959 修改导入接口地址 2021-12-15 09:17:54 +08:00
庞东林
9a277d0b47 修改导入提示 2021-12-14 21:42:11 +08:00
庞东林
f9b9123164 更换导入接口 2021-12-14 21:31:43 +08:00
庞东林
5a30d9ca4c 解决导出不全等问题 2021-12-14 20:25:50 +08:00
庞东林
ada1fb7749 新接口捆绑 2021-12-14 15:16:39 +08:00
庞东林
c36a162d33 饮用水框架页面 2021-12-14 10:20:11 +08:00
shixiaoman
8b0bc652cb Merge branch 'xiaoman' 2021-12-13 14:08:50 +08:00