Commit Graph

326 Commits

Author SHA1 Message Date
shixiaoman
26cb65165a 配置文件修改 2021-12-17 15:41:29 +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
shixiaoman
d9bf82d72a 导入数据日期格式化 2021-12-13 14:00:00 +08:00
c55bb59a19 Merge remote-tracking branch 'origin/huku' 2021-12-13 13:40:45 +08:00
庞东林
84ad378545 修改nev 2021-12-13 13:39:51 +08:00
481c75f8b8 Merge branch 'yinyongshui' 2021-12-11 13:46:16 +08:00
庞东林
c95c693570 城市部分导出调整 2021-12-10 17:05:37 +08:00
庞东林
d37d3a7230 修改nev 2021-12-10 15:47:27 +08:00
bd9be38f7a env~ 2021-12-10 13:35:31 +08:00
326817bc02 env~~ 2021-12-10 13:34:49 +08:00
e27b61876e env 2021-12-10 13:14:01 +08:00
庞东林
397fb28f4b 饮用水框架页面 2021-12-10 11:39:22 +08:00
南宁网宿科技
e5c6859cf2 Merge pull request '添加过滤条件' (#8) from huku into master
Reviewed-on: http://git.gxwebsoft.com/shengtaiting/shengtai-admin/pulls/8
2021-12-10 11:23:31 +08:00
庞东林
f7a430f8ca 县级监测数据 2021-12-10 09:45:12 +08:00
庞东林
bc772355eb 添加过滤条件 2021-12-09 16:44:09 +08:00
庞东林
77ae7e4124 市级饮用水页面框架 2021-12-09 16:34:51 +08:00
shixiaoman
a1c46050f9 江河分页代码优化 2021-12-09 15:58:17 +08:00
shixiaoman
3717fdcb69 分页bug修复 2021-12-09 15:34:18 +08:00
shixiaoman
3ff74b9b8c Merge branch 'xiaoman' 2021-12-09 13:36:49 +08:00
shixiaoman
8f2e84046a 江河数据采集优化 2021-12-09 13:33:22 +08:00